maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
2,680 Commits 6 Branches 188 Tags
be5a13fbb19c7929ea006cd2e2392f5548ca1bfc
Commit Graph

2680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann
f90982347a Merge pull request #238 from xWuZaa/master 
Add custom port to userdata.inc.php
 2015-05-07 20:17:11 +02:00
xWuZaa
bd5647351e Add custom port to userdata.inc.php 2015-05-07 19:58:48 +02:00
Michael Kaufmann (d00p)
ec77e47cd6 Merge branch 'master' of github.com:Froxlor/Froxlor 2015-05-06 15:37:46 +02:00
Michael Kaufmann (d00p)
565866c529 adjust default memory_limit to php's default (128M) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-05-06 15:37:38 +02:00
Michael Kaufmann
e4a262eb7b Merge pull request #235 from rzeka/master 
Better customers sorting based on name and company
 2015-04-28 14:25:40 +02:00
rzeka
a3f2fa1b16 Better customers sorting based on name and company 2015-04-28 14:14:12 +02:00
Michael Kaufmann (d00p)
e0ef3e9984 fix mpm-itk stuff, thx to Ithariel; minor fixes in updater 2015-04-22 15:58:04 +02:00
Michael Kaufmann (d00p)
bf30c1a3d7 fix escaping of shell commands in new xml-config-template-files 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-03-11 16:51:56 +01:00
Michael Kaufmann (d00p)
c2c573902f separate dovecot for postfix and exim4 as exim4 needs 'special treatment'... 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-03-11 16:42:22 +01:00
Michael Kaufmann (d00p)
d874ebf1b0 use correct username of bind-daemon in debian wheezy config templates 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-03-11 14:30:22 +01:00
Michael Kaufmann (d00p)
8ef6032570 also re-generate bind configs (if enabled) when using --force with the cronjob 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-03-11 11:21:17 +01:00
Michael Kaufmann (d00p)
b32a6951da add Debian-exim group to dovecots Exim4-unix_listener, fixes #1513 2015-03-11 09:44:43 +01:00
Robert Förster (Dessa)
b7bc347323 fix language string 2015-03-10 20:35:33 +01:00
Michael Kaufmann
07e49e53c5 Merge pull request #231 from dadadom/master 
Add missing table definition for table 'mail_autoresponder' for older updaters
 2015-03-08 13:56:45 +01:00
Dominik Sandjaja
b87db2a82b Add missing table definition for table 'mail_autoresponder'. 
Add the define for the mail_autoresponder table. This define is needed in the update_0.9.inc.php script which is used when updating from an early version of froxlor or from SysCP.
 2015-03-08 13:54:36 +01:00
