Fix for token password reset

2013-01-12 11:20:46 +11:00
parent 788dbe5ef9
commit 47fa9993be
4 changed files with 13 additions and 6 deletions
--- a/application/classes/Model/Module/Method/Token.php
+++ b/application/classes/Model/Module/Method/Token.php
@@ -94,9 +94,13 @@ class Model_Module_Method_Token extends ORM_OSB {
 			->find();

 		if ($mmto->loaded()) {
-			if ((is_null($mmto->date_expire) OR $mmto->date_expire > time()) AND (is_null($mmto->uses) OR $mmto->uses > 0))
-				return $mmto->token;
-			else
+			// Check that the token is still good
+			if ((is_null($mmto->date_expire) OR $mmto->date_expire > time()) AND (is_null($mmto->uses) OR $mmto->uses > 0)) {
+				$this->token = $mmto->token;
+				return $this->token;
+
+			// Token expired
+			} else
 				$mmto->delete();
 		}