[pLog-svn] r2195 - plog/trunk/class/dao/userdata

[oscar at devel.plogworld.net]

Author: oscar
Date: 2005-06-10 12:23:47 +0000 (Fri, 10 Jun 2005)
New Revision: 2195

Modified:
   plog/trunk/class/dao/userdata/ploguserdataprovider.class.php
Log:
moved some common code to the parent class so that it can be reused
by all providers


Modified: plog/trunk/class/dao/userdata/ploguserdataprovider.class.php
===================================================================
--- plog/trunk/class/dao/userdata/ploguserdataprovider.class.php	2005-06-10 12:23:17 UTC (rev 2194)
+++ plog/trunk/class/dao/userdata/ploguserdataprovider.class.php	2005-06-10 12:23:47 UTC (rev 2195)
@@ -164,26 +164,7 @@
          */
         function _fillUserInformation( $query_result, $extraInfo = false )
         {
-            $userInfo = new UserInfo( $query_result["user"], $query_result["password"],
-                                      $query_result["email"],
-                                      $query_result["about"],
-                                      $query_result["full_name"],
-                                      $query_result["resource_picture_id"],
-                                      unserialize($query_result["properties"]),
-                                      $query_result["id"]);
-
-            if( $extraInfo ) {
-                // load this data if explicitely required!
-                $userBlogs = $this->getUsersBlogs($userInfo->getId());
-                $userInfo->setBlogs($userBlogs);
-            }
-
-            // set some permissions
-            //$userInfo->setSiteAdmin($this->perms->isSiteAdmin( $userInfo->getId()));
-            $userInfo->setSiteAdmin( $query_result["site_admin"] );
-            $userInfo->setStatus( $query_result["status"] );
-
-            return $userInfo;
+	        return( $this->_mapUserInfoObject( $query_result, $extraInfo ));
         }
 
         /**
@@ -252,12 +233,10 @@
             // update the users table
             $result = $this->Execute( $query );
 
-            // and now update the permissions, if there has been any change
-            $perms = new UserPermissions();
-            $perms->updateSiteAdmin( $userInfo->getId(), $userInfo->isSiteAdmin());
-
             $this->_cache->removeData( $userInfo->getId(), CACHE_USERINFO );
             $this->_cache->removeData( $userInfo->getUsername(), CACHE_USERIDBYNAME );
+            
+            BaseUserDataProvider::updateUser( $userInfo );
 
             return $result;
         }