ENH: 0009683: Folder download should include community or user

Author: Julien Jomier

core/controllers/DownloadController.php

@@ -15,7 +15,7 @@
  */
 class DownloadController extends AppController
 {
-  public $_models = array("Folder", 'Item');
+  public $_models = array('Folder', 'Item', 'Community', 'User');
   public $_daos = array();
   public $_components = array();
 
@@ -149,6 +149,22 @@ public function indexAction()
         {
         $name = $folders[0]->getName(); 
         $name = substr($name, 0, 50);
+        
+        $rootFolder = $this->Folder->getRoot($folders[0]);
+        if($rootFolder)
+          {
+          // Find the Community or the User which have the folder
+          $rootCom = $this->Community->getByFolder($rootFolder);  
+          if(!$rootCom)
+            {
+            $user = $this->User->getByFolder($rootFolder);  
+            $name = $user->getFirstname().$user->getLastname().'-'.$name;
+            }
+          else 
+            {
+            $name = $rootCom->getName().'-'.$name;
+            }
+          }
         }
       else
         {

core/models/base/CommunityModelBase.php

@@ -46,13 +46,16 @@ public function __construct()
     $this->initialize(); // required  
     } // end __construct()
 
-  /** getPublicCommunities*/
+  /** Returns all the public communities. Limited to 20 by default. */
   abstract function getPublicCommunities($limit = 20);
-  /** get By Name*/
+  /** Returns the community given its name */
   abstract function getByName($name);
-  /** get All*/
+  /** Returns all the communities */
   abstract function getAll();
+  /** Returns a community by its uuid */
   abstract function getByUuid($uuid);
+  /** Returns a community given its folder (either public,private or base folder) */
+  abstract function getByFolder($folder);
 
   /** save */
   public function save($dao)

core/models/base/FolderModelBase.php

@@ -55,6 +55,7 @@ abstract function removeItem($folder, $item);
   abstract function policyCheck($folderDao, $userDao = null, $policy = 0);
   abstract function getFolderExists($name, $description);
   abstract function getByUuid($uuid);
+  abstract function getRoot($folder);
 
   /** Increment the view count */
   function incrementViewCount($folder)

core/models/base/UserModelBase.php

@@ -51,6 +51,8 @@ abstract function getByEmail($email);
   abstract function getByUser_id($userid);
   abstract function getUserCommunities($userDao);
   abstract function getByUuid($uuid);
+  /** Returns a user given its folder (either public,private or base folder) */
+  abstract function getByFolder($folder);
 
   /** save */
   public function save($dao)

core/models/pdo/CommunityModel.php

@@ -34,7 +34,25 @@ function getByName($name)
     return $dao;
     } // end getByName()
 
+  /** Returns a community given its folder (either public,private or base folder) */
+  function getByFolder($folder)
+    {
+    if(!$folder instanceof FolderDao)
+      {
+      throw new Zend_Exception("Should be a folder" );
+      } 
 
+    $row = $this->database->fetchRow($this->database->select()->setIntegrityCheck(false)
+                                          ->from('community')
+                                          ->where('folder_id=?', $folder->getFolderId())
+                                          ->orwhere('publicfolder_id=?', $folder->getFolderId())
+                                          ->orwhere('privatefolder_id=?', $folder->getFolderId())
+                                          );
+                                          
+    $community = $this->initDao('Community',$row);
+    return $community;    
+    }
+     
   /** Get all */
   function getAll()
     {

core/models/pdo/FolderModel.php

@@ -189,7 +189,24 @@ public function getSizeFiltered($folders, $userDao = null, $policy = 0)
     return $folders;
     }
 
+  /** Get the root folder */
+  function getRoot($folder)
+    {
+    if(!$folder instanceof FolderDao)
+      {
+      throw new Zend_Exception("Should be a folder" );
+      } 
 
+    $row = $this->database->fetchRow($this->database->select()->setIntegrityCheck(false)
+                                          ->from('folder')
+                                          ->where('left_indice<?', $folder->getLeftIndice())
+                                          ->where('right_indice>?', $folder->getRightIndice())
+                                          ->order('left_indice ASC')
+                                          ->limit(1));
+                                          
+    $root = $this->initDao('Folder',$row);
+    return $root;
+    } // end getRoot()  
 
   /** Get the folder tree */  
   function getAllChildren($folder, $userDao)

core/models/pdo/UserModel.php

@@ -74,6 +74,25 @@ public function getUserCommunities($userDao)
     return $return;
     } // end getUserCommunities
 
+  /** Returns a user given its folder (either public,private or base folder) */
+  function getByFolder($folder)
+    {
+    if(!$folder instanceof FolderDao)
+      {
+      throw new Zend_Exception("Should be a folder" );
+      } 
+    
+    $row = $this->database->fetchRow($this->database->select()->setIntegrityCheck(false)
+                                          ->from('user')
+                                          ->where('folder_id=?', $folder->getFolderId())
+                                          ->orwhere('publicfolder_id=?', $folder->getFolderId())
+                                          ->orwhere('privatefolder_id=?', $folder->getFolderId())
+                                          );
+                                          
+    $user = $this->initDao('User',$row);
+    return $user;    
+    }
+    
   /** Return a list of users corresponding to the search */
   function getUsersFromSearch($search, $userDao, $limit = 14, $group = true, $order = 'view')
     {