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

1791 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BNoiZe
cbb03b3f44 Pushed TableSorter to version 2.13.3 2013-11-11 22:29:49 +01: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
Michael Kaufmann (d00p)
d2a8877069 fix query in admin-customers, improve admin-ipsandports, clean up getThemes(), refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-09 13:56:27 +01:00
BNoiZe
f85c0ce495 Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-11-09 10:37:08 +01:00
Michael Kaufmann (d00p)
e1253413d5 dont show error-message when removing of database physically failed 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-08 14:25:48 +01:00
Michael Kaufmann (d00p)
a152ae3e06 fix some ticket-system issues related with migrating to PDO 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-08 14:25:19 +01:00
Michael Kaufmann (d00p)
d9952f7401 fix pdo stuff in admin-customers, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-08 09:31:51 +01:00
Michael Kaufmann (d00p)
fa5f1900f0 add trace to database error-log-message (it just helps a lot finding the error); fixed queries in fpm und fcgid class; minor cosmetic changes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-08 08:54:44 +01:00
Michael Kaufmann (d00p)
fb8b233560 migrate updateFunctions to PDO and fix version_compare2 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-08 08:48:13 +01:00
Michael Kaufmann (d00p)
26d9aa570c remove unused code and database-tables; set version to 0.9.31-dev1 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-07 18:49:16 +01:00
BNoiZe
b56b149bdb Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-11-07 17:01:17 +01:00
Michael Kaufmann (d00p)
aec5eb9161 fix undefined language-string index in add/edit ip 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-07 16:46:19 +01:00
Michael Kaufmann (d00p)
f8d2a76784 fixed queries in admin_templates 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-07 11:16:38 +01:00
Michael Kaufmann (d00p)
d251509beb fix two queries and corrected escaping of ticket-category, thx to vali 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-07 10:26:54 +01:00
BNoiZe
635681b634 Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-11-06 18:05:57 +01:00
BNoiZe
cb1f6307dc FIxed an error 404 2013-11-06 18:04:55 +01:00
Michael Kaufmann (d00p)
3e4697eb51 migrated and improved two functions regarding PDO stuff, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-06 17:21:56 +01:00
Michael Kaufmann (d00p)
f2643103b3 completed migration of ticket-class to PDO database class and bugfixing admin-tickets, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-06 15:24:39 +01:00
Michael Kaufmann (d00p)
941a391c0e bugfixing admin_customers, damn typos 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-06 11:29:40 +01:00
Michael Kaufmann (d00p)
04012e5fff more fixes for migration to PDO, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-06 11:08:48 +01:00
Michael Kaufmann (d00p)
74bb3ccb7e migrate ticket-system to PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-06 11:06:03 +01:00
Michael Kaufmann (d00p)
8a9ed3d9f1 change pexecute tp pexecute_first in phpinterface-classes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-06 10:52:20 +01:00
Michael Kaufmann (d00p)
94a5edc1eb implement pexecute_first to PDO database class to return a result right away 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-06 10:51:50 +01:00
Michael Kaufmann (d00p)
2e42ef2043 fix creation of vhosts-config if email_only==1 (means, don't create a config) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-06 09:41:01 +01:00
Michael Kaufmann (d00p)
849da2a423 migrate phpinterface-classes to PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-06 09:11:26 +01:00
Michael Kaufmann (d00p)
388156b7b8 migrated admin-customers to PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-06 08:46:45 +01:00
Michael Kaufmann (d00p)
96525584e2 fix typo in prepared-statement-replacer, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-05 13:51:05 +01:00
Michael Kaufmann (d00p)
864e6c6139 fix typo in replacer-variable in customer-extras 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-04 22:29:50 +01:00
Michael Kaufmann (d00p)
661c081a77 fix execute of statement if variables != replacers in sql-prepare query 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-04 22:23:49 +01:00
Michael Kaufmann
4b900f9b8f Merge pull request #148 from BNoiZe/master 
Migrated index to PDO database class, refs #1287
 2013-11-04 07:09:14 -08:00
BNoiZe
9765799bc7 Migrated index to PDO database class, refs #1287 2013-11-04 15:23:52 +01:00
Michael Kaufmann (d00p)
3e7df9cb7a remove parameter from FroxorLogger class and migrated it to PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-04 13:28:23 +01:00
Michael Kaufmann (d00p)
222e304c93 add missing language strings to german language file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-04 13:09:56 +01:00
Michael Kaufmann (d00p)
9a187b8e82 removed unused htpasswd-htaccess-remover script; removed non-existing language-string-indeces from langfile 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-04 13:03:53 +01:00
Michael Kaufmann (d00p)
2614c86079 migrated preconfig to PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-04 11:38:09 +01:00
Michael Kaufmann (d00p)
af2c068970 migrated update script to PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-04 11:34:57 +01:00
Michael Kaufmann (d00p)
8638952afe Merge branch 'master' of github.com:Froxlor/Froxlor 2013-11-04 09:04:20 +01:00
Michael Kaufmann (d00p)
e3750a2988 remove unused upgrade procedures, migrated a few minor functions and files to PDO database, fixed FROXLOR_INSTALL_DIR define for master-cronjob, fixes #1294 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-04 09:03:29 +01:00
Michael Kaufmann
80ebbc9228 Merge pull request #147 from BNoiZe/master 
Migrated customer_extras to new PDO database class, refs #1287
 2013-11-03 13:49:18 -08:00