diff --git a/install/install.php b/install/install.php index de5f7db67..2c6c19a8c 100644 --- a/install/install.php +++ b/install/install.php @@ -173,6 +173,7 @@ if(isset($settings->_extraPath)) /** * Include GUI + Language */ +$theme = "blue"; include("../inc/inc.Language.php"); include "../languages/English/lang.inc"; include("../inc/inc.ClassUI.php"); @@ -244,6 +245,7 @@ if (isset($_POST["action"])) $action=$_POST["action"]; else if (isset($_GET["action"])) $action=$_GET["action"]; else $action=NULL; +$showform = true; if ($action=="setSettings") { /** * Get Parameters @@ -336,10 +338,11 @@ if ($action=="setSettings") { } $d->close(); - echo "Your current database schema has version ".$rec['major'].'.'.$rec['minor'].'.'.$rec['subminor']."

"; + echo "Your current database schema has version ".$rec['major'].'.'.$rec['minor'].'.'.$rec['subminor'].". Please run all
of the update scripts below in the listed order.

"; $connTmp = null; if($updatedirs) { + asort($updatedirs); foreach($updatedirs as $updatedir) { if($updatedir > $rec['major'].'.'.$rec['minor'].'.'.$rec['subminor']) { $needsupdate = true; @@ -347,9 +350,7 @@ if ($action=="setSettings") { if(file_exists('update-'.$updatedir.'/update.txt')) { print "

Please read the comments on updating this version. Read now

"; } - if(file_exists('update-'.$updatedir.'/update.php')) { - print "

Afterwards run the update script.

"; - } + print "

Run the update script.

"; } } } else { @@ -365,6 +366,7 @@ if ($action=="setSettings") { echo "

"; echo '' . getMLText("settings_more_settings") .''; + $showform = false; } } else { print "

You does not seem to have a valid database. The table tblVersion is missing.

"; @@ -376,9 +378,11 @@ if ($action=="setSettings") { // Back link echo '
'; echo '
'; - echo '' . getMLText("back") . ''; +// echo '' . getMLText("back") . ''; -} else { +} + +if($showform) { /** * Set parameters