Updated Listing for serveral Management lists.

-Departments were only listed if we have full access.

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

diff --git a/gosa-plugins/goto/admin/applications/class_divListApplication.inc b/gosa-plugins/goto/admin/applications/class_divListApplication.inc
index b124e06c5edbafbad4ee9df83bde3590dcb4488c..24d55ef248e9243a50427d2c052c654aee4cdc1b 100644 (file)
--- a/gosa-plugins/goto/admin/applications/class_divListApplication.inc
+++ b/gosa-plugins/goto/admin/applications/class_divListApplication.inc
@@ -77,11 +77,6 @@ class divListApplication extends MultiSelectWindow
 
   function GenHeader()
   {
-    /* Prepare departments,
-       which are shown in the listbox on top of the listbox
-    */
-    $options= "";
-
     /* Add default header */
     $listhead = MultiSelectWindow::get_default_header(false);
 
@@ -89,51 +84,7 @@ class divListApplication extends MultiSelectWindow
       
       /* Get all departments within this subtree */
       $base = $this->config->current['BASE'];
-
-      /* Add base */
-      $tmp = array();
-      $tmp[] = array("dn"=>$this->config->current['BASE']);
-      $tmp=  array_merge($tmp,get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base,
-                      array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH));
-
-      $deps = array();
-      foreach($tmp as $tm){
-        $deps[$tm['dn']] = $tm['dn'];
-      }
-
-      /* Load possible departments */
-      $ui= get_userinfo();
-      $tdeps= $ui->get_module_departments("application");
-      $ids = $this->config->idepartments;
-      $first = "";
-      $found = FALSE;
-      foreach($ids as $dep => $name){
-        if(isset($deps[$dep]) && in_array_ics($dep, $tdeps)){
-
-          /* Keep first base dn in mind, we could need this
-           *  info if no valid base was found
-           */
-          if(empty($first)) {
-            $first = $dep['dn'];
-          }
-
-          $value = $ids[$dep];
-          if ($this->selectedBase == $dep){
-            $found = TRUE;
-            $options.= "<option selected='selected' value='".$dep."'>$value</option>";
-          } else {
-            $options.= "<option value='".$dep."'>$value</option>";
-          }
-        }
-      }
-
-      /* The currently used base is not visible with your acl setup.
-       * Set base to first useable base.
-       */
-      if(!$found){
-        $this->selectedBase = $first;
-      }
-
+      $options  = $this->create_department_list($this->module);
 
       /* And the rest, a base selection box */
       $listhead .= _("Base")."&nbsp;<select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".