maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
1,407 Commits 6 Branches 188 Tags
016ae12884f19b3dab66f50823d32a37da1c9bc4
Commit Graph

305 Commits

Author SHA1 Message Date
Axel Guckelsberger
febb8e37bc Update cron_tasks.inc.http.10.apache.php 2013-04-27 09:50:05 +03:00
Axel Guckelsberger
84d87adb9b Update cron_tasks.inc.http.30.nginx.php 2013-04-27 09:32:28 +03:00
Axel Guckelsberger
ed151d5fd8 Update cron_tasks.inc.http.20.lighttpd.php 2013-04-27 09:16:53 +03:00
Michael Kaufmann (d00p)
b93bb806f6 don't use makeCorrectFile() on custom error-pages when it is a URL; also fix include-order for lighttpd vhosts, fixes #833 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-26 18:53:20 +02:00
Michael Kaufmann (d00p)
7a69cf73ba don't require a port-declaration in validating an URL when an IP address is given, fixes #1179 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-23 15:58:03 +02:00
Michael Kaufmann (d00p)
f2d10046b6 fix axfr-server-stuff (and close allow-transfer block), let updater and settings validate ipv4/ipv6 via function validate_ip 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-22 16:39:35 +02:00
Michael Kaufmann (d00p)
7adc2dd35c Update version_compare function; fix syntax-error in bind-config generation, thx to monumentum 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-19 13:55:38 +02:00
Michael Kaufmann (d00p)
1ae7876e44 provide a correct user-salutation for all templates, thanks to Shortie 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-19 11:56:53 +02:00
Michael Kaufmann (d00p)
e97a7c611c add possibility to specify AXFR servers for bind zone-configuration, fixes #100 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-18 16:38:22 +02:00
Michael Kaufmann (d00p)
0001c30a5d added new configio-class to reduce the duplicate code of removing config-files for the webservers (it's all pretty much the same), CAUTION: very untested 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-16 21:39:46 +02:00
Michael Kaufmann (d00p)
d51977af65 move the merging-code for location-/ sections to the end of all possible location-blocks; fixes #1193 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-16 07:57:58 +02:00
Michael Kaufmann (d00p)
e29068f0d8 ups, wrong brakets :P 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-15 13:19:04 +02:00
Michael Kaufmann (d00p)
8f127e4769 revert last nginx-fix (nonsense) and now respect 'vhost-statement=no' setting for froxlor-vhost (no server-block), fixes #1076 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-15 13:13:36 +02:00
Michael Kaufmann (d00p)
3d246d7926 respect listen_statement = 0 setting from ipsandports-table in nginx - use with caution; fixes #1076 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-15 09:05:53 +02:00
Michael Kaufmann (d00p)
551c1616f5 don't include specialsettings or default-vhost-content to ssl-redirects, fixes #1136 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-04 10:29:28 +02:00
Michael Kaufmann (d00p)
3d79564fd2 remove traffic-cron-lockfile after its finished, thx to netsurfer 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-03 15:33:48 +02:00
Michael Kaufmann (d00p)
8c8cbc74cf make fcgid and php-fpm config cleaning work for real, fixes #1180 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-01 10:51:42 +02:00
Michael Kaufmann (d00p)
ab410cc91e don't insert task if feature is disabled even though they are not run but might be irritating for the admin, thx to fuchsi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-29 20:10:37 +01:00
Michael Kaufmann (d00p)
74c5d0718c remove php's safe_mode as it is deprecated since php-5.3 and removed since php-5.4 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-15 09:34:41 +01:00
Michael Kaufmann (d00p)
cbc745ff72 remove mod_log_sql as planned 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-15 08:38:29 +01:00
Michael Kaufmann (d00p)
1a9c5f162f respect ip/port-default-vhost-config-for-every-domain and system-defaultvhost-conf setting in nginx and lighttpd, fixes #916 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-13 08:18:15 +01:00
Michael Kaufmann (d00p)
a071811dd0 respect 'access froxlor directly via hostname' and 'custom docroot in ip/port' setting in nginx, refs #920 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-13 08:16:36 +01:00
Michael Kaufmann (d00p)
deee18a7a1 fix awstats/webalizer alias-generation (better solution), this one goes to byteworkshosting, thanks), finally fixes #1067 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-10 18:09:23 +01:00
Michael Kaufmann (d00p)
69e785b5fe php-fpm + apache fixes when using ssl, refs #1048 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-10 15:35:08 +01:00
Michael Kaufmann (d00p)
2897b0374c fix awstats/webalizer alias issue, (hopefully) fixes #1067 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-10 15:18:30 +01:00
Michael Kaufmann (d00p)
2a48c2b598 fix fpm-description in english langfile; make --force command really force a regeneration of the config files by inserting the task; beautify nginx customer vhost 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-09 16:59:33 +01:00
Michael Kaufmann (d00p)
cb6db7385a escape directories/files correctly - TODO: store the user-inputs in the database correctly (source of the data), checking in the cronjob is only just-in-case, refs #717 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-06 17:56:42 +01:00
Michael Kaufmann (d00p)
debdbf5d41 update FCGIWrapper directive to FcgidWrapper (since mod_fcgid-2.3.2), refs #1138 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-06 15:46:15 +01:00
Michael Kaufmann (d00p)
f88c93a301 fix variable typo (undefined variable) in cron_autoresponder; don't use webfonts by default 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-05 15:51:32 +01:00
Michael Kaufmann (d00p)
747b01d141 make path to nginx's fastcgi_params customizable, fixes #1153 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-05 09:03:38 +01:00
Michael Kaufmann
95faab4a82 Merge pull request #76 from felixww/patch-1 
Update scripts/jobs/cron_autoresponder.php
 2013-03-04 08:17:34 -08:00
