[pLog-svn] r3860 - in plog/trunk/class: dao summary/data

[oscar at devel.lifetype.net]

Author: oscar
Date: 2006-08-11 15:14:13 +0000 (Fri, 11 Aug 2006)
New Revision: 3860

Modified:
   plog/trunk/class/dao/users.class.php
   plog/trunk/class/summary/data/summarytools.class.php
Log:
fixed issue 1007 (http://bugs.lifetype.net/view.php?id=1007) -- password reset feature not working properly


Modified: plog/trunk/class/dao/users.class.php
===================================================================
--- plog/trunk/class/dao/users.class.php	2006-08-11 15:01:16 UTC (rev 3859)
+++ plog/trunk/class/dao/users.class.php	2006-08-11 15:14:13 UTC (rev 3860)
@@ -202,5 +202,14 @@
         {
 	        return( $this->_provider->emailExists( $email ));
         }
+
+		/**
+		 * @see BaseUserDataProvider::mapRow()
+		 */
+		function mapRow( $row )
+		{
+			return( $this->_provider->mapRow( $row ));
+		}
+		
     }
 ?>

Modified: plog/trunk/class/summary/data/summarytools.class.php
===================================================================
--- plog/trunk/class/summary/data/summarytools.class.php	2006-08-11 15:01:16 UTC (rev 3859)
+++ plog/trunk/class/summary/data/summarytools.class.php	2006-08-11 15:14:13 UTC (rev 3860)
@@ -51,20 +51,26 @@
 		}
 		
 		function verifyRequest( $userNameHash, $requestHash )
-		{
-		
+		{		
 			// make sure that the request is correct
+			include_once( PLOG_CLASS_PATH."class/database/db.class.php" );
 			$users = new Users();
-			// it's not a good idea to do this but it makes things a bit easier...
-			$prefix = $users->getPrefix();
-			$query = "SELECT u.id AS id, u.user AS user, u.password AS password, u.email AS email, 
-			          u.about AS about, u.full_name AS full_name, u.properties AS properties, 
-					  IF(p.permission_id = 1, 1, 0 ) AS site_admin, u.resource_picture_id AS resource_picture_id,
-					  u.status AS status
-					  FROM {$prefix}users u LEFT JOIN {$prefix}users_permissions p ON u.id = p.user_id 
-					  WHERE MD5(u.user) = '".Db::qstr($userNameHash)."'";
-			$userInfo = $users->_getUserInfoFromQuery( $query );
+
+			$db =& Db::getDb();
+			$prefix = Db::getPrefix();
 			
+			$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)."'";			
+					
+			$result = $db->Execute( $query );
+			if( !$result )
+				return false;
+				
+			$row = $result->FetchRow();
+			$userInfo = $users->mapRow( $row );
+			
 			// try to see if we can load the user...
 			if( !$userInfo ) 
 				return false;