[pLog-svn] r3939 - in plog/trunk/class: summary/data test/tests/summary/data

[oscar at devel.lifetype.net]

Author: oscar
Date: 2006-09-05 16:19:46 +0000 (Tue, 05 Sep 2006)
New Revision: 3939

Modified:
   plog/trunk/class/summary/data/summarytools.class.php
   plog/trunk/class/test/tests/summary/data/summarytools_test.class.php
Log:
fix for issue 1035, and improved the test class (previous test case now works)


Modified: plog/trunk/class/summary/data/summarytools.class.php
===================================================================
--- plog/trunk/class/summary/data/summarytools.class.php	2006-09-05 16:17:10 UTC (rev 3938)
+++ plog/trunk/class/summary/data/summarytools.class.php	2006-09-05 16:19:46 UTC (rev 3939)
@@ -62,8 +62,9 @@
 			$query = "SELECT id, user, password, email, about, full_name, properties, 
 					  site_admin, resource_picture_id, status
 					  FROM {$prefix}users 
-					  WHERE MD5(user) = '".Db::qstr($userNameHash)."'";			
-					
+					  WHERE MD5(user) = '".Db::qstr($userNameHash)."'
+					  AND status = ".USER_STATUS_ACTIVE;
+										
 			$result = $db->Execute( $query );
 			if( !$result )
 				return false;

Modified: plog/trunk/class/test/tests/summary/data/summarytools_test.class.php
===================================================================
--- plog/trunk/class/test/tests/summary/data/summarytools_test.class.php	2006-09-05 16:17:10 UTC (rev 3938)
+++ plog/trunk/class/test/tests/summary/data/summarytools_test.class.php	2006-09-05 16:19:46 UTC (rev 3939)
@@ -51,5 +51,21 @@
 			$requestHash  = SummaryTools::calculatePasswordResetHash( $this->u );
 			$this->assertFalse( SummaryTools::VerifyRequest( $userNameHash, $requestHash ));
 		}		
+		
+		/**
+		 * Make sure that active users are included
+		 */
+		function testVerifyRequestActiveUsers()
+		{
+			// update the user
+			$this->u->setStatus( USER_STATUS_ACTIVE );
+			$users = new Users();
+			$users->updateUser( $this->u );
+			
+			// make sure it isn't returned
+			$userNameHash = md5($this->u->getUserName());
+			$requestHash  = SummaryTools::calculatePasswordResetHash( $this->u );
+			$this->assertTrue( SummaryTools::VerifyRequest( $userNameHash, $requestHash ));
+		}		
 	}
 ?>
\ No newline at end of file