felixww
09e765ba13 Update scripts/jobs/cron_autoresponder.php 
Emails used to be read for parsing, using PHP's file() command.
I changed it to read the file line by line, so the script doesn't run into the PHP memory limit. 

Note that this has been a severe bug, since it used to make PHP abort script execution, thus possibly losing many emails for many users (i.e, on a multi domain setup with many autoresponders running).
 2013-02-27 12:56:45 +01:00
Michael Kaufmann (d00p)
0c471639b1 don't remove php-fpm-configs after they have been 
created, the cron_tasks.php cleans up the directory already *update -> also in apache2 and lighttpd cron*

Signed-off-by: Michael Kaufmann (d00p) <mkaufmann@nutime.de>
 2013-02-25 14:16:37 +01:00
Michael Kaufmann (d00p)
177e8cf064 backward-compatibility for old mail-folder-structure 
Signed-off-by: Michael Kaufmann (d00p) <mkaufmann@nutime.de>
 2013-02-25 13:07:35 +01:00
Michael Kaufmann (d00p)
d7eef7a8b2 add support for the new apache-2.4 
Signed-off-by: Michael Kaufmann (d00p) <mkaufmann@nutime.de>
 2013-02-25 09:59:26 +01:00
Michael Kaufmann (d00p)
519db12a85 don't remove php-fpm-configs after they have been created, the cron_tasks.php cleans up the directory already 
Signed-off-by: Michael Kaufmann (d00p) <mkaufmann@nutime.de>
 2013-02-25 09:48:09 +01:00
Florian Aders
08bd5f7041 Merge pull request #33 from anbrosius/ssl-with-redirect 
Fix bug: with a SSL-enabled domain and redirection Apache won't start, fixes #893 and #1023
 2012-09-25 01:21:25 -07:00
Florian Aders
9ea0839426 Merge pull request #52 from chrisv2/logrotate_speciallogfile_undefined_variable 
fix: undefined variable $logrotatefile when rotating speciallogfile
 2012-09-25 00:27:40 -07:00
Florian Aders
ec537625a5 Merge pull request #51 from SirUli/master 
Fix for cron_tasks.inc.http.10.apache.php on 1315
 2012-09-25 00:27:17 -07:00
Chris Vigelius
10cda9f5a9 fix: undefined variable $logrotatefile when rotating speciallogfile 2012-09-24 10:56:41 +02:00
Uli
bd890e8ebe Fix for cron_tasks.inc.http.10.apache.php on 1315 
Error should have been fixed in #24 but the following error still
occured if $this->settings['phpfpm']['configdir'] is not available:

```
PHP Warning:  readdir() expects parameter 1 to be resource, boolean
given in /var/www/froxlor/scripts/jobs/cron_tasks.inc.http.10.apache.php
on line 1315
```

Structure of the fix is the same as in
f5bc81faca but copied to the other
section.
 2012-09-24 09:10:57 +02:00
Andreas Grundler
e6a30edd0b Merge remote-tracking branch 'upstream/master' 2012-09-13 10:30:17 +02:00
Andreas Grundler
e2700ce91d Fix for Bug #1118 2012-08-23 11:32:25 +02:00
Arnold Bechtoldt
e1a0cca5cc Don't change PHPMailer core just modify public charset object-var, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 14:12:15 +02:00
Arnold Bechtoldt
601bf68d09 Implementing the whole template system using Smarty. This commit includes movements of ROOT/js, ROOT/images, etc. to theme specific directories like templates/<THEME>/. If you are attemping to use your own templates you won't need to modify Froxlor's core files. This commit may require additional work. 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-14 23:08:25 +02:00
anbrosius
38b7d46596 Fix bug: with a SSL-enabled domain and redirect Apache won't start 2012-07-25 17:09:44 +02:00
Andreas Burchert
7f7bf62d95 Merge pull request #29 from scarya/master 
Added logrotate to speciallogfiles, fixes #1014
 2012-07-20 04:12:12 -07:00
Andreas Burchert (scarya)
9a5b52f609 Added logrotate to speciallogfiles, fixes #1014 
Thanks to dahuafschmied

Signed-off-by: Andreas Burchert <andreas.burchert@igd.fraunhofer.de>
 2012-07-20 10:20:47 +02:00
Andreas Burchert
288d29de7a Merge pull request #28 from avengerx/new_maildir_structure 
New maildir structure fixes #1103
Thanks to avengerx
 2012-07-18 03:35:03 -07:00
Fabrício Zimmerer Murta
1c3690a882 Erase full user dir instead of just Maildir/ when erasing customer email data. 2012-07-10 00:54:03 -03:00