Michael Kaufmann (d00p)
|
4381eff384
|
check for fcgid being enabled when switching the webserver as only apache2 can handle fcgid (prevent a possible deadlock in the panel)
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-11-27 08:34:49 +01:00 |
|
Florian Aders
|
87fae7f2e4
|
Merge pull request #165 from BNoiZe/master
Fixed an error in webftp template, refs #1312
|
2013-11-26 22:02:08 -08:00 |
|
BNoiZe
|
0e977b45cb
|
Fixed an error in webftp template, refs #1312
$linker->getLink() will not work in webftp
|
2013-11-27 05:27:29 +01:00 |
|
Dessa
|
e47cc86259
|
Merge pull request #164 from BNoiZe/master
fixed an error, refs #1287
|
2013-11-26 11:39:18 -08:00 |
|
BNoiZe
|
2d1e7f7756
|
fixed an error, refs #1287
|
2013-11-26 20:38:27 +01:00 |
|
Michael Kaufmann
|
35c3f3d71e
|
Merge pull request #163 from BNoiZe/master
More PDO migration. Merge multiple location-blocks of the same directory in ngnix, fixes #1309
|
2013-11-26 09:25:22 -08:00 |
|
Michael Kaufmann (d00p)
|
567f789dab
|
at this stage in the updater, it's too late to inform about pdo
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-11-26 10:16:19 +01:00 |
|
Michael Kaufmann (d00p)
|
84ed13d791
|
update-note about php-pdo being used now
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-11-26 09:41:40 +01:00 |
|
Michael Kaufmann (d00p)
|
81c0771f3b
|
corrected Database::needSqlData() and Database::getSqlData(), refs #1287
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-11-26 09:08:27 +01:00 |
|
Michael Kaufmann (d00p)
|
a2dbf56d2e
|
migrated correctMysqlUsers() function to new PDO database class, refs #1287
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-11-26 08:13:05 +01:00 |
|
BNoiZe
|
589e422767
|
Migrated updateCounters to new PDO database class, refs #1287
|
2013-11-25 22:32:22 +01:00 |
|
BNoiZe
|
fc5c4658d1
|
Added mergeVhostBlocks() for nginx cron, refs #1309
|
2013-11-25 19:32:01 +01:00 |
|
Michael Kaufmann (d00p)
|
c5937077c4
|
add needed sql-root-data to customer-mysql
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-11-25 10:01:39 +01:00 |
|
Michael Kaufmann (d00p)
|
7297ce88b5
|
fixed missed statement-fetch in cron-task when adding a new ftp-user
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-11-25 09:21:51 +01:00 |
|
Michael Kaufmann (d00p)
|
7a3d696c6a
|
migrated DomainSSL-class to new PDO database class, refs #1287
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-11-25 09:18:11 +01:00 |
|
Michael Kaufmann (d00p)
|
ae4bc4471e
|
migrated APS parser class to new PDO database class, refs #1287
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-11-25 08:47:54 +01:00 |
|
Michael Kaufmann (d00p)
|
c4fc03d7af
|
separate certificate and chainfile by newline, fixes #1307
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-11-23 15:14:41 +01:00 |
|
Robert Förster (Dessa)
|
94e63e78d1
|
fix typo
Signed-off-by: Robert Förster (Dessa) <Dessa@froxlor.org>
|
2013-11-23 10:28:29 +01:00 |
|
Michael Kaufmann (d00p)
|
02f7a56aeb
|
fix syntax-error in getLanguages, thx to Sephi, refs #1306
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-11-22 22:46:48 +01:00 |
|
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 |
|