Fix #5673 - Admin password reset shows error message when testing with alan@roojs...

[Pman.Base] / Pman / Login.php

diff --git a/Pman/Login.php b/Pman/Login.php
index ed06d38..9329349 100644 (file)
--- a/Pman/Login.php
+++ b/Pman/Login.php
@@ -281,7 +281,8 @@ class Pman_Login extends Pman
                $this->jerr("Invalid request to reset password");
            }
            
-           $this->verifyCheckSum($_REQUEST['id'], $_REQUEST['ts'], $_REQUEST['key']);
+           $this->verifyResetPassword($_REQUEST['id'], $_REQUEST['ts'], $_REQUEST['key']);
+           $this->jok("Checksum is ok");
        }
        
        // this is 'classic' change password...
@@ -405,9 +406,11 @@ class Pman_Login extends Pman
         // sort out sender.
         $cm = DB_DataObject::factory('core_email');
         if (!$cm->get('name', 'ADMIN_PASSWORD_RESET')) {
-            $this->jerr("no template ADMIN_PASSWORD_RESET exists - please run importer ");
-            
+            $this->jerr("no template  Admin password reset (ADMIN_PASSWORD_RESET) exists - please run importer ");
         }
+       if (!$cm->active) {
+           $this->jerr("template for Admin password reset has been disabled");
+       }
         /*
         
         $g = DB_DAtaObject::factory('Groups');
@@ -451,7 +454,7 @@ class Pman_Login extends Pman
         $sent = $mailer->send();
        if (is_a($sent,'PEAR_Error') ) {
            $this->addEvent('SYSERR',false, $sent->getMessage());
-            $this->jerr($ret->getMessage());
+            $this->jerr($sent->getMessage());
         }
        
         $this->addEvent('PASSREQ',$u, $u->email);
@@ -462,13 +465,12 @@ class Pman_Login extends Pman
         
     }
     
-    
-    function resetPassword($id,$t, $key, $newpass )
+    function verifyResetPassword($id,$t, $key)
     {
-        
-        $au = $this->getAuthUser();
+       $au = $this->getAuthUser();
+       print_R($au);
         if ($au) {
-            return "Already Logged in - no need to use Password Reset";
+            $this->jerr( "Already Logged in - no need to use Password Reset");
         }
         
         $u = DB_DataObject::factory('core_person');
@@ -480,12 +482,24 @@ class Pman_Login extends Pman
         
         // validate key.. 
         if ($key != $u->genPassKey($t)) {
-            $this->jerr("Password reset link is not valid ($key)");
+            $this->jerr("Password reset link is not valid (key)");
         }
        
        if ($t < strtotime("NOW - 1 DAY")) {
             $this->jerr("Password reset link has expired");
         }
+       return $u;
+       
+       
+       
+    }
+    
+    
+    function resetPassword($id,$t, $key, $newpass )
+    {
+        
+        $u = $this->verifyResetPassword($id,$t,$key);
+       
        
         $uu = clone($u);
         $u->no_reset_sent = 0;
@@ -493,7 +507,8 @@ class Pman_Login extends Pman
            $u->setPassword($newpass);
        }
         $u->update($uu);
-        $u->login();
+       $this->addEvent("CHANGEPASS", $u);
+
         $this->jok("Password has been Updated");
     }