From 3551e742271c5b2c447ac6ea38770210287a0aa9 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Fri, 7 Dec 2018 10:35:47 +0800
Subject: [PATCH] Pman/Login.php

---
 Pman/Login.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Pman/Login.php b/Pman/Login.php
index ddd353f..7aa7068 100644
--- a/Pman/Login.php
+++ b/Pman/Login.php
@@ -462,20 +462,26 @@ class Pman_Login extends Pman
         //$u->company_id = $this->company->id;
         $u->active = 1;
         if (!$u->get($id) || !strlen($u->passwd)) {
-            return "invalid id";
+            $this->jerr("Password reset link is not valid (id)");
         }
         
         // validate key.. 
         if ($key != $u->genPassKey($t)) {
-            $this->jerr("Passwor reset key is not valid");
+            $this->jerr("Password reset link is not valid ($key)");
         }
+	
+	if ($t < strtotime("NOW - 1 DAY")) {
+            $this->jerr("Password reset link has expired");
+        }
+	
         $uu = clone($u);
         $u->no_reset_sent = 0;
+	if ($newpass != false) {
+	    $u->setPassword($newpass);
+	}
         $u->update($uu);
         
-        if ($t < strtotime("NOW - 1 DAY")) {
-            $this->jerr("Password reset link has expired");
-        }
+        
         $this->showNewPass = implode("/", array($id,$t,$key));
         return false;
     }
-- 
2.39.2