BUG: Refs #0309. Use folderId instead of folderName to identify the default public and private folders.

yuzhengZ · yuzhengZ · commit 22223341586c · 2011-11-21T17:44:33.000-05:00
diff --git a/core/controllers/BrowseController.php b/core/controllers/BrowseController.php
@@ -199,14 +199,9 @@ public function getfolderscontentAction()
       $tmp['folder_id'] = $folder->getFolderId();
       $tmp['name'] = $folder->getName();
       $tmp['date_update'] = $this->Component->Date->ago($folder->getDateUpdate(), true);
-      if($tmp['name'] == 'Public' || $tmp['name'] == 'Private')
-        {
-        $tmp['deletable'] = 'false';
-        }
-      else
-        {
-        $tmp['deletable'] = 'true';
-        }
+      // this ajax function is only used by treetable.js and it will handle all the other folders except for the top level folders.
+      // All the non-top level folders are deletable if users have correct permission
+      $tmp['deletable'] =  'true';
       $tmp['policy'] = $folder->policy;
       $tmp['privacy_status'] = $folder->privacy_status;
       $jsonContent[$folder->getParentId()]['folders'][] = $tmp;
diff --git a/core/controllers/CommunityController.php b/core/controllers/CommunityController.php
@@ -208,6 +208,8 @@ function manageAction()
     $this->view->userPersonalItems = $this->Folder->getItemsFiltered($this->view->userPersonalmainFolder, $this->userSession->Dao, MIDAS_POLICY_READ);
 
     $this->view->isAdmin = $this->Community->policyCheck($communityDao, $this->userSession->Dao, MIDAS_POLICY_ADMIN);
+    $this->view->privateFolderId = $communityDao->getPrivatefolderId();
+    $this->view->publicFolderId = $communityDao->getPublicfolderId();
     $this->view->json['community'] = $communityDao->toArray();
     $this->view->json['community']['moderatorGroup'] = $moderator_group->toArray();
     $this->view->json['community']['memberGroup'] = $group_member->toArray();
@@ -311,6 +313,8 @@ function viewAction()
       }
     $this->view->isModerator = $this->Community->policyCheck($communityDao, $this->userSession->Dao, MIDAS_POLICY_WRITE);
     $this->view->isAdmin = $this->Community->policyCheck($communityDao, $this->userSession->Dao, MIDAS_POLICY_ADMIN);
+    $this->view->privateFolderId = $communityDao->getPrivatefolderId();
+    $this->view->publicFolderId = $communityDao->getPublicfolderId();
     $this->view->json['community'] = $communityDao->toArray();
     $this->view->json['community']['sendInvitation'] = $this->t('Send invitation');
 
diff --git a/core/controllers/FolderController.php b/core/controllers/FolderController.php
@@ -184,16 +184,33 @@ public function deleteAction()
       }
 
     $parent = $folder->getParent();
-    $folderName = $folder->getName();
+    $folderId = $folder->getFolderId();
     // User cannot delete community's root folder, the default 'Public' folder and the default 'Private' folder
-    if(($this->Folder->getCommunity($parent) != false && ($folderName == 'Public' || $folderName == 'Private'))  || $this->Folder->getCommunity($folder) != false)
+    if($this->Folder->getCommunity($folder) != false)
       {
-      throw new Zend_Exception("Community Folder. You cannot delete it.");
+      throw new Zend_Exception("Community Root Folder. You cannot delete it.");
       }
+    $communityDao = $this->Folder->getCommunity($parent);
+    if($communityDao != false)
+      {
+      if($communityDao->getPrivatefolderId() == $folderId || $communityDao->getPublicfolderId() == $folderId)
+        {
+        throw new Zend_Exception("Community Default Folder. You cannot delete it.");
+        }
+      }
+
     // User cannot delete its root folder, the default 'Public' folder and the default 'Private' folder
