From: skodak <skodak>
Date: Thu, 1 May 2008 21:40:34 +0000 (+0000)
Subject: MDL-14645 PHP 5.2.0 now required for new installation - installer lang packs will... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b4ac62457ef6abcba88e9a99993eed0862c1fc40;p=moodle.git

MDL-14645 PHP 5.2.0 now required for new installation - installer lang packs will be updated automatically later by cron job on cvs.moodle.org
---

diff --git a/admin/cliupgrade.php b/admin/cliupgrade.php
index 207fa0975f..38514ae8df 100644
--- a/admin/cliupgrade.php
+++ b/admin/cliupgrade.php
@@ -277,7 +277,7 @@ if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
         console_write(STDOUT, "\n", '', false);
     }
     /// Check that PHP is of a sufficient version
-    check_compatibility(inst_check_php_version(), get_string('phpversion', 'install'), get_string('phpversionerror', 'install'),false,$silent);
+    check_compatibility(inst_check_php_version(), get_string('phpversion', 'install'), get_string('php52versionerror', 'install'),false,$silent);
     /// Check session auto start
     check_compatibility(!ini_get_bool('session.auto_start'), get_string('sessionautostart', 'install'), get_string('sessionautostarterror', 'install'),false,$silent);
     /// Check magic quotes
diff --git a/install.php b/install.php
index e10cf07fed..29c3822fc3 100644
--- a/install.php
+++ b/install.php
@@ -771,7 +771,7 @@ function form_table($nextstage = WELCOME, $formaction = "install.php") {
             $compatsuccess = true;
 
             /// Check that PHP is of a sufficient version
-            print_compatibility_row(inst_check_php_version(), get_string('phpversion', 'install'), get_string('phpversionerror', 'install'), 'phpversionhelp');
+            print_compatibility_row(inst_check_php_version(), get_string('phpversion', 'install'), get_string('php52versionerror', 'install'), 'php52versionhelp');
             /// Check session auto start
             print_compatibility_row(!ini_get_bool('session.auto_start'), get_string('sessionautostart', 'install'), get_string('sessionautostarterror', 'install'), 'sessionautostarthelp');
             /// Check magic quotes
@@ -1061,12 +1061,7 @@ function check_memory_limit() {
 //==========================================================================//
 
 function inst_check_php_version() {
-    if (!check_php_version("4.3.0")) {
-        return false;
-    } else if (check_php_version("5.0.0")) {
-        return check_php_version("5.1.0"); // 5.0.x is too buggy
-    }
-    return true; // 4.3.x or 4.4.x is fine
+    return check_php_version("5.2.0");
 }
 //==========================================================================//
 
diff --git a/install/stringnames.txt b/install/stringnames.txt
index f8c07c130e..3a7be3eb63 100644
--- a/install/stringnames.txt
+++ b/install/stringnames.txt
@@ -177,6 +177,8 @@ password
 pearargerror
 pgsqlextensionisnotpresentinphp
 php50restricted
+php52versionerror
+php52versionhelp
 phpversion
 phpversionerror
 phpversionhelp
diff --git a/lang/en_utf8/install.php b/lang/en_utf8/install.php
index 97a348dcab..25deb88aea 100644
--- a/lang/en_utf8/install.php
+++ b/lang/en_utf8/install.php
@@ -293,8 +293,11 @@ $string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
 $string['odbcextensionisnotpresentinphp'] = 'PHP has not been properly configured with the ODBC extension so that it can communicate with SQL*Server.  Please check your php.ini file or recompile PHP.';
 $string['pass'] = 'Pass';
 $string['pgsqlextensionisnotpresentinphp'] = 'PHP has not been properly configured with the PGSQL extension so that it can communicate with PostgreSQL.  Please check your php.ini file or recompile PHP.';
+$string['php52versionerror'] = 'PHP version must be at least 5.2.0.';
+$string['php52versionhelp'] = '<p>Moodle requires a PHP version of at least 5.2.0.</p>
+<p>You are currently running version $a</p>
+<p>You must upgrade PHP or move to a host with a newer version of PHP!';
 $string['phpversion'] = 'PHP version';
-$string['phpversionerror'] = 'PHP version must be at least 4.3.0 or 5.1.0 (5.0.x has a number of known problems).';
 $string['phpversionhelp'] = '<p>Moodle requires a PHP version of at least 4.3.0 or 5.1.0 (5.0.x has a number of known problems).</p>
 <p>You are currently running version $a</p>
 <p>You must upgrade PHP or move to a host with a newer version of PHP!<br/>
diff --git a/lib/installlib.php b/lib/installlib.php
index 90ed04c53a..d5a1b03c68 100644
--- a/lib/installlib.php
+++ b/lib/installlib.php
@@ -568,12 +568,7 @@ function check_memory_limit() {
  * @return boolean
  */
 function inst_check_php_version() {
-    if (!check_php_version("4.3.0")) {
-        return false;
-    } else if (check_php_version("5.0.0")) {
-        return check_php_version("5.1.0"); // 5.0.x is too buggy
-    }
-    return true; // 4.3.x or 4.4.x is fine
+    return check_php_version("5.2.0");
 }
 /**
  * Print environment status to standard out