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

1322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dessa
c0322b39f1 Merge pull request #84 from byteworkshosting/master 
Providing Dovecot 2.x configuration steps on FreeBSD
 2013-03-12 20:44:32 -07:00
Charlie Root
ca7a91d4cf Merge remote-tracking branch 'Froxlor/master' 2013-03-12 20:52:20 +01:00
Michael Kaufmann (d00p)
4d0dfb1c88 allow ip:port in redirections, fixes #1173 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-12 19:26:21 +01:00
byteworkshosting
c6477f345f Providing Bind9 Nameserver configuration steps on FreeBSD 2013-03-12 15:06:14 +01:00
byteworkshosting
c7eccd6086 Providing Nginx Webserver configuration steps on FreeBSD 2013-03-12 12:03:47 +01:00
byteworkshosting
877add851b Providing Dovecot 2.x configuration steps on FreeBSD 
(fixes also the FreeBSD-Part of ticket #1015)
- configuration files can be adopted for other os i think
 2013-03-12 11:57:50 +01:00
Michael Kaufmann (d00p)
b5fb0da98f escape database name when converting to UTF-8 as it may contain a dash or similar character that needs escaping, fixes #1172 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-12 08:14:52 +01:00
Michael Kaufmann
3ed063dd5c Merge pull request #83 from anbrosius/bugfix-1058 
Bugfix when deleting customer, fixes #1058 fixes #758
 2013-03-12 00:10:39 -07:00
anbrosius
7733b1e625 Bugfix when deleting customer 2013-03-12 00:39:38 +01:00
Michael Kaufmann (d00p)
66e6a21f77 fix and cleanup polish language file, thx to imachine; fixes #1170 refs #1171 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-11 21:21:55 +01:00
Michael Kaufmann (d00p)
e8c833e16d fix idna conversion for UTF-8, thx to anbrosius (via github) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.28-rc1 		2013-03-11 11:01:30 +01:00
Michael Kaufmann (d00p)
8d7c858931 setting version to 0.9.28-rc1 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-11 10:51: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)
9b56b0c29d fix undefined indexes when path already exists and an error is thrown 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-10 14:46:45 +01:00
Michael Kaufmann (d00p)
47481aab56 check if the used froxlor version has already iso-codes in the language-table for this will output undefined variables after updating the files before updating the database in the panel 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-10 10:23:24 +01:00
Michael Kaufmann (d00p)
4b872399ac check for correct array in ApsInstaller, fixes #1098 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-10 09:11:05 +01:00
Michael Kaufmann (d00p)
a76b064a56 display domains one below the other, so you get a better overview 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-10 08:52:56 +01:00
Michael Kaufmann (d00p)
db81594404 generalize language string 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-10 08:49:52 +01:00
Michael Kaufmann (d00p)
56cc714c2a the link to open the customer-traffic details via admin-panel now uses rel='external' as we do with switch-user 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-10 08:45:01 +01:00
Michael Kaufmann (d00p)
e1e11061c6 activate/deactivate backup-cronjob with the backup-enabled setting 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-10 08:37:13 +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)
b84bd2017c use language file and better description for google-webfont integration 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-09 16:41:11 +01:00
Michael Kaufmann (d00p)
be11f81af4 minor fixes in installation 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-09 16:26:07 +01:00
Michael Kaufmann (d00p)
d9ebd7a3f9 fix description of the nginx php-reload and php-backend setting 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-08 22:59:16 +01:00
Michael Kaufmann (d00p)
e6816c12ef php-fpm sanity checks if pm='dynamic' or pm='ondemand', fixes #955 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-07 15:50:22 +01:00
Michael Kaufmann (d00p)
a048cd96b1 implement php-fpm process-manager 'ondemand', fixes #1035 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-07 15:40:07 +01:00
Michael Kaufmann (d00p)
f1e7c09d96 Merge branch 'master' of github.com:Froxlor/Froxlor 2013-03-07 10:51:29 +01:00
Michael Kaufmann
caf60c6f85 Merge pull request #78 from madmuffin1/ticket1163 
* Log customer deletion of database, fixes #1163
* Enable deletion and correct revoking of database for customer, refs #1108
 2013-03-07 01:46:33 -08:00
madmuffin1
bd3661d1d4 * Log customer deletion of database (#1163) 
* Enable deletion and correct revoking of database for customer (#1108)
 2013-03-07 10:31:34 +01:00
Michael Kaufmann (d00p)
011c27101c remove unused variable which causen an undefined-index notice because it is not part of the form, fixes #1133 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-07 09:44:00 +01:00
Michael Kaufmann (d00p)
3b1be99814 use correct linker-property to set the hostname in redirectTo() function, fixes #1151 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-07 09:35:20 +01:00
Michael Kaufmann (d00p)
12e57c5f10 fix maildirExists() function to check also 'old' maildir layout, refs #1103 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-07 09:13:20 +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
2c41ea48c1 Merge pull request #59 from madmuffin1/mysqlrevoke 
Patching Revoking Privileges (both when deleting user and disabling user), fixes #1108
 2013-03-05 23:40:45 -08:00
Michael Kaufmann (d00p)
e7a0508989 check for errors in database-description before the actual creation of the database to prevent a physical existing database without an entry in the corresponding froxlor-table, fixes #1052 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-05 16:28:54 +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)
92aea9d27e fix font-stuff on installation 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-05 13:36:24 +01:00
Michael Kaufmann (d00p)
447f61ba78 settings are not available when reading them from the database, let admin set the php-reload command and the php-backend for nginx even if php-fpm is disabled. Added a note to the description, fixes #1075 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-05 10:29:06 +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
Dessa
de89a07970 Merge pull request #63 from adlerweb/fix-gentoocfg-dovecot2 
[Gentoo] New dovecot configuration
 2013-03-04 08:21:54 -08: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
Michael Kaufmann
bbb44bc857 Merge pull request #62 from adlerweb/fix-installtranslation 
Fix install translation
 2013-03-04 08:14:32 -08:00
Michael Kaufmann (d00p)
59e65b445f respect caneditdomain selection 
Signed-off-by: Michael Kaufmann (d00p) <mkaufmann@nutime.de>
 2013-02-28 09:31:33 +01:00
Michael Kaufmann (d00p)
6b1a4ce84d respect deactivated bind value in formfields 
Signed-off-by: Michael Kaufmann (d00p) <mkaufmann@nutime.de>
 2013-02-28 09:12:45 +01: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)
afd16138e4 remove stupid joke 
Signed-off-by: Michael Kaufmann (d00p) <mkaufmann@nutime.de>
 2013-02-25 20:58:24 +01:00