Removed TODO marker.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20166 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 70325a35c3ee9f106c732c94d67596dbe8d50e43..aa884fbe3a910f28b058f6cef6b15d2ebfdd5afa 100644 (file)
--- a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
@@ -1083,12 +1083,6 @@ class Groupware extends plugin
                     break;
                 }
             }
-
-            #FIXME: HAPE:
-            # What the hell is this?
-            # You call save() from save() from save() aso...  
-            # Got seqfaults in apache client ...
-            # - $this->save("private_folderACLS", $id, $val["acls"]);
         }
     }
 }

diff --git a/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc b/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
index 8b2735ed9f0c8bbd9427dc28b1a7f9be3f0a100f..344d0fadb1d5d13440dd4fa82c91a7ba0f750fad 100644 (file)
--- a/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
@@ -69,7 +69,6 @@ class GroupwareDao{
     function __construct(&$pluginRef)
     {
         $this->groupwarePluginRef = &$pluginRef;
-
         $this->init();
     }
 
@@ -181,15 +180,6 @@ class GroupwareDao{
         //getThefolderList from the user
         if($this->groupwarePluginRef->isFeatureEnabled("mailFolder")){
 
-            // #FIXME: HAPE(1):    We already have such a folder identificator in our base plugin 
-            //                   see Groupware->folderPrefix.
-            //                  Do not hard code such values in several places.
-            // //Folder Id from the User ...
-            // //user/$id/
-            // $resultArr["mailFolder"] = $this->get("mailFolder", array("user/".$uid."/"));
-
-
-
             // Get groupware folders for the current user.
             $prefix = $this->groupwarePluginRef->folderPrefix;
             $resultArr["mailFolder"] = $this->get("mailFolder", array($prefix));
@@ -197,26 +187,9 @@ class GroupwareDao{
             // Walk through results an fill in missing values, like name, status and acls.
             foreach($resultArr["mailFolder"] as $val){
 
-
-                // #FIXME: HAPE(2): This makes no sense, it contains a hard coded prefix value 'user/' 
-                //                if we switch to another prefix later, things will no longer work.
-                // $s = strpos($val, "user/");
-                // if($s == 0){
-
-            
-                // #FIXME: HAPE(3): Do not use hard coded position here (5), this will not work for subfolders 
-                //                   nor for changed folder prefixes. 
-                //                  If we use "users/" instead of "user/" your folder name will be wrong.
-                //                  Same for subfolders "user/Aufgaben/2005" will result in ['name'] = "Aufgaben/2005"
-                //                   instead of 2005.
-                // $resultArr["mailFolder"][$val]["name"] = substr($val, strpos($val, "/", 5));
-
                 // Get the folder name, all characters behind the last '/'.
                 $resultArr["mailFolder"][$val]["name"] = preg_replace("/^.*\//","",$val);
 
-                // #FIXME: HAPE(4): Do not use hard coded values! Or leave a fixme, comment or something else.
-                // $curAcl = $this->get("private_folderACLS", array("user/wiwu/Posteingang"));
-
                 // Query the folder ACLs using RPC to the backend.
                 $curAcl = $this->get("private_folderACLS", array($val));
                 if(is_array($curAcl)){
@@ -229,13 +202,6 @@ class GroupwareDao{
                                 "type"=>"user");
                     }
                 }
-
-                // #FIXME: HAPE: See fixme HAPE(2)
-                //  }
-                //  else{
-                //      // this case should never happen - unsetting the array anyway.
-                //      unset($resultArr["mailFolder"][$val]);
-                //  }
             }
 
             // Add the required status field for each folder.