Fixed problem with version compare causing recurring 'upgrade your database' error

Committed by: Paul Barrett Reviewed by: Jarrett Jordaan

Fixed problem with version compare causing recurring 'upgrade your database' error
Committed by: Paul Barrett Reviewed by: Jarrett Jordaan
Paul Barrett
1 parent b14a2b27
Showing 5 changed files with 16 additions and 16 deletions
lib/dispatcher.inc.php
lib/session/Session.inc
setup/upgrade/lib/UpgradeItems.inc.php
setup/upgrade/lib/upgrade.inc.php
setup/upgrade/steps/upgradeDatabase.php
@@ -343,8 +343,8 @@ class KTStandardDispatcher extends KTDispatcher {
     }
     function loginRequired() {
-	$oKTConfig =& KTConfig::getSingleton();
-	if ($oKTConfig->get('allowAnonymousLogin', false)) {
+	   $oKTConfig =& KTConfig::getSingleton();
+	   if ($oKTConfig->get('allowAnonymousLogin', false)) {
 	    // anonymous logins are now allowed.
 	    // the anonymous user is -1.
 	    //
@@ -352,9 +352,9 @@ class KTStandardDispatcher extends KTDispatcher {
 	    $oUser =& User::get(-2);
 	    if (PEAR::isError($oUser) || ($oUser->getName() != 'Anonymous')) {
-		; // do nothing - the database integrity would break if we log the user in now.
+		  ; // do nothing - the database integrity would break if we log the user in now.
 	    } else {
-		$session = new Session();
+		  $session = new Session();
                 $sessionID = $session->create($oUser);
                 $this->sessionStatus = $this->session->verify();
                 if ($this->sessionStatus === true) {
@@ -228,7 +228,7 @@ class Session {
             // Compare the system version and the database version to determine if the database needs to be upgraded.
             $version = KTUtil::getSystemSetting('databaseVersion');
-            if ($default->systemVersion != $version) {
+            if (trim($default->systemVersion) != trim($version)) {
                 if (KTLOG_CACHE) $default->log->info("Session::verify : Database not upgraded");
                 $_SESSION['errormessage']['login'] = sprintf(_kt('Database incompatibility error: <br> Please ensure that you have completed the database upgrade procedure. <br> Please <a href=%s>click here</a> to complete.'),'setup/upgrade.php');
                 return PEAR::raiseError($_SESSION['errormessage']['login']);
@@ -269,7 +269,7 @@ class SQLUpgradeItem extends UpgradeItem {
      *
      * STATIC
      */
-    function getUpgrades($origVersion, $currVersion) {
+    public static function getUpgrades($origVersion, $currVersion) {
 //        global $default;
 //        $sqlupgradedir = KT_DIR . '/sql/' . $default->dbType . '/upgrade/';
@@ -343,7 +343,7 @@ class SQLUpgradeItem extends UpgradeItem {
        return $ret;
     }
-    function _getDetailsFromFileName($path) {
+    public static function _getDetailsFromFileName($path) {
         // Old format (pre 2.0.6)
         $matched = preg_match('#^([\d.]*)-to-([\d.]*).sql$#', $path, $matches);
         if ($matched != 0) {
@@ -92,25 +92,24 @@ function &amp;describeUpgrade ($origVersion, $currVersion) {
     // How to figure out what upgrades to do:
     //
     // 1. Get all SQL upgrades >= origVersion and <= currVersion
-    // 2. Get all Function upgrades >= origVersion and <= currVersion
-    // 3. Categorise each into version they upgrade to
-    // 4. Sort each version subgroup into correct order
+    // 2. Categorise each into version they upgrade to
+    // 3. Sort each version subgroup into correct order
     // 5. Add "recordSubUpgrade" for each version there.
-    // 6. Add back into one big list again
-    // 7. Add "recordUpgrade" for whole thing
+    // 5. Add back into one big list again
+    // 6. Add "recordUpgrade" for whole thing
     // $recordUpgrade =  array('upgrade*' . $currVersion, 'Upgrade to ' .  $currVersion, null);
     $steps = array();
     foreach (array('SQLUpgradeItem') as $itemgen) {
         $f = array($itemgen, 'getUpgrades');
-        $ssteps =& call_user_func($f, $origVersion, $currVersion);
+        $ssteps = call_user_func($f, $origVersion, $currVersion);
         $scount = count($ssteps);
         for ($i = 0; $i < $scount; $i++) {
             $steps[] =& $ssteps[$i];
         }
     }
-    $upgradestep =& new RecordUpgradeItem($currVersion, $origVersion);
+    $upgradestep = new RecordUpgradeItem($currVersion, $origVersion);
     $steps[] =& $upgradestep;
     $stepcount = count($steps);
     for ($i = 0; $i < $stepcount; $i++) {
@@ -169,15 +169,16 @@ class upgradeDatabase extends Step
 		$this->sysVersion = $this->readVersion();
 		$this->temp_variables['systemVersion'] = $this->sysVersion;
 		$dconf = $this->util->iniUtilities->getSection('db');
-		$query = sprintf('SELECT value FROM %s WHERE name = "databaseVersion"', 'system_settings');
 		$this->util->dbUtilities->load($dconf['dbHost'], '', $dconf['dbUser'], $dconf['dbPass'], $dconf['dbName']);
+
+		$query = sprintf('SELECT value FROM %s WHERE name = "databaseVersion"', 'system_settings');
         $result = $this->util->dbUtilities->query($query);
         $assArr = $this->util->dbUtilities->fetchAssoc($result);
         if ($result) {
             $lastVersion = $assArr[0]['value'];
         }
         $currentVersion = $this->sysVersion;
-    	require_once("lib/upgrade.inc.php");
+
         $upgrades = describeUpgrade($lastVersion, $currentVersion);
         $ret = "<table border=1 cellpadding=1 cellspacing=1 width='100%'>\n";
         $ret .= "<tr bgcolor='darkgrey'><th width='10'>Code</th><th width='100%'>Description</th><th width='30'>Applied</th></tr>\n";