(groupware) acl display repaired.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20325 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
index ebb823412c9f0b98c1bc5fe34af6ab8b2d4a1923..99a2f6e742b1b902728bca83c286f1d88daf27d9 100644 (file)
--- a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
@@ -331,10 +331,8 @@ class Groupware extends plugin
                                else{
                                        $this->mailFolderChanges = $this->FolderWidget->save();
                                }
-                               $this->folderSaverLaterObsolete();
-                               
+                               $this->folderSave();
                 $this->FolderWidget = NULL;
-                               
             }
         }
 
@@ -947,9 +945,8 @@ class Groupware extends plugin
                 msg_dialog::display(_("Error"),$message."<br>".sprintf(_("Error was: '%s'."),$this->rpcErrorMessage),ERROR_DIALOG);
             }
         }
-
-               $this->folderSaverLaterObsolete($this->uid);
-                       
+               //Todo: Remove this 
+               $this->folderSave($this->uid);
        }
         //checks for feature "quotaUsage"                
         //not to be saved
@@ -969,7 +966,7 @@ class Groupware extends plugin
        
        /*! \brief  TODO remove this function later
      */
-       function folderSaverLaterObsolete($id){
+       function folderSave($id){
                if($this->isFeatureEnabled("mailFolder")&& $this->hasFeaturebeenChanged("mailFolder")){
                        //is sorting necessary? 
                        //Find folders to add
@@ -1000,7 +997,6 @@ class Groupware extends plugin
                                                        $defAcls = GroupwareDefinitions::getDefaultFolderACLs();
                                                        $memberListToBeSaved = array_merge($defAcls, $memberlist["acls"] );
                                                }
-                                               
                                        }
                                        else{
                                                if(array_differs($memberlist["acls"], $this->mailFolderChanges[$folder]["acls"])){

diff --git a/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc b/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
index 338ef6e3e8c8a4035e8c9d6f1cdc22d0b87cdd9d..67d53be108c619bd0fa2708c6241ad957b8c9259 100644 (file)
--- a/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
@@ -393,7 +393,7 @@ class GroupwareDao{
             $vacArray = $this->get("vacationMessage", array($uid));
             $resultArr["vacationMessage"] = $vacArray["message"];
             $resultArr["vacationEnabled"] = !empty($resultArr["vacationMessage"]);    
-        }   
+        }
         return $resultArr;
     }
        private function translateGwAclsToGosaAcls($compFolders){
@@ -408,7 +408,7 @@ class GroupwareDao{
                     "type"=>"user"
                                        );
                                if(empty($fAcl)){
-                                       $resultArr[$fName]["acls"] = GROUPWARE_RIGHTS_NONE;
+                                       $aclLine["acl"] = GROUPWARE_RIGHTS_NONE;
                                }
                                else{
                                        $resultArr[$fName]["acls"] = $folderAclDef[$fAcl];