ENH: refs #952. Further support upgrade process for 3.2.12.

This fixes a case that would fail if the admin user is logged out, then pulls
the latest commit, then tries to login with the remerber me checked.

Author: Michael Grauer

core/AppController.php

@@ -108,11 +108,23 @@ public function preDispatch()
           if(count($tmp) == 2)
             {
             $userDao = $userModel->load($tmp[0]);
-
-            if(version_compare(Zend_Registry::get('configDatabase')->version, '3.2.12', '>=') &&
-               $userDao != false && $userModel->hashExists($tmp[1]))
+            if($userDao != false)
               {
-              $user->Dao = $userDao;
+              // authenticate valid users in the appropriate method for the
+              // current application version
+              if(version_compare(Zend_Registry::get('configDatabase')->version, '3.2.12', '>='))
+                {
+                $auth = $userModel->hashExists($tmp[1]);
+                }
+              else
+                {
+                $auth = $this->User->legacyAuthenticate($userDao, '', '', $tmp[1]);
+                }
+              // if authenticated, set the session user to be this user
+              if($auth)
+                {
+                $user->Dao = $userDao;
+                }
               }
             }
           }

core/controllers/UserController.php

@@ -476,6 +476,7 @@ function loginAction()
           }
         else
           {
+          $passwordHash = md5($instanceSalt.$form->getValue('password'));
           $coreAuth = $this->User->legacyAuthenticate($userDao, $instanceSalt, $form->getValue('password'));
           }
 
@@ -490,10 +491,6 @@ function loginAction()
               return;
               }
             }
-          if(version_compare($currentVersion, '3.2.12', '>=') && $userDao->getSalt() == '')
-            {
-            $passwordHash = $this->User->convertLegacyPasswordHash($userDao, $form->getValue('password'));
-            }
           $remember = $form->getValue('remerberMe');
           if(isset($remember) && $remember == 1)
             {

core/models/pdo/UserModel.php

@@ -312,9 +312,12 @@ function getUsersFromSearch($search, $userDao, $limit = 14, $group = true, $orde
    * used during the upgrade process only, not for general authentication.
    * @return True or false: whether the authentication succeeded
    */
-  function legacyAuthenticate($userDao, $instanceSalt, $password)
+  function legacyAuthenticate($userDao, $instanceSalt, $password, $hash = false)
     {
-    $hash = md5($instanceSalt.$password);
+    if(!$hash)
+      {
+      $hash = md5($instanceSalt.$password);
+      }
     $sql = $this->database->select()->setIntegrityCheck(false)
                 ->where('user_id = ?', $userDao->getKey());