-    if(($this->Folder->getUser($parent) != false && ($folderName == 'Public' || $folderName == 'Private'))  || $this->Folder->getUser($folder) != false)
+    if($this->Folder->getUser($folder) != false)
       {
-      throw new Zend_Exception("User Folder. You cannot delete it.");
+      throw new Zend_Exception("User Root Folder. You cannot delete it.");
+      }
+    $userDao = $this->Folder->getUser($parent);
+    if($userDao != false)
+      {
+      if($userDao->getPrivatefolderId() == $folderId || $userDao->getPublicfolderId() == $folderId)
+        {
+        throw new Zend_Exception("User Default Folder. You cannot delete it.");
+        }
       }
     $this->Folder->delete($folder, true);
     $folderInfo = $folder->toArray();
diff --git a/core/controllers/UserController.php b/core/controllers/UserController.php
@@ -665,6 +665,8 @@ public function userpageAction()
 
     $this->view->mainFolder = $userDao->getFolder();
     $this->view->folders = $this->Folder->getChildrenFoldersFiltered($this->view->mainFolder, $this->userSession->Dao, MIDAS_POLICY_READ);
+    $this->view->privateFolderId = $userDao->getPrivatefolderId();
+    $this->view->publicFolderId = $userDao->getPublicfolderId();
     $this->view->items = $this->Folder->getItemsFiltered($this->view->mainFolder, $this->userSession->Dao, MIDAS_POLICY_READ);
     $this->view->feeds = $this->Feed->getFeedsByUser($this->userSession->Dao, $userDao);
 
@@ -727,6 +729,8 @@ public function manageAction()
     $this->view->user = $userDao;
     $this->view->mainFolder = $userDao->getFolder();
     $this->view->folders = $this->Folder->getChildrenFoldersFiltered($this->view->mainFolder, $this->userSession->Dao, MIDAS_POLICY_READ);
+    $this->view->privateFolderId = $userDao->getPrivatefolderId();
+    $this->view->publicFolderId = $userDao->getPublicfolderId();
     $this->view->items = $this->Folder->getItemsFiltered($this->view->mainFolder, $this->userSession->Dao, MIDAS_POLICY_READ);
     $this->view->userCommunities = $communities;
     $this->view->userCommunityFolders = $communityFolders;
diff --git a/core/views/community/manage.phtml b/core/views/community/manage.phtml
@@ -239,20 +239,20 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
             
             foreach($this->folders as $folder)
               {
-              $folderName = $folder->getName();
-              if ($folderName == 'Public' || $folderName == 'Private')
+              $folderId = $folder->getFolderId();
+              if ($folderId == $this->privateFolderId || $folderId == $this->publicFolderId)
                 {
                 $deletableStatus = 'false';
                 }
               else
                 {
                 $deletableStatus = 'true';
                 }
-              echo "<tr id='node--$node' class='parent' deletable=$deletableStatus privacy='{$folder->getPrivacyStatus()}' policy='".MIDAS_POLICY_ADMIN."' type='folder' element='{$folder->getFolderId()}' ajax='{$folder->getFolderId()}'>";
-              echo "  <td class='treeBrowseElement'><span class='notdraggable folder'>$folderName</span></td>";
-              echo "  <td><img class='folderLoading'  element='{$folder->getFolderId()}' alt='' src='{$this->coreWebroot}/public/images/icons/loading.gif'/></td>";
+              echo "<tr id='node--$node' class='parent' deletable=$deletableStatus privacy='{$folder->getPrivacyStatus()}' policy='".MIDAS_POLICY_ADMIN."' type='folder' element='$folderId' ajax='$folderId'>";
+              echo "  <td class='treeBrowseElement'><span class='notdraggable folder'>{$folder->getName()}</span></td>";
+              echo "  <td><img class='folderLoading'  element='$folderId' alt='' src='{$this->coreWebroot}/public/images/icons/loading.gif'/></td>";
               echo "  <td>{$this->Date->ago($folder->getDateUpdate(),true)}</td>";
-              echo "  <td><input type='checkbox' class='treeCheckbox' type='folder' element='{$folder->getFolderId()}' /></td>";
+              echo "  <td><input type='checkbox' class='treeCheckbox' type='folder' element='$folderId' /></td>";
               echo "</tr>";
               $node++;
               } 
