maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
2,117 Commits 6 Branches 188 Tags
4be52f76ebfcc7bf221c64452ec33877ec96035d
Commit Graph

782 Commits

Author SHA1 Message Date
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)
c5efe9fd7f Fixed a bug which made the function always return false, fixes #1348 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-08 16:07:13 +01:00
Roman Schmerold (BNoiZe)
7fc3ac587a Redirect to last URL after relogin when session timed out, fixes #443 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 22:35:26 +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)
0c2aa8de45 Add description field to FTP accounts, fixes #1340 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-02 22:45:30 +01:00
Florian Aders (EleRas)
2d1fd0c8c5 Delete old froxlor-theme and automatically move users to CSS - version of theme 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-01-01 13:11:27 +01:00
Florian Aders (EleRas)
93d60e4305 Only show description for theme variants, not base-theme - name 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-31 10:15:31 +01:00
Roman Schmerold (BNoiZe)
3621effb36 Fixed a bug where action links where highlighted even if they weren't active 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-29 19:16:22 +01:00
Florian Aders (EleRas)
b4a345d182 Allow themes to have various variants 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-29 17:35:03 +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)
984624bdc4 fix initial value of function parameter as it leads to the first condition to be always true, fixes #1330 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-19 12:35:07 +01:00
Michael Kaufmann (d00p)
0fee9a3480 complete migration to new Settings class, fixes #1325 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-19 07:56:58 +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)
28fbd2487e backport important changes of makePathfield for 0.9.31 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-16 11:33:13 +01:00
Michael Kaufmann (d00p)
6ed02e593c display phperror below fixed header in sparkle theme; fix wrong parameter-list and ignorance of in makePathfield 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-16 11:32:25 +01:00
Michael Kaufmann (d00p)
37a242a679 migrate webftp stuff to new settings-class, refs #1325 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-16 11:03:09 +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)
1af06b2413 fix typo, refs #1325 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-15 16:26:47 +01:00
Michael Kaufmann (d00p)
e7c53e4abb some more migrating to new settings class, refs #1325 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-15 15:37:07 +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
Michael Kaufmann (d00p)
7f565c305c migrate more stuff to new Settings class, refs #1325 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-15 14:38:53 +01:00
Roman Schmerold (BNoiZe)
bcf187761c still implementing the new Settings-class, refs #1325 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-15 14:35:07 +01:00
Roman Schmerold (BNoiZe)
528082b49f Merge branch 'master' of github.com:Froxlor/Froxlor 2013-12-15 13:16:08 +01:00
Roman Schmerold (BNoiZe)
d5e0484de3 even moar implementations of new Settings-class, refs #1325 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-15 13:15:34 +01:00
Michael Kaufmann (d00p)
52aaedd33a migrated a few functions to new Settings class and removed unused function createAWStatsVhost(), refs #1325 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-15 13:05:19 +01:00
Michael Kaufmann (d00p)
558108008a more implementing of new Settings class, refs #1325 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-15 12:40:24 +01:00
Michael Kaufmann (d00p)
276d6b30d1 first few implementations of new Setting-class, refs #1325 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-15 11:47:23 +01:00
Michael Kaufmann (d00p)
b18afacedb Merge remote-tracking branch 'origin/0.9.31' 2013-12-15 08:41:29 +01:00
Roman Schmerold (BNoiZe)
e4142571d7 removed duplicate of overview page (settings) 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-14 19:09:45 +01:00
Roman Schmerold (BNoiZe)
491ac02c0d added 'active' to class in navigation when link is active 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-14 16:30:08 +01:00
Michael Kaufmann (d00p)
eb7d7d7316 Merge remote-tracking branch 'origin/0.9.31' 2013-12-14 15:44:34 +01:00
Michael Kaufmann (d00p)
7688f83134 beautify loadConfigArrayDir(); fix pagination and sorting in admin-tickets, fixes #701 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-14 15:43:51 +01:00
Roman Schmerold (BNoiZe)
36b6b6b857 Added logging of faulty login attempts, fixes #1321 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-14 10:28:33 +01:00
Michael Kaufmann (d00p)
296b8b36ab Merge remote-tracking branch 'origin/0.9.31' 2013-12-13 21:33:24 +01:00
Michael Kaufmann (d00p)
682defcbcf fix tiny sql-query error when using APS and correct DbManager-replacers 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-13 08:07:52 +01:00
Michael Kaufmann (d00p)
810399d337 Merge remote-tracking branch 'origin/0.9.31' 2013-12-13 07:15:43 +01:00
Michael Kaufmann (d00p)
06cff22caa allow custom sendmail_path value in php.ini when using php-fpm, fixes #1323 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-12 14:27:24 +01:00
Michael Kaufmann (d00p)
73f5547a5e add php-config for froxlor-vhost and set it as default for froxlor's vhost when fcgid/fpm is used (and the current default is set, custom settings won't be overwritten) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-12 10:44:32 +01:00
Michael Kaufmann (d00p)
ce28cb1f0e Merge remote-tracking branch 'origin/0.9.31' 2013-12-12 08:27:10 +01:00
Roman Schmerold (BNoiZe)
911de0727f fixed search not calculating diskspace/traffic if no operator is used 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-11 17:11:49 +01:00