maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
3,284 Commits 6 Branches 188 Tags
18b45c749daea040b78ef0726ea4ea27584b1dab
Commit Graph

420 Commits

Author SHA1 Message Date
Michael Kaufmann (d00p)
82fdb84e61 give possibility to specify a socket-file as 'host' in userdata.inc.php to connect via mysql-socket instead of hostname; not a setting because this might break some other stuff (mysql-access-hosts -> problems when adding mysql-users/databases, etc.) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-07 15:13:32 +01:00
Michael Kaufmann (d00p)
5d5062c262 make ownership-hint a bit larger like the db-error-page; add theme-fallback to database-error-function to avoid this stupid 'we are sorry, but a MySQL - error occurred'-message 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-29 21:42:28 +01:00
Michael Kaufmann (d00p)
dd34ab8d9b fix inline-css (violation of Content Security Policy) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-29 20:48:56 +01:00
Michael Kaufmann (d00p)
19f5f2a7a4 remove static copyright-year in templates; fix possible undefined theme-variable in phpErrHandler by specifying a fallback-default 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-19 09:49:33 +01:00
Michael Kaufmann (d00p)
c1ca72dd3c fix validation of offset-value in domain import + minor fixes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-19 09:29:25 +01:00
Michael Kaufmann (d00p)
495a48bc87 avoid undefined variable in case the admin has unlimited domain-contingent 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-19 07:51:44 +01:00
Michael Kaufmann (d00p)
cd5e8801e4 add domain-bulk-import, fixes #1452 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-15 14:49:34 +01:00
Michael Kaufmann (d00p)
7dd6f9b97c explicitly set charset / collation of database when installing + new integrity-check-function to validate the database charset / collation and optionally fix it; fixes #1426 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-13 19:19:10 +01:00
Michael Kaufmann (d00p)
b0d5049e68 fix -> self in pFlush() in Settings-class, fixes #1464 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-10 17:40:04 +01:00
Michael Kaufmann (d00p)
5a9fa8592a bugfixing frxDirectory-class 2014-12-09 08:50:12 +01:00
Michael Kaufmann (d00p)
3be43c4848 outsource a few directory-functions in a class; make apache-2.4 not create 'require all granted' if there is an active directory-protection or option set for the customerroot-dir, possibly fixes #1455 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-01 08:07:28 +01:00
Michael Kaufmann (d00p)
0156c3a59d few fixes in inline-css; added mail.log php.ini option and enabled it in default ini-config 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-10-31 09:14:28 +01:00
Frank Gehann
dc2b690fa4 session.auto_start needs to be a php_value since it gets passed a 0 or 1 and not on/off which causes the fpm to not start at all. 2014-10-30 13:55:56 +01:00
Michael Kaufmann (d00p)
332a6bc550 don't make the fpm-socket readable for all, fixes #1418 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-10-01 13:39:41 +02:00
Michael Kaufmann (d00p)
70a9ad2f3d enhanced list of allowed php.ini-directives for php-fpm 2014-09-07 08:21:30 +02:00
schadowfox
1d27a27751 added php error log capabilities 
not sure why this is missing in the default config, but with this you can once again have a error log for php files.
 2014-09-05 23:26:48 +02:00
Michael Kaufmann (d00p)
9776624c32 honor max_children values for php-fpm 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-08-11 08:24:26 +02:00
Michael Kaufmann (d00p)
25fa9a8121 various tiny improvements 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-07-09 09:39:26 +02:00
Roman Schmerold (BNoiZe)
538b99055c Removing unwanted files which should be ignored by git anyway 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-06-01 18:50:55 +02:00
Roman Schmerold (BNoiZe)
3acfcd4a95 Adding a custom newsfeed to the customer-dashboard, fixes #1408 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-06-01 18:46:15 +02:00
Robin Kluth
7a8e345084 Removed unecessary 'start_servers' if pm = ondemand 
http://www.php.net/manual/de/install.fpm.configuration.php#pm.start-servers
 2014-05-25 12:01:16 +02:00