diff --git a/core/views/community/view.phtml b/core/views/community/view.phtml
@@ -117,20 +117,20 @@ foreach($this->customCSSs as $Uris)
             $node=1;
             foreach($this->folders as $folder)
               {
-              $folderName = $folder->getName();
-              if ($folderName == 'Public' || $folderName == 'Private')
+              $folderId = $folder->getFolderId();
+              if ($folderId == $this->privateFolderId || $folderId == $this->publicFolderId)
                 {
                 $deletableStatus = 'false';
                 }
               else
                 {
                 $deletableStatus = 'true';
                 }
-              echo "<tr id='node--$node' policy='{$folder->policy}' deletable=$deletableStatus class='parent' privacy='{$folder->getPrivacyStatus()}' type='folder' element='{$folder->getFolderId()}' ajax='{$folder->getFolderId()}'>";
+              echo "<tr id='node--$node' policy='{$folder->policy}' deletable=$deletableStatus class='parent' privacy='{$folder->getPrivacyStatus()}' type='folder' element='$folderId' ajax='$folderId'>";
               echo "  <td class='treeBrowseElement'><span class='folder'>{$folder->getName()}</span></td>";
-              echo "  <td><img class='folderLoading'  element='{$folder->getFolderId()}' alt='' src='{$this->coreWebroot}/public/images/icons/loading.gif'/></td>";
+              echo "  <td><img class='folderLoading'  element='$folderId' alt='' src='{$this->coreWebroot}/public/images/icons/loading.gif'/></td>";
               echo "  <td>{$this->Date->ago($folder->getDateUpdate(),true)}</td>";
-              echo "  <td><input type='checkbox' class='treeCheckbox' type='folder' element='{$folder->getFolderId()}' /></td>";
+              echo "  <td><input type='checkbox' class='treeCheckbox' type='folder' element='$folderId' /></td>";
               echo "</tr>";
               $node++;
               }
diff --git a/core/views/user/manage.phtml b/core/views/user/manage.phtml
@@ -56,20 +56,20 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
 
             foreach($this->folders as $folder)
               {
-              $folderName = $folder->getName();
-              if ($folderName == 'Public' || $folderName == 'Private')
+              $folderId = $folder->getFolderId();
+              if ($folderId == $this->privateFolderId || $folderId == $this->publicFolderId)
                 {
                 $deletableStatus = 'false';
                 }
               else
                 {
                 $deletableStatus = 'true';
                 }
-              echo "<tr id='node--$node' class='parent' deletable=$deletableStatus privacy='{$folder->getPrivacyStatus()}' policy='".MIDAS_POLICY_ADMIN."' type='folder' element='{$folder->getFolderId()}' ajax='{$folder->getFolderId()}'>";
-              echo "  <td class='treeBrowseElement'><span class='notdraggable folder'>$folderName</span></td>";
-              echo "  <td><img class='folderLoading'  element='{$folder->getFolderId()}' alt='' src='{$this->coreWebroot}/public/images/icons/loading.gif'/></td>";
+              echo "<tr id='node--$node' class='parent' deletable=$deletableStatus privacy='{$folder->getPrivacyStatus()}' policy='".MIDAS_POLICY_ADMIN."' type='folder' element='$folderId' ajax='$folderId'>";
+              echo "  <td class='treeBrowseElement'><span class='notdraggable folder'>{$folder->getName()}</span></td>";
+              echo "  <td><img class='folderLoading'  element='$folderId' alt='' src='{$this->coreWebroot}/public/images/icons/loading.gif'/></td>";
               echo "  <td>{$this->Date->ago($folder->getDateUpdate(),true)}</td>";
-              echo "  <td><input type='checkbox' class='treeCheckbox' type='folder' element='{$folder->getFolderId()}' /></td>";
+              echo "  <td><input type='checkbox' class='treeCheckbox' type='folder' element='$folderId' /></td>";
               echo "</tr>";
               $node++;
               } 
