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

1828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann (d00p)
ca38e20345 migrated traffic-cron and cron-usage-report to new PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-18 11:59:16 +01:00
Michael Kaufmann (d00p)
e2ca3873a8 migrated traffic-cron-functions to new PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-18 09:23:09 +01:00
Michael Kaufmann
bb1561b628 Merge pull request #157 from BNoiZe/master 
Removed $db from customer paging #refs 1287
 2013-11-18 00:12:18 -08:00
BNoiZe
3527177ea9 Removed $db from customer paging #refs 1287 2013-11-18 09:10:18 +01:00
Michael Kaufmann (d00p)
a4ee4be2b4 migrate paging class to new PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-18 09:09:06 +01:00
Michael Kaufmann
17de0ab19e Merge pull request #156 from BNoiZe/master 
Migrated customer_email to PDO database class, refs #1287
 2013-11-17 23:41:07 -08:00
BNoiZe
c6c87fe55a Fixed a typo, small improvements 2013-11-17 21:51:32 +01:00
BNoiZe
38ebfa364f Migrated customer_email to PDO database class, refs #1287 2013-11-17 21:40:50 +01:00
Michael Kaufmann
5b7920c788 Merge pull request #155 from BNoiZe/master 
simplexml check, admin_index-information and more
 2013-11-17 10:35:32 -08:00
BNoiZe
c86a3af042 Removed .orig files 2013-11-17 19:32:44 +01:00
BNoiZe
00375949b5 improve admin_index-information part 2/2 2013-11-17 19:30:09 +01:00
Michael Kaufmann (d00p)
ed1c87c521 as fcgid does not add a handler in a separate config such as fpm does, in the ip/port vhost-config of course, this has to be SetHandler instead of AddHandler, thx to quizzi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-17 19:29:35 +01:00
BNoiZe
7e383fcc10 Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-11-17 18:41:49 +01:00
Michael Kaufmann (d00p)
5d29ce2ad0 improve admin-index information part 1/2 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-17 18:35:38 +01:00
Michael Kaufmann
464ca7a61b Merge pull request #153 from BNoiZe/master 
Initial version of newsfeed in admin dashboard, needs a setting to enable/disable
 2013-11-17 08:36:37 -08:00
Michael Kaufmann (d00p)
4aa23f1e12 migrated mailboxsize-cron to PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-17 12:35:16 +01:00
Michael Kaufmann (d00p)
0b3df4c7d7 removed unused global db-variables 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-17 12:31:15 +01:00
Michael Kaufmann (d00p)
97c6385c36 migrated admin_settings to PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-17 11:01:59 +01:00
Michael Kaufmann (d00p)
cf4865828c fix forgotten ->escape in customer_ftp 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-17 10:51:28 +01:00
Robert Förster (Dessa)
50b9eec6c1 fix another typo 
Signed-off-by: Robert Förster (Dessa) <Dessa@froxlor.org>
 2013-11-16 22:26:51 +01:00
Dessa
006505b32c Merge pull request #154 from ternes3/patch-1 
Update admin_ipsandports.php
 2013-11-16 13:06:50 -08:00
Björn Ternes
057e8d5f8e Update admin_ipsandports.php 
Fix:  Fatal error: Uncaught exception 'Exception' with message 'Could not find class 'Datbase'' in /var/www/froxlor/lib/functions.php:126 Stack trace: #0 [internal function]: Autoloader->doAutoload('Datbase') #1 /var/www/froxlor/admin_ipsandports.php(379): spl_autoload_call('Datbase') #2 {main} thrown in /var/www/froxlor/lib/functions.php on line 126
 2013-11-16 18:50:33 +01:00
BNoiZe
401dd7c96c Added check if simplexml is activated 2013-11-16 17:36:47 +01:00
Michael Kaufmann (d00p)
38563a443c migrated admin_admins to PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-16 17:23:51 +01:00
BNoiZe
a431cbcf9e Cleaning up admin newsfeed 2013-11-15 22:50:54 +01:00
BNoiZe
c2bae1f25a Initial version of newsfeed in admin dashboard 2013-11-15 22:11:25 +01:00
Michael Kaufmann (d00p)
f1cfe41d07 fix getCustomerDetail()-query, thx to Sephi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-15 08:29:53 +01:00
Michael Kaufmann (d00p)
e25597106e make fpm socket directory a setting, fixes #1300 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-14 09:29:55 +01:00
Michael Kaufmann (d00p)
12800b730d remove some unused functions and migrated some more functions to PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-14 08:27:57 +01:00
Michael Kaufmann (d00p)
868b472b98 fix undefined variable because of re-structuring, thx Dessa 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-13 17:52:00 +01:00
Michael Kaufmann (d00p)
11393abfbe every day is typo day, again...thx oschn0r 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-13 17:41:39 +01:00
Michael Kaufmann (d00p)
c21b767654 every day is typo day...thx oschn0r 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-13 17:22:37 +01:00
Michael Kaufmann (d00p)
5f7ab0330a fix another typo, thx to oschn0r 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-13 16:55:54 +01:00
Michael Kaufmann (d00p)
e07596b642 fix typo, thx to oschn0r 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-13 16:27:27 +01:00
Michael Kaufmann (d00p)
0d7a16ad46 migrated admin_domains to new PDO Database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-13 15:39:20 +01:00
Michael Kaufmann
268bb10d1e Merge pull request #151 from BNoiZe/master 
Pushed TableSorter to version 2.13.3
 2013-11-11 13:31:11 -08:00
BNoiZe
cbb03b3f44 Pushed TableSorter to version 2.13.3 2013-11-11 22:29:49 +01:00
Michael Kaufmann
d2c363cd81 Merge pull request #150 from BNoiZe/master 
Serveral theme improvements and bugfixes
 2013-11-11 13:24:36 -08:00
BNoiZe
d5a958353f Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-11-11 22:13:50 +01:00
BNoiZe
af86e0945f Fixed an error 404, removed useless duplicate description 2013-11-11 22:08:34 +01:00
Michael Kaufmann (d00p)
6a2b81bc17 read open_basedir value properly from php.ini template, thx to s_v_e_n 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-11 12:42:50 +01:00
Michael Kaufmann (d00p)
e5bc565d7e also fix 'su' link on admin-traffic page in old theme 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-11 10:02:00 +01:00
Michael Kaufmann (d00p)
101d972a14 fix 'su' on admin-traffic overview, thx Sephi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-11 09:59:03 +01:00
Michael Kaufmann (d00p)
a97c24634b improve logging user-storage, thx oschn0r 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-10 20:56:37 +01:00
BNoiZe
7af2ddca86 Updated WebFTP styling, made login sligthly smaller 2013-11-09 20:54:50 +01:00
BNoiZe
abadb69443 Restyling of several components, small bugfixes 2013-11-09 20:46:34 +01:00
Michael Kaufmann
50bd15c5a8 Merge pull request #149 from BNoiZe/master 
Fixed an error 404, pushed jCanvas to newest version, language update
 2013-11-09 09:18:15 -08:00
BNoiZe
3f793e8c18 Updated cron_usage_report in english and german 2013-11-09 18:01:18 +01:00
BNoiZe
7f0a70a070 Pushed jcanvas to version 13.11.07 2013-11-09 17:56:09 +01:00
BNoiZe
3eebf840f2 Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-11-09 14:54:03 +01:00