Robert Förster (Dessa)
92f9cf3621 bump phpmailer to 5.2.8 2014-05-23 12:24:02 +02:00
Michael Kaufmann (d00p)
3c8bf348d1 fight stupidity - teach your customers not to use password == username 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-05-18 11:16:35 +02:00
Roman Schmerold (BNoiZe)
7f5c74b502 Forgot to add the two new values together. D'Oh 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-05-07 09:46:23 +02:00
Roman Schmerold
0d1fc17db9 Changed regex to match new logformat, fixes #1398 
Signed-off-by: Roman Schmerold <bnoize@froxlor.org>
 2014-05-07 09:34:34 +02:00
Michael Kaufmann (d00p)
fceffc05e7 fix double line-break in ticket-message, fixes #1413 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-05-02 08:34:14 +02:00
Florian Aders (EleRas)
4a3043e113 Ignore an empty adminid (should fix user-errorreport) 2014-05-02 08:10:53 +02:00
Michael Kaufmann (d00p)
69ec85ef19 fix setting of passwords in case mysql-access-hosts list gets changed, fixes #1407 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-04-14 14:35:12 +02:00
Florian Aders (EleRas)
718a313673 Added new (debian) way for dovecot - IMAP - traffic-report, thx devil65 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-02-26 08:44:23 +01:00
Florian Aders (EleRas)
b661547817 Correcting PDO - Constant, fixes #1382 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-02-20 08:29:26 +01:00
Florian Aders (EleRas)
b4b80dd0cf Add integritycheck for ssl_redirect where parentdomains have no SSL (leftovers from a bug recently fixed by d00p) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-02-11 19:17:25 +01:00
Florian Aders (EleRas)
e3e4dba90d Added manuel integritycheck for admins 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-02-11 16:40:53 +01:00
Florian Aders (EleRas)
d7c94726fd Add a basic integritychecker after every update 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-02-07 18:25:35 +01:00
Michael Kaufmann (d00p)
c5cb91a882 add comment to cron.d-template; fix linker class to void double-slash after redirectTo, fixes #1372 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-30 11:42:16 +01:00
Michael Kaufmann (d00p)
4be52f76eb introducing new way of controling the cronjobs by creating a cron.d-file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-13 08:55:39 +01:00
Roman Schmerold (BNoiZe)
d9a5f052a1 Fixed mailparser ignoring last day of year 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 18:16:55 +01:00
Roman Schmerold (BNoiZe)
d5df53bb60 Handle traffic which may be from last year 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 17:26:42 +01:00
Florian Aders (EleRas)
e20b083f0b Fix date - regex for mail-log - parser 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-01-04 15:43:02 +01:00
Michael Kaufmann (d00p)
f252f134b2 fix missing space between action and username 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-03 10:56:59 +01:00
Roman Schmerold (BNoiZe)
5b7fe8cf88 Fixed encoding with new database class, fixes #1343 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-29 15:11:18 +01:00
Michael Kaufmann (d00p)
9fca6a7953 don't rely on Database-functions for getting sql/sql_root data in error-reporting 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-24 09:48:57 +01:00
Michael Kaufmann (d00p)
d831d06da9 don't show 'nice' error if no is specified and disguise passwords of sql-accounts, fixes #1336 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-22 18:14:55 +01:00
Roman Schmerold (BNoiZe)
429f748ad8 Fixing mailtraffic cron, fixes traffic graph sorting 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-22 10:57:56 +01:00
Roman Schmerold (BNoiZe)
a92cdb2926 Added cron for mailtraffic (with EleRas), fixes #69 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-20 23:12:47 +01:00
Michael Kaufmann (d00p)
6a8cd15456 Merge remote-tracking branch 'origin/0.9.31' 2013-12-16 13:37:01 +01:00
Michael Kaufmann (d00p)
41d33ae538 use correct quoting-character in sql-query 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-16 13:34:08 +01:00
Michael Kaufmann (d00p)
164b40fef3 fix wrong language-string in settings/180.dkim.php, implemented Settings::Add() for updates later (much better than a manual query etc.), added new php-errorhandler so we can display php errors/warnings/notices (whatever is activated) in a nicer way 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-16 10:43:38 +01:00
Michael Kaufmann (d00p)
f12428f80d don't rely on defined settings, just read in what's in the database, refs #1325 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-15 19:43:15 +01:00
Michael Kaufmann (d00p)
2f707974e2 fix missing variable in logger, tmp-fix dkim settings 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-15 16:46:15 +01:00
Michael Kaufmann (d00p)
352749c798 cant stop migrating to new Settings class, refs #1325 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-15 15:21:30 +01:00