diff --git a/core/views/user/userpage.phtml b/core/views/user/userpage.phtml
@@ -99,20 +99,20 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
             $node=1;
             foreach($this->folders as $folder)
               {
-              $folderName = $folder->getName();
-              if ($folderName == 'Public' || $folderName == 'Private')
+              $folderId = $folder->getFolderId();
+              if ($folderId == $this->privateFolderId || $folderId == $this->publicFolderId)
                 {
                 $deletableStatus = 'false';
                 }
               else
                 {
                 $deletableStatus = 'true';
                 }
-              echo "<tr id='node--$node' policy='{$folder->policy}' deletable=$deletableStatus class='parent' privacy='{$folder->getPrivacyStatus()}' type='folder' element='{$folder->getFolderId()}' ajax='{$folder->getFolderId()}'>";
-              echo "  <td class='treeBrowseElement'><span class='folder'>$folderName</span></td>";
-              echo "  <td><img class='folderLoading'  element='{$folder->getFolderId()}' alt='' src='{$this->coreWebroot}/public/images/icons/loading.gif'/></td>";
+              echo "<tr id='node--$node' policy='{$folder->policy}' deletable=$deletableStatus class='parent' privacy='{$folder->getPrivacyStatus()}' type='folder' element='$folderId' ajax='$folderId'>";
+              echo "  <td class='treeBrowseElement'><span class='folder'>{$folder->getName()}</span></td>";
+              echo "  <td><img class='folderLoading'  element='$folderId' alt='' src='{$this->coreWebroot}/public/images/icons/loading.gif'/></td>";
               echo "  <td>{$this->Date->ago($folder->getDateUpdate(),true)}</td>";
-              echo "  <td><input type='checkbox' class='treeCheckbox' type='folder' element='{$folder->getFolderId()}' /></td>";
+              echo "  <td><input type='checkbox' class='treeCheckbox' type='folder' element='$folderId' /></td>";
               echo "</tr>";
               $node++;
               } 

Original file line number	Diff line number	Diff line change
`@@ -239,20 +239,20 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro`
`239`	`239`
`240`	`240`	`foreach($this->folders as $folder)`
`241`	`241`	`{`
`242`		`- $folderName = $folder->getName();`
`243`		`- if ($folderName == 'Public' \|\| $folderName == 'Private')`
	`242`	`+ $folderId = $folder->getFolderId();`
	`243`	`+ if ($folderId == $this->privateFolderId \|\| $folderId == $this->publicFolderId)`
`244`	`244`	`{`
`245`	`245`	`$deletableStatus = 'false';`
`246`	`246`	`}`
`247`	`247`	`else`
`248`	`248`	`{`
`249`	`249`	`$deletableStatus = 'true';`
`250`	`250`	`}`
`251`		`- echo "<tr id='node--$node' class='parent' deletable=$deletableStatus privacy='{$folder->getPrivacyStatus()}' policy='".MIDAS_POLICY_ADMIN."' type='folder' element='{$folder->getFolderId()}' ajax='{$folder->getFolderId()}'>";`
`252`		`- echo " <td class='treeBrowseElement'><span class='notdraggable folder'>$folderName</span></td>";`
`253`		`- echo " <td><img class='folderLoading' element='{$folder->getFolderId()}' alt='' src='{$this->coreWebroot}/public/images/icons/loading.gif'/></td>";`
	`251`	`+ echo "<tr id='node--$node' class='parent' deletable=$deletableStatus privacy='{$folder->getPrivacyStatus()}' policy='".MIDAS_POLICY_ADMIN."' type='folder' element='$folderId' ajax='$folderId'>";`
	`252`	`+ echo " <td class='treeBrowseElement'><span class='notdraggable folder'>{$folder->getName()}</span></td>";`
	`253`	`+ echo " <td><img class='folderLoading' element='$folderId' alt='' src='{$this->coreWebroot}/public/images/icons/loading.gif'/></td>";`
