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

[oscar at devel.plogworld.net]

Author: oscar
Date: 2005-07-12 21:07:36 +0000 (Tue, 12 Jul 2005)
New Revision: 2303

Modified:
   plog/trunk/class/dao/userdata/ploguserdataprovider.class.php
Log:
reorganized some of the includes

Modified: plog/trunk/class/dao/userdata/ploguserdataprovider.class.php
===================================================================
--- plog/trunk/class/dao/userdata/ploguserdataprovider.class.php	2005-07-12 21:05:39 UTC (rev 2302)
+++ plog/trunk/class/dao/userdata/ploguserdataprovider.class.php	2005-07-12 21:07:36 UTC (rev 2303)
@@ -2,10 +2,8 @@
 
     include_once( PLOG_CLASS_PATH."class/dao/userdata/baseuserdataprovider.class.php" );
     include_once( PLOG_CLASS_PATH."class/dao/userinfo.class.php" );
-    include_once( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
-    include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
     include_once( PLOG_CLASS_PATH."class/dao/userstatus.class.php" );
-    include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );  
+    include_once( PLOG_CLASS_PATH."class/database/db.class.php" );
     
     /**
      * Model representing the users in our application. Provides the methods such as
@@ -24,8 +22,6 @@
             $this->BaseUserDataProvider( $providerConfig, true );
 
             $this->usercache = Array();
-
-            $this->perms =  new UserPermissions();
         }
 
         /**
@@ -345,6 +341,7 @@
         function deleteUser( $userId )
         {
             // first, delete all of his/her permissions
+    		include_once( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );            
             $perms = new UserPermissions();
             $perms->revokeUserPermissions( $userId );
 
@@ -376,6 +373,7 @@
             // being deleted as a result of deleting the blog's owner
             
             // first delete all resources
+    		include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );              
             $galleryresources = new GalleryResources();
             $r_query = "SELECT gr.id AS id, gr.owner_id as owner_id 
             					  FROM ".$this->getPrefix()."gallery_resources AS gr, ".$this->getPrefix()."blogs AS b, ".$this->getPrefix()."users AS u
@@ -405,6 +403,7 @@
                         
             // check if the deleted user owns any blog, if they does, delete the blog
             // the deleteBlog function will take care of deleting articles etc...            
+    		include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );            
             $blogs = new Blogs();             
             $userfolder = new GalleryResourceStorage();                        
             
@@ -495,6 +494,7 @@
             $blogId = 1;
 
 			$usersBlogs = Array();
+		    include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );			
             $blogs = new Blogs();
 
             $userinfo = $this->getUserInfoFromUsername($username);