Michael Kaufmann (d00p)
c150d559c7 enhance domain-importer, fixes #1512 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-03-06 20:28:41 +01:00
Michael Kaufmann (d00p)
5dce0db661 dont create 'require all granted' if the directory is protected by a customer (htaccess), fixes #1455 (again); thx to Laryllian 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-03-02 20:25:41 +01:00
Michael Kaufmann (d00p)
27514d32de visible-tag needs to respect the do_show-value in case websrv_avail set do_show to false already 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-03-02 13:41:14 +01:00
Michael Kaufmann (d00p)
fe718ef67f add requirement for mbstring-extension as we need to be multibyte-character-safe in generatePassword(); adjust special-character-default setting to be the same as on a fresh install; outsource version-definition to separate file; set version to 0.9.34-dev3 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-23 12:23:44 +01:00
Michael Kaufmann (d00p)
e132723475 PDOStatement::rowCount is a function 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-20 11:56:24 +01:00
Michael Kaufmann (d00p)
72fc9db38d add integrity check for user/group membership when fcgid/fpm is used, refs #1491 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-20 09:58:24 +01:00
Michael Kaufmann (d00p)
1374e08cd4 make sql-fields for ssl-certs larger as there are ca-bundle-certs larger then 64k; add new settings for apache-itk-mpm integration, fixes #1400 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-18 16:05:28 +01:00
Michael Kaufmann (d00p)
03e48927a3 add optional support for apache-itk-mpm (mod_php only) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-18 16:01:38 +01:00
Michael Kaufmann (d00p)
bbf05fa6fd remove smarty-remnant; remove unnecessary variable assignment 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-17 13:27:30 +01:00
Roman Schmerold (BNoiZe)
6dad29cae7 Even more HTMLform2 migrations 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-16 17:56:37 +01:00
Roman Schmerold (BNoiZe)
52afba5a86 Migrate to new HTMLform2 class 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-16 16:55:56 +01:00
Roman Schmerold (BNoiZe)
913a53e436 Improve new htmlform class 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-16 16:18:39 +01:00
Michael Kaufmann (d00p)
4fd68a4153 fieldset is in subfileblock, not in file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-16 16:02:08 +01:00
Michael Kaufmann (d00p)
fae58078f8 update ftp_groups table in case webserver-/fcgid-/fpm-user changes, refs #1491 (i guess) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-16 14:56:08 +01:00
Michael Kaufmann (d00p)
1d319e001c group file-relevant commands into the fieldset; enhance layout 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-16 13:29:01 +01:00
Michael Kaufmann (d00p)
927e6fe23a add update compatibility for 0.9.33.1 users 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-16 09:45:55 +01:00
Michael Kaufmann (d00p)
b85eb98303 clear group-cache of nscd as this solves issues with webserver/php-fpm most of the time 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-16 08:21:33 +01:00
Roman Schmerold (BNoiZe)
643f124e8b Fixing a bug with linebreaks, fixes #1498 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-15 19:07:01 +01:00
Michael Kaufmann (d00p)
6fe4027de5 fix typo of vmail-user in rhel/centos config-template for dovecot 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-15 16:26:32 +01:00
Michael Kaufmann (d00p)
f9d79ba5a6 use correct PEAR directory setting in fpm-interface, fixes #1500 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-15 15:43:45 +01:00
Michael Kaufmann (d00p)
2382f526b2 reduce code - unnecessary complicated 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-15 07:54:34 +01:00
Michael Kaufmann (d00p)
1581e08594 show only hash algorithms that are available on the system 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-15 07:51:58 +01:00
Michael Kaufmann (d00p)
37ca78913c respect possible empty-value when validating string::validate_ip 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-12 13:02:50 +01:00
Michael Kaufmann (d00p)
df3b97c5dd change comments for better understanding, fixes #1496 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-12 09:22:59 +01:00
Michael Kaufmann (d00p)
953e3f5ba6 Merge branch 'master' of github.com:Froxlor/Froxlor 2015-02-11 21:21:13 +01:00
Michael Kaufmann (d00p)
74b73c6446 rename 'MySQL User' to 'Froxlor Customer' as username for users read from db via libnss; fix language strings 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-11 21:21:09 +01:00
Roman Schmerold (BNoiZe)
bc80fb71df Restyling configfiles with textareas instead of pre 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-11 19:35:18 +01:00
Michael Kaufmann (d00p)
b0279025d0 add numbrows to commands and files for BNoiZe's template magic; added possibility to use sql-data inside xml-config; updates xml-configs a bit when socket is used (not 100% done) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-11 14:30:30 +01:00
Roman Schmerold (BNoiZe)
a45712198b Update configfiles templates 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-11 13:01:48 +01:00
Michael Kaufmann (d00p)
704a0fce08 make integritycheck in update-procedure more clear whether there actually is a problem or not (if it's been fixed for example), fixes #1493 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-11 12:08:58 +01:00
Michael Kaufmann (d00p)
d6c708e6ee only show restart command of php-fcgi for nginx if fcgid/fpm is not used 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-11 08:25:19 +01:00
Michael Kaufmann (d00p)
1f24ca9ba2 split codename and version from version field in config-xml file as this eases automation 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-11 07:15:05 +01:00
Michael Kaufmann (d00p)
c482db8c89 prepare database-class to have a separate socket-option, not as replacement for 'host' 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-10 16:13:14 +01:00
Michael Kaufmann (d00p)
c356639ce9 fix move-customer-to-admin 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-10 16:12:47 +01:00
Michael Kaufmann (d00p)
8b0572add1 fix visibility of fields in admin/formfields.admin.php 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-10 16:11:35 +01:00