`254`	`254`	`echo " <td>{$this->Date->ago($folder->getDateUpdate(),true)}</td>";`
`255`		`- echo " <td><input type='checkbox' class='treeCheckbox' type='folder' element='{$folder->getFolderId()}' /></td>";`
	`255`	`+ echo " <td><input type='checkbox' class='treeCheckbox' type='folder' element='$folderId' /></td>";`
`256`	`256`	`echo "</tr>";`
`257`	`257`	`$node++;`
`258`	`258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,20 +117,20 @@ foreach($this->customCSSs as $Uris)`
`117`	`117`	`$node=1;`
`118`	`118`	`foreach($this->folders as $folder)`
`119`	`119`	`{`
`120`		`- $folderName = $folder->getName();`
`121`		`- if ($folderName == 'Public' \|\| $folderName == 'Private')`
	`120`	`+ $folderId = $folder->getFolderId();`
	`121`	`+ if ($folderId == $this->privateFolderId \|\| $folderId == $this->publicFolderId)`
`122`	`122`	`{`
`123`	`123`	`$deletableStatus = 'false';`
`124`	`124`	`}`
`125`	`125`	`else`
`126`	`126`	`{`
`127`	`127`	`$deletableStatus = 'true';`
`128`	`128`	`}`
`129`		`- echo "<tr id='node--$node' policy='{$folder->policy}' deletable=$deletableStatus class='parent' privacy='{$folder->getPrivacyStatus()}' type='folder' element='{$folder->getFolderId()}' ajax='{$folder->getFolderId()}'>";`
	`129`	`+ echo "<tr id='node--$node' policy='{$folder->policy}' deletable=$deletableStatus class='parent' privacy='{$folder->getPrivacyStatus()}' type='folder' element='$folderId' ajax='$folderId'>";`
`130`	`130`	`echo " <td class='treeBrowseElement'><span class='folder'>{$folder->getName()}</span></td>";`
`131`		`- echo " <td><img class='folderLoading' element='{$folder->getFolderId()}' alt='' src='{$this->coreWebroot}/public/images/icons/loading.gif'/></td>";`
	`131`	`+ echo " <td><img class='folderLoading' element='$folderId' alt='' src='{$this->coreWebroot}/public/images/icons/loading.gif'/></td>";`
`132`	`132`	`echo " <td>{$this->Date->ago($folder->getDateUpdate(),true)}</td>";`
`133`		`- echo " <td><input type='checkbox' class='treeCheckbox' type='folder' element='{$folder->getFolderId()}' /></td>";`
	`133`	`+ echo " <td><input type='checkbox' class='treeCheckbox' type='folder' element='$folderId' /></td>";`
