From 3b9727942a4c4a0815508cfae1f0dab7f44d1fc0 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 24 Dec 2013 14:34:27 +0100 Subject: [PATCH 1/3] we need php-5.3 not 5.2 - check is correct but text was not Signed-off-by: Michael Kaufmann (d00p) --- install/lng/english.lng.php | 2 +- install/lng/german.lng.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install/lng/english.lng.php b/install/lng/english.lng.php index 9c5e8086..9a33d0ce 100644 --- a/install/lng/english.lng.php +++ b/install/lng/english.lng.php @@ -23,7 +23,7 @@ $lng['requirements']['not_true'] = 'no'; $lng['requirements']['notfound'] = 'not found'; $lng['requirements']['notinstalled'] = 'not installed'; $lng['requirements']['activated'] = 'enabled'; -$lng['requirements']['phpversion'] = 'PHP version >= 5.2'; +$lng['requirements']['phpversion'] = 'PHP version >= 5.3'; $lng['requirements']['phpmagic_quotes_runtime'] = 'magic_quotes_runtime...'; $lng['requirements']['phpmagic_quotes_runtime_description'] = 'PHP setting "magic_quotes_runtime" must be set to "Off". We have disabled it temporary for now please fix the coresponding php.ini.'; $lng['requirements']['phppdo'] = 'PHP PDO extension and PDO-MySQL driver...'; diff --git a/install/lng/german.lng.php b/install/lng/german.lng.php index 1a3af64a..68360d20 100644 --- a/install/lng/german.lng.php +++ b/install/lng/german.lng.php @@ -23,7 +23,7 @@ $lng['requirements']['not_true'] = 'nein'; $lng['requirements']['notfound'] = 'nicht gefunden'; $lng['requirements']['notinstalled'] = 'nicht installiert'; $lng['requirements']['activated'] = 'ist aktiviert.'; -$lng['requirements']['phpversion'] = 'PHP Version >= 5.2'; +$lng['requirements']['phpversion'] = 'PHP Version >= 5.3'; $lng['requirements']['phpmagic_quotes_runtime'] = 'magic_quotes_runtime'; $lng['requirements']['phpmagic_quotes_runtime_description'] = 'Die PHP Einstellung "magic_quotes_runtime" muss deaktiviert sein ("Off"). Die Einstellung wurde temporär deaktiviert, bitte ändern Sie diese in der entsprechenden php.ini.'; $lng['requirements']['phppdo'] = 'PHP PDO Erweiterung und PDO-MySQL Treiber...'; From 2dc0bf21040ab47c0472e6e573d8e2f029d92220 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 24 Dec 2013 14:36:11 +0100 Subject: [PATCH 2/3] use better german Signed-off-by: Michael Kaufmann (d00p) --- install/lng/german.lng.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/lng/german.lng.php b/install/lng/german.lng.php index 68360d20..0fac1a8a 100644 --- a/install/lng/german.lng.php +++ b/install/lng/german.lng.php @@ -34,7 +34,7 @@ $lng['requirements']['phpbcmath'] = 'PHP bcmath-Erweiterung...'; $lng['requirements']['bcmathdescription'] = 'Traffic-Berechnungs bezogene Funktionen stehen nicht vollständig zur Verfügung!'; $lng['requirements']['openbasedir'] = 'open_basedir genutzt wird...'; $lng['requirements']['openbasedirenabled'] = 'Froxlor wird mit aktiviertem open_basedir nicht vollständig funktionieren. Bitte deaktivieren Sie open_basedir für Froxlor in der entsprechenden php.ini'; -$lng['requirements']['diedbecauseofrequirements'] = 'Kann Froxlor ohne diese Voraussetzungen nicht installieren! Versuchen Sie die angezeigten Problem zu beheben und versuchen Sie es erneut.'; +$lng['requirements']['diedbecauseofrequirements'] = 'Kann Froxlor ohne diese Voraussetzungen nicht installieren! Beheben Sie die angezeigten Probleme und versuchen Sie es erneut.'; $lng['requirements']['froxlor_succ_checks'] = 'Alle Vorraussetzungen sind erfüllt'; $lng['install']['lngtitle'] = 'Froxlor Installation - Sprache auswählen'; From 44ae470d7e3e844b306a2f42e935852bf3de5955 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 24 Dec 2013 14:43:47 +0100 Subject: [PATCH 3/3] add check for optional php-curl extension Signed-off-by: Michael Kaufmann (d00p) --- install/lib/class.FroxlorInstall.php | 10 ++++++++++ install/lng/english.lng.php | 2 ++ install/lng/german.lng.php | 2 ++ 3 files changed, 14 insertions(+) diff --git a/install/lib/class.FroxlorInstall.php b/install/lib/class.FroxlorInstall.php index b96e42f9..50776290 100644 --- a/install/lib/class.FroxlorInstall.php +++ b/install/lib/class.FroxlorInstall.php @@ -908,6 +908,16 @@ class FroxlorInstall { $content .= $this->_status_message('green', $this->_lng['requirements']['installed']); } + // check for curl extension + $content .= $this->_status_message('begin', $this->_lng['requirements']['phpcurl']); + + if (!extension_loaded('curl')) { + $content .= $this->_status_message('orange', $this->_lng['requirements']['notinstalled'] . "
" . $this->_lng['requirements']['curldescription']); + } else { + $content .= $this->_status_message('green', $this->_lng['requirements']['installed']); + } + + // check for open_basedir $content .= $this->_status_message('begin', $this->_lng['requirements']['openbasedir']); $php_ob = @ini_get("open_basedir"); diff --git a/install/lng/english.lng.php b/install/lng/english.lng.php index 9a33d0ce..4c9c4c68 100644 --- a/install/lng/english.lng.php +++ b/install/lng/english.lng.php @@ -31,7 +31,9 @@ $lng['requirements']['phpxml'] = 'PHP XML-extension...'; $lng['requirements']['phpfilter'] = 'PHP filter-extension...'; $lng['requirements']['phpposix'] = 'PHP posix-extension...'; $lng['requirements']['phpbcmath'] = 'PHP bcmath-extension...'; +$lng['requirements']['phpcurl'] = 'PHP curl-extension...'; $lng['requirements']['bcmathdescription'] = 'Traffic-calculation related functions will not work correctly!'; +$lng['requirements']['curldescription'] = 'Version-check and news-feed may not work correctly!'; $lng['requirements']['openbasedir'] = 'open_basedir...'; $lng['requirements']['openbasedirenabled'] = 'Froxlor will not work properly with open_basedir enabled. Please disable open_basedir for Froxlor in the coresponding php.ini'; $lng['requirements']['diedbecauseofrequirements'] = 'Cannot install Froxlor without these requirements! Try to fix them and retry.'; diff --git a/install/lng/german.lng.php b/install/lng/german.lng.php index 0fac1a8a..d73ebb2e 100644 --- a/install/lng/german.lng.php +++ b/install/lng/german.lng.php @@ -31,7 +31,9 @@ $lng['requirements']['phpxml'] = 'PHP XML-Erweiterung...'; $lng['requirements']['phpfilter'] = 'PHP filter-Erweiterung...'; $lng['requirements']['phpposix'] = 'PHP posix-Erweiterung...'; $lng['requirements']['phpbcmath'] = 'PHP bcmath-Erweiterung...'; +$lng['requirements']['phpcurl'] = 'PHP curl-Erweiterung...'; $lng['requirements']['bcmathdescription'] = 'Traffic-Berechnungs bezogene Funktionen stehen nicht vollständig zur Verfügung!'; +$lng['requirements']['curldescription'] = 'Versions-Prüfung und News-Feed stehen nicht vollständig zur Verfügung!'; $lng['requirements']['openbasedir'] = 'open_basedir genutzt wird...'; $lng['requirements']['openbasedirenabled'] = 'Froxlor wird mit aktiviertem open_basedir nicht vollständig funktionieren. Bitte deaktivieren Sie open_basedir für Froxlor in der entsprechenden php.ini'; $lng['requirements']['diedbecauseofrequirements'] = 'Kann Froxlor ohne diese Voraussetzungen nicht installieren! Beheben Sie die angezeigten Probleme und versuchen Sie es erneut.';