Merge lp:~alexharrington/xibo/369674-1.1 into lp:~xibo-maintainers/xibo/encke

[Alex Harrington]

=== modified file 'server/config/config.class.php'
--- server/config/config.class.php	2009-04-01 21:46:55 +0000
+++ server/config/config.class.php	2009-04-30 08:38:28 +0000
@@ -120,7 +120,7 @@
 		$output .= '<div class="checks">';
 		
 		// Check for PHP version
-		$message = 'PHP Version 5.0.2 or later';
+		$message = 'PHP Version 5.2.4 or later';
 
 		if ($this->CheckPHP()) 
 		{
@@ -133,7 +133,7 @@
 			$output .= $imgBad.$message.'<br />';
 			$output .= <<<END
 			<div class="check_explain">
-      			<p>Xibo requires PHP version 5.0.2 or later.</p>
+      			<p>Xibo requires PHP version 5.2.4 or later.</p>
       		</div>
 END;
 		}
@@ -327,7 +327,7 @@
 	 */
 	function CheckPHP() 
 	{
-		return (version_compare("5",phpversion(), "<="));
+		return (version_compare("5.2.4",phpversion(), "<="));
 	}
 	
 	/**

=== modified file 'server/install.php'
--- server/install.php	2009-04-01 21:04:48 +0000
+++ server/install.php	2009-04-30 08:38:28 +0000
@@ -22,7 +22,7 @@
 DEFINE('XIBO', true);
 
 if (! checkPHP()) {
-  die('Xibo requires PHP 5.0.2 or later');
+  die('Xibo requires PHP 5.2.4 or later');
 }
 
 include('lib/app/kit.class.php');
@@ -679,6 +679,6 @@
 }
 
 function checkPHP() {
-  return (version_compare("5",phpversion(), "<="));
+  return (version_compare("5.2.4",phpversion(), "<="));
 }
 ?>

=== modified file 'server/upgrade.php'
--- server/upgrade.php	2009-04-01 21:04:48 +0000
+++ server/upgrade.php	2009-04-30 08:38:28 +0000
@@ -289,36 +289,11 @@
 
 # Functions
 
-function checkFsPermissions() {
-  # Check for appropriate filesystem permissions
-  return (is_writable("install.php") && (is_writable("settings.php") || is_writable(".")));
-}
-
 function checkPHP() {
   # Check PHP version > 5
-  return (version_compare("5",phpversion(), "<="));
-}
-
-function checkMySQL() {
-  # Check PHP has MySQL module installed
-  return extension_loaded("mysql");
-}
-
-function checkJson() {
-  # Check PHP has JSON module installed
-  return extension_loaded("json");
-}
-
-function checkGd() {
-  # Check PHP has JSON module installed
-  return extension_loaded("gd");
-}
-
-function checkCal() {
-  # Check PHP has JSON module installed
-  return extension_loaded("calendar");
-}
- 
+  return (version_compare("5.2.4",phpversion(), "<="));
+}
+
 function reportError($step, $message, $button_text="&lt; Back") {
 	$_SESSION['step'] = $step;
 ?>
@@ -552,13 +527,6 @@
 	}
 }
 
-//function __autoload($class_name) {
-//    if (substr($class_name,0,4) == "Step") {
-//	    $class_name = substr($class_name,4);
-//	    require_once install/database/$class_name . '.php';
-//    }
-//}
-
 class UpgradeStep 
 {
 	protected $db;