From 01a826b2e53cb6edfe2af03cfcdb81d1409f9016 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Oct 2010 00:15:08 +0000 Subject: [PATCH] More warnings on install. --- htdocs/install/check.php | 7 ++++++- htdocs/langs/en_US/install.lang | 1 + htdocs/langs/fr_FR/install.lang | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 833b7c30ca7..e583a448ef9 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -62,11 +62,16 @@ print ''.$langs->trans("MiscellanousChecks").":
\n"; // Check PHP version -if (versioncompare(versionphparray(),array(4,3,10)) < 0) +if (versioncompare(versionphparray(),array(4,3,10)) < 0) // Minimum to try (error if lower) { print 'Error '.$langs->trans("ErrorPHPVersionTooLow",'4.3.10'); $checksok=0; } +else if (versioncompare(versionphparray(),array(5,0,0)) < 0) // Minimum supported (warning if lower) +{ + print 'Error '.$langs->trans("WarningPHPVersionTooLow",'5.0.0'); + $checksok=0; +} else { print 'Ok '.$langs->trans("PHPVersion")." ".versiontostring(versionphparray()); diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang index 179ed3a0a30..c92df18082b 100644 --- a/htdocs/langs/en_US/install.lang +++ b/htdocs/langs/en_US/install.lang @@ -26,6 +26,7 @@ ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'. ErrorFailedToCreateDatabase=Failed to create database '%s'. ErrorFailedToConnectToDatabase=Failed to connect to database '%s'. ErrorPHPVersionTooLow=PHP version too old. Version %s is required. +WarningPHPVersionTooLow=PHP version too old. Version %s or more is expected. This version should allow install but is not supported. ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found. ErrorDatabaseAlreadyExists=Database '%s' already exists. IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database". diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang index 763bbe38eb8..49b4744de30 100644 --- a/htdocs/langs/fr_FR/install.lang +++ b/htdocs/langs/fr_FR/install.lang @@ -26,6 +26,7 @@ ErrorWrongValueForParameter=Vous avez peut-être saisi une mauvaise valeur pour ErrorFailedToCreateDatabase=Echec de création de la base '%s'. ErrorFailedToConnectToDatabase=Echec de connexion à la base '%s'. ErrorPHPVersionTooLow=Version de PHP trop ancienne. La version %s est requise. +WarningPHPVersionTooLow=Version de PHP trop ancienne. La version %s ou plus est recommandée. Cette version reste utilisable mais n'est pas supportée. ErrorConnectedButDatabaseNotFound=Connexion au serveur réussi mais base '%s' introuvable. ErrorDatabaseAlreadyExists=La base de données '%s' existe déjà. IfDatabaseNotExistsGoBackAndUncheckCreate=Si la base n'existe pas, revenez en arrière et cochez l'option "Créer la base de données".