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

1855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann (d00p)
000bf6aebc restored missing function and migrated it to new PDO database class, fixes #1306 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-22 15:56:25 +01:00
Florian Aders (EleRas)
fcd537b091 Fixed newsfeed with curl 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-11-21 10:09:05 +01:00
Florian Aders
a9a2d296bf Merge pull request #162 from BNoiZe/master 
Added fallback if allow_url_fopen is off
 2013-11-21 01:01:11 -08:00
BNoiZe
df95189e87 Added check if curl is enabled 2013-11-21 09:56:06 +01:00
BNoiZe
dc09840f99 Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-11-21 08:59:23 +01:00
Michael Kaufmann (d00p)
b8952259ba fix creating of ssl-redirect without ssl-ip/port, fixes #1303 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-21 08:01:43 +01:00
BNoiZe
37e6158b57 Added fallback if allow_url_fopen is off 2013-11-20 18:16:24 +01:00
Michael Kaufmann
254672f2dd Merge pull request #161 from BNoiZe/master 
Fixed a typo in a query refs #1287
 2013-11-20 07:22:01 -08:00
BNoiZe
59e9af11fc Fixed a typo in a query refs #1287 2013-11-20 15:40:09 +01:00
Michael Kaufmann (d00p)
ee19c268cc migrated ApsInstaller and ApsUpdater, fixed typo in traffic-cron (thx to Sephi), refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-20 15:02:49 +01:00
Michael Kaufmann (d00p)
cf2eea43c9 fix wrong usage of rowCount() 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-20 14:14:33 +01:00
Florian Aders
de5f85dacf Merge pull request #160 from BNoiZe/master 
Fixed a typo
 2013-11-20 03:49:25 -08:00
BNoiZe
0abd2df357 Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-11-20 12:30:44 +01:00
BNoiZe
88382d2856 Fixed a typo 2013-11-20 12:29:48 +01:00
Michael Kaufmann (d00p)
7a45a534fc added functions to get sql-data to Database-class, migrated backup-cron to new PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-20 10:01:34 +01:00
Michael Kaufmann (d00p)
60ba3f9127 migrated cron_tasks to new PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-20 09:29:14 +01:00
Michael Kaufmann (d00p)
345ba3a202 migrated autoresponder-cron to new PDO database class, beautify sql-query in paging-class, fix typos in traffic-cron (thx to Dessa), refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-20 08:15:30 +01:00
Dessa
55185aab5c Merge pull request #159 from BNoiZe/master 
Fixed a another typo
 2013-11-19 06:27:59 -08:00
BNoiZe
f5940db7b1 Fixed a another typo 2013-11-19 15:17:34 +01:00
Michael Kaufmann
e128f3484b Merge pull request #158 from BNoiZe/master 
Updated webftp to PDO database class, refs #1287
 2013-11-19 04:41:38 -08:00
BNoiZe
74faad408e Fixed a typo refs #1287 2013-11-19 12:44:32 +01:00
BNoiZe
fa027863a2 require is a statement and not a function 2013-11-18 14:49:49 +01:00
BNoiZe
7c9d5ef8dc Merge branch 'master' of git://github.com/Froxlor/Froxlor 
Conflicts:
	webftp.php
 2013-11-18 14:46:25 +01:00
Michael Kaufmann (d00p)
48de5d7c22 require_once is also a statement and not a function 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-18 13:06:43 +01:00
Michael Kaufmann (d00p)
87ccff6a7b more require-statement/function stuff 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-18 13:02:59 +01:00
Michael Kaufmann (d00p)
0db0b3bd88 require is a statement and not a function 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-18 12:53:33 +01:00
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
BNoiZe
2069d150a3 Updated webftp to PDO database class refs #1287 2013-11-18 10:00:28 +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