`134`	`134`	`echo "</tr>";`
`135`	`135`	`$node++;`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,20 +56,20 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro`
`56`	`56`
`57`	`57`	`foreach($this->folders as $folder)`
`58`	`58`	`{`
`59`		`- $folderName = $folder->getName();`
`60`		`- if ($folderName == 'Public' \|\| $folderName == 'Private')`
	`59`	`+ $folderId = $folder->getFolderId();`
	`60`	`+ if ($folderId == $this->privateFolderId \|\| $folderId == $this->publicFolderId)`
`61`	`61`	`{`
`62`	`62`	`$deletableStatus = 'false';`
`63`	`63`	`}`
`64`	`64`	`else`
`65`	`65`	`{`
`66`	`66`	`$deletableStatus = 'true';`
`67`	`67`	`}`
`68`		`- echo "<tr id='node--$node' class='parent' deletable=$deletableStatus privacy='{$folder->getPrivacyStatus()}' policy='".MIDAS_POLICY_ADMIN."' type='folder' element='{$folder->getFolderId()}' ajax='{$folder->getFolderId()}'>";`
`69`		`- echo " <td class='treeBrowseElement'><span class='notdraggable folder'>$folderName</span></td>";`
`70`		`- echo " <td><img class='folderLoading' element='{$folder->getFolderId()}' alt='' src='{$this->coreWebroot}/public/images/icons/loading.gif'/></td>";`
	`68`	`+ echo "<tr id='node--$node' class='parent' deletable=$deletableStatus privacy='{$folder->getPrivacyStatus()}' policy='".MIDAS_POLICY_ADMIN."' type='folder' element='$folderId' ajax='$folderId'>";`
	`69`	`+ echo " <td class='treeBrowseElement'><span class='notdraggable folder'>{$folder->getName()}</span></td>";`
	`70`	`+ echo " <td><img class='folderLoading' element='$folderId' alt='' src='{$this->coreWebroot}/public/images/icons/loading.gif'/></td>";`
`71`	`71`	`echo " <td>{$this->Date->ago($folder->getDateUpdate(),true)}</td>";`
`72`		`- echo " <td><input type='checkbox' class='treeCheckbox' type='folder' element='{$folder->getFolderId()}' /></td>";`
	`72`	`+ echo " <td><input type='checkbox' class='treeCheckbox' type='folder' element='$folderId' /></td>";`
`73`	`73`	`echo "</tr>";`
`74`	`74`	`$node++;`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,20 +99,20 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro`
`99`	`99`	`$node=1;`
`100`	`100`	`foreach($this->folders as $folder)`
`101`	`101`	`{`
`102`		`- $folderName = $folder->getName();`
`103`		`- if ($folderName == 'Public' \|\| $folderName == 'Private')`
	`102`	`+ $folderId = $folder->getFolderId();`
	`103`	`+ if ($folderId == $this->privateFolderId \|\| $folderId == $this->publicFolderId)`
`104`	`104`	`{`
`105`	`105`	`$deletableStatus = 'false';`
`106`	`106`	`}`
`107`	`107`	`else`
`108`	`108`	`{`
`109`	`109`	`$deletableStatus = 'true';`
`110`	`110`	`}`
`111`		`- echo "<tr id='node--$node' policy='{$folder->policy}' deletable=$deletableStatus class='parent' privacy='{$folder->getPrivacyStatus()}' type='folder' element='{$folder->getFolderId()}' ajax='{$folder->getFolderId()}'>";`
`112`		`- echo " <td class='treeBrowseElement'><span class='folder'>$folderName</span></td>";`
`113`		`- echo " <td><img class='folderLoading' element='{$folder->getFolderId()}' alt='' src='{$this->coreWebroot}/public/images/icons/loading.gif'/></td>";`
	`111`	`+ echo "<tr id='node--$node' policy='{$folder->policy}' deletable=$deletableStatus class='parent' privacy='{$folder->getPrivacyStatus()}' type='folder' element='$folderId' ajax='$folderId'>";`
	`112`	`+ echo " <td class='treeBrowseElement'><span class='folder'>{$folder->getName()}</span></td>";`
	`113`	`+ echo " <td><img class='folderLoading' element='$folderId' alt='' src='{$this->coreWebroot}/public/images/icons/loading.gif'/></td>";`
`114`	`114`	`echo " <td>{$this->Date->ago($folder->getDateUpdate(),true)}</td>";`
`115`		`- echo " <td><input type='checkbox' class='treeCheckbox' type='folder' element='{$folder->getFolderId()}' /></td>";`
	`115`	`+ echo " <td><input type='checkbox' class='treeCheckbox' type='folder' element='$folderId' /></td>";`
`116`	`116`	`echo "</tr>";`
`117`	`117`	`$node++;`
`118`	`118`	`}`