df95189e87Added check if curl is enabled
BNoiZe
2013-11-21 09:56:06 +01:00
dc09840f99Merge branch 'master' of git://github.com/Froxlor/Froxlor
BNoiZe
2013-11-21 08:59:23 +01:00
b8952259bafix creating of ssl-redirect without ssl-ip/port, fixes#1303
Michael Kaufmann (d00p)
2013-11-21 08:01:43 +01:00
37e6158b57Added fallback if allow_url_fopen is off
BNoiZe
2013-11-20 18:16:24 +01:00
254672f2ddMerge pull request #161 from BNoiZe/master
Michael Kaufmann
2013-11-20 07:22:01 -08:00
59e9af11fcFixed a typo in a query refs #1287
BNoiZe
2013-11-20 15:40:09 +01:00
ee19c268ccmigrated ApsInstaller and ApsUpdater, fixed typo in traffic-cron (thx to Sephi), refs #1287
Michael Kaufmann (d00p)
2013-11-20 15:02:49 +01:00
cf2eea43c9fix wrong usage of rowCount()
Michael Kaufmann (d00p)
2013-11-20 14:14:33 +01:00
0abd2df357Merge branch 'master' of git://github.com/Froxlor/Froxlor
BNoiZe
2013-11-20 12:30:44 +01:00
88382d2856Fixed a typo
BNoiZe
2013-11-20 12:29:48 +01:00
7a45a534fcadded functions to get sql-data to Database-class, migrated backup-cron to new PDO database class, refs #1287
Michael Kaufmann (d00p)
2013-11-20 10:01:34 +01:00
60ba3f9127migrated cron_tasks to new PDO database class, refs #1287
Michael Kaufmann (d00p)
2013-11-20 09:29:14 +01:00
345ba3a202migrated autoresponder-cron to new PDO database class, beautify sql-query in paging-class, fix typos in traffic-cron (thx to Dessa), refs #1287
Michael Kaufmann (d00p)
2013-11-20 08:15:30 +01:00
55185aab5cMerge pull request #159 from BNoiZe/master
Dessa
2013-11-19 06:27:59 -08:00
f5940db7b1Fixed a another typo
BNoiZe
2013-11-19 15:17:34 +01:00
e128f3484bMerge pull request #158 from BNoiZe/master
Michael Kaufmann
2013-11-19 04:41:38 -08:00
74faad408eFixed a typo refs #1287
BNoiZe
2013-11-19 12:44:32 +01:00
fa027863a2require is a statement and not a function
BNoiZe
2013-11-18 14:49:49 +01:00
7c9d5ef8dcMerge branch 'master' of git://github.com/Froxlor/Froxlor
BNoiZe
2013-11-18 14:46:25 +01:00
48de5d7c22require_once is also a statement and not a function
Michael Kaufmann (d00p)
2013-11-18 13:06:43 +01:00
87ccff6a7bmore require-statement/function stuff
Michael Kaufmann (d00p)
2013-11-18 13:02:59 +01:00
0db0b3bd88require is a statement and not a function
Michael Kaufmann (d00p)
2013-11-18 12:53:33 +01:00
ca38e20345migrated traffic-cron and cron-usage-report to new PDO database class, refs #1287
Michael Kaufmann (d00p)
2013-11-18 11:59:16 +01:00
2069d150a3Updated webftp to PDO database class refs #1287
BNoiZe
2013-11-18 10:00:28 +01:00
e2ca3873a8migrated traffic-cron-functions to new PDO database class, refs #1287
Michael Kaufmann (d00p)
2013-11-18 09:23:09 +01:00
bb1561b628Merge pull request #157 from BNoiZe/master
Michael Kaufmann
2013-11-18 00:12:18 -08:00
00375949b5improve admin_index-information part 2/2
BNoiZe
2013-11-17 19:30:09 +01:00
ed1c87c521as 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
Michael Kaufmann (d00p)
2013-11-17 19:29:35 +01:00
7e383fcc10Merge branch 'master' of git://github.com/Froxlor/Froxlor
BNoiZe
2013-11-17 18:41:49 +01:00
5d29ce2ad0improve admin-index information part 1/2
Michael Kaufmann (d00p)
2013-11-17 18:35:38 +01:00
464ca7a61bMerge pull request #153 from BNoiZe/master
Michael Kaufmann
2013-11-17 08:36:37 -08:00
4aa23f1e12migrated mailboxsize-cron to PDO database class, refs #1287
Michael Kaufmann (d00p)
2013-11-17 12:35:16 +01:00
0b3df4c7d7removed unused global db-variables
Michael Kaufmann (d00p)
2013-11-17 12:31:15 +01:00
97c6385c36migrated admin_settings to PDO database class, refs #1287
Michael Kaufmann (d00p)
2013-11-17 11:01:59 +01:00
cf4865828cfix forgotten ->escape in customer_ftp
Michael Kaufmann (d00p)
2013-11-17 10:51:28 +01:00
50b9eec6c1fix another typo
Robert Förster (Dessa)
2013-11-16 22:26:51 +01:00
006505b32cMerge pull request #154 from ternes3/patch-1
Dessa
2013-11-16 13:06:50 -08:00
057e8d5f8eUpdate admin_ipsandports.php
Björn Ternes
2013-11-16 18:50:33 +01:00
401dd7c96cAdded check if simplexml is activated
BNoiZe
2013-11-16 17:36:47 +01:00
38563a443cmigrated admin_admins to PDO database class, refs #1287
Michael Kaufmann (d00p)
2013-11-16 17:23:51 +01:00
a431cbcf9eCleaning up admin newsfeed
BNoiZe
2013-11-15 22:50:54 +01:00
c2bae1f25aInitial version of newsfeed in admin dashboard
BNoiZe
2013-11-15 22:11:25 +01:00
f1cfe41d07fix getCustomerDetail()-query, thx to Sephi
Michael Kaufmann (d00p)
2013-11-15 08:29:53 +01:00
e25597106emake fpm socket directory a setting, fixes#1300
Michael Kaufmann (d00p)
2013-11-14 09:29:55 +01:00
12800b730dremove some unused functions and migrated some more functions to PDO database class, refs #1287
Michael Kaufmann (d00p)
2013-11-14 08:27:57 +01:00
868b472b98fix undefined variable because of re-structuring, thx Dessa
Michael Kaufmann (d00p)
2013-11-13 17:52:00 +01:00
11393abfbeevery day is typo day, again...thx oschn0r
Michael Kaufmann (d00p)
2013-11-13 17:41:39 +01:00
c21b767654every day is typo day...thx oschn0r
Michael Kaufmann (d00p)
2013-11-13 17:22:37 +01:00
5f7ab0330afix another typo, thx to oschn0r
Michael Kaufmann (d00p)
2013-11-13 16:55:54 +01:00
e07596b642fix typo, thx to oschn0r
Michael Kaufmann (d00p)
2013-11-13 16:27:27 +01:00
0d7a16ad46migrated admin_domains to new PDO Database class, refs #1287
Michael Kaufmann (d00p)
2013-11-13 15:39:20 +01:00
268bb10d1eMerge pull request #151 from BNoiZe/master
Michael Kaufmann
2013-11-11 13:31:11 -08:00
cbb03b3f44Pushed TableSorter to version 2.13.3
BNoiZe
2013-11-11 22:29:49 +01:00
d2c363cd81Merge pull request #150 from BNoiZe/master
Michael Kaufmann
2013-11-11 13:24:36 -08:00
d5a958353fMerge branch 'master' of git://github.com/Froxlor/Froxlor
BNoiZe
2013-11-11 22:13:50 +01:00
abadb69443Restyling of several components, small bugfixes
BNoiZe
2013-11-09 20:46:34 +01:00
50bd15c5a8Merge pull request #149 from BNoiZe/master
Michael Kaufmann
2013-11-09 09:18:15 -08:00
3f793e8c18Updated cron_usage_report in english and german
BNoiZe
2013-11-09 18:01:18 +01:00
7f0a70a070Pushed jcanvas to version 13.11.07
BNoiZe
2013-11-09 17:56:09 +01:00
3eebf840f2Merge branch 'master' of git://github.com/Froxlor/Froxlor
BNoiZe
2013-11-09 14:54:03 +01:00
d2a8877069fix query in admin-customers, improve admin-ipsandports, clean up getThemes(), refs #1287
Michael Kaufmann (d00p)
2013-11-09 13:56:27 +01:00
f85c0ce495Merge branch 'master' of git://github.com/Froxlor/Froxlor
BNoiZe
2013-11-09 10:37:08 +01:00
e1253413d5dont show error-message when removing of database physically failed
Michael Kaufmann (d00p)
2013-11-08 14:25:48 +01:00
a152ae3e06fix some ticket-system issues related with migrating to PDO
Michael Kaufmann (d00p)
2013-11-08 14:25:19 +01:00
d9952f7401fix pdo stuff in admin-customers, refs #1287
Michael Kaufmann (d00p)
2013-11-08 09:31:51 +01:00
fa5f1900f0add trace to database error-log-message (it just helps a lot finding the error); fixed queries in fpm und fcgid class; minor cosmetic changes
Michael Kaufmann (d00p)
2013-11-08 08:54:44 +01:00
fb8b233560migrate updateFunctions to PDO and fix version_compare2
Michael Kaufmann (d00p)
2013-11-08 08:48:13 +01:00
26d9aa570cremove unused code and database-tables; set version to 0.9.31-dev1
Michael Kaufmann (d00p)
2013-11-07 18:49:16 +01:00
b56b149bdbMerge branch 'master' of git://github.com/Froxlor/Froxlor
BNoiZe
2013-11-07 17:01:17 +01:00
aec5eb9161fix undefined language-string index in add/edit ip
Michael Kaufmann (d00p)
2013-11-07 16:46:19 +01:00
f8d2a76784fixed queries in admin_templates
Michael Kaufmann (d00p)
2013-11-07 11:16:38 +01:00
d251509bebfix two queries and corrected escaping of ticket-category, thx to vali
Michael Kaufmann (d00p)
2013-11-07 10:26:54 +01:00
635681b634Merge branch 'master' of git://github.com/Froxlor/Froxlor
BNoiZe
2013-11-06 18:05:57 +01:00
cb1f6307dcFIxed an error 404
BNoiZe
2013-11-06 18:04:55 +01:00
3e4697eb51migrated and improved two functions regarding PDO stuff, refs #1287
Michael Kaufmann (d00p)
2013-11-06 17:21:56 +01:00
f2643103b3completed migration of ticket-class to PDO database class and bugfixing admin-tickets, refs #1287
Michael Kaufmann (d00p)
2013-11-06 15:24:39 +01:00
941a391c0ebugfixing admin_customers, damn typos
Michael Kaufmann (d00p)
2013-11-06 11:29:40 +01:00
04012e5fffmore fixes for migration to PDO, refs #1287
Michael Kaufmann (d00p)
2013-11-06 11:08:48 +01:00
74bb3ccb7emigrate ticket-system to PDO database class, refs #1287
Michael Kaufmann (d00p)
2013-11-06 11:06:03 +01:00
8a9ed3d9f1change pexecute tp pexecute_first in phpinterface-classes
Michael Kaufmann (d00p)
2013-11-06 10:52:20 +01:00
94a5edc1ebimplement pexecute_first to PDO database class to return a result right away
Michael Kaufmann (d00p)
2013-11-06 10:51:50 +01:00
2e42ef2043fix creation of vhosts-config if email_only==1 (means, don't create a config)
Michael Kaufmann (d00p)
2013-11-06 09:41:01 +01:00
849da2a423migrate phpinterface-classes to PDO database class, refs #1287
Michael Kaufmann (d00p)
2013-11-06 09:11:26 +01:00
388156b7b8migrated admin-customers to PDO database class, refs #1287
Michael Kaufmann (d00p)
2013-11-06 08:46:45 +01:00