Code

Updated copy & paste
[gosa.git] / plugins / admin / groups / class_groupManagement.inc
index df4f76f29dc6a997a35e719a9cb759cdeadde322..70bb5499a921cc48af95917a893655b7c6ff29f9 100644 (file)
@@ -32,12 +32,20 @@ class groupManagement extends plugin
   var $ui= NULL;
   var $acl= "";
 
+  var $CopyPasteHandler ;
+  var $enableCopyPaste = false;
+
   function groupManagement ($config, $ui)
   {
     /* Save configuration for internal use */
     $this->config= $config;
     $this->ui= $ui;
 
+    if((isset($this->config->data['MAIN']['ENABLECOPYPASTE']))&&(preg_match("/true/i",$this->config->data['MAIN']['ENABLECOPYPASTE']))){
+      $this->enableCopyPaste = true;
+    }
+    $this->CopyPasteHandler = new CopyPasteHandler($this->config);
+
     /* Get global filter config */
     if (!is_global("groupfilter")){
       $base= get_base_from_people($ui->dn);
@@ -48,29 +56,36 @@ class groupManagement extends plugin
           "functionalgroups" => "checked",
           "guser" => "*",
           "subsearch" => "",
-          "depselect" => $base,
           "regex" => "*");
       register_global("groupfilter", $groupfilter);
     }
+    if(!isset($_SESSION['CurrentMainBase'])){
+      $base = get_base_from_people($ui->dn);
+      $_SESSION['CurrentMainBase'] = $base; 
+    }
   }
 
   function execute()
   {
-       /* Call parent execute */
-//     plugin::execute();
+       /* Call parent execute */
+       plugin::execute();
+
+    $_SESSION['LOCK_VARS_TO_USE'] = array("/^act$/","/^id$/","/^group_edit_/","/^group_del_/");
 
     /* Save data */
     $groupfilter= get_global("groupfilter");
     $s_action   = "";
     $s_entry    = "";
 
-
     if (!isset($this->grouptab)){
-      foreach( array("depselect", "guser", "regex") as $type){
+      foreach( array( "guser", "regex") as $type){
         if (isset($_POST[$type])){
           $groupfilter[$type]= $_POST[$type];
         } 
       }
+      if(isset($_POST['CurrentMainBase'])){
+        $_SESSION['CurrentMainBase'] = $_POST['CurrentMainBase'];
+      }
       if (isset($_POST['regex'])){
         foreach( array("primarygroups", "sambagroups", "mailgroups", "appgroups",
               "functionalgroups", "subsearch") as $type){
@@ -96,27 +111,40 @@ class groupManagement extends plugin
     /* Test Posts */
     foreach($_POST as $key => $val){
       // Post for delete
-      if(preg_match("/group_del.*/",$key)){
+      if(preg_match("/^group_del.*/",$key)){
         $s_action = "del";
         $s_entry  = preg_replace("/group_".$s_action."_/i","",$key);
         // Post for edit
-      }elseif(preg_match("/group_edit_.*/",$key)){
+      }elseif(preg_match("/^group_edit_.*/",$key)){
         $s_action="edit";
         $s_entry  = preg_replace("/group_".$s_action."_/i","",$key);
         // Post for new
-      }elseif(preg_match("/dep_back.*/i",$key)){
+      }elseif(preg_match("/^dep_back.*/i",$key)){
         $s_action="back";
-      }elseif(preg_match("/group_new.*/",$key)){
+      }elseif(preg_match("/^group_new.*/",$key)){
         $s_action="new";
-      }elseif(preg_match("/dep_home.*/i",$key)){
+      }elseif(preg_match("/^dep_home.*/i",$key)){
         $s_action="home";
-      }elseif(preg_match("/group_tplnew.*/i",$key)){
+      }elseif(preg_match("/^group_tplnew.*/i",$key)){
         $s_action="new_tpl";
-      }elseif(preg_match("/group_chgpw.*/i",$key)){
+      }elseif(preg_match("/^group_chgpw.*/i",$key)){
         $s_action="change_pw";
         $s_entry  = preg_replace("/group_chgpw_/i","",$key);
-      }elseif(preg_match("/dep_root.*/i",$key)){
+      }elseif(preg_match("/^dep_root.*/i",$key)){
         $s_action="root";
+      }elseif(preg_match("/_group_edit_/",$key)){
+        $type = preg_replace("/_group_edit_.*$/","",$key);
+        $s_action="edit";
+        $s_entry  = preg_replace("/".$type."_group_edit_/i","",$key); 
+        $_POST['arg'] = $type;
+      }elseif(preg_match("/^editPaste.*/i",$key)){
+        $s_action="editPaste";
+      }elseif(preg_match("/^copy_.*/",$key)){
+        $s_action="copy";
+        $s_entry  = preg_replace("/^copy_/i","",$key);
+      }elseif(preg_match("/^cut_.*/",$key)){
+        $s_action="cut";
+        $s_entry  = preg_replace("/^cut_/i","",$key);
       }
     }
     $s_entry  = preg_replace("/_.$/","",$s_entry); 
@@ -125,7 +153,7 @@ class groupManagement extends plugin
     if(isset($_GET['act'])&&($_GET['act']=="dep_open")){
       $s_action="open";
       $s_entry = base64_decode($_GET['dep_id']);
-      $groupfilter['depselect']= "".$this->config->departments[trim($s_entry)];
+      $_SESSION['CurrentMainBase']= "".$this->config->departments[trim($s_entry)];
     }
 
     // Edit if
@@ -135,29 +163,31 @@ class groupManagement extends plugin
     }
 
     /* Department changed? */
-    if(isset($_POST['depselect']) && $_POST['depselect']){
-      $groupfilter['depselect']= $_POST['depselect'];
+    if(isset($_POST['CurrentMainBase']) && $_POST['CurrentMainBase']){
+      $_SESSION['CurrentMainBase']= $_POST['CurrentMainBase'];
     }
 
     /* Homebutton is posted */
     if($s_action=="home"){
-      $groupfilter['depselect']= (preg_replace("/^[^,]+,/","",$this->ui->dn));
-      $groupfilter['depselect']= (preg_replace("/^[^,]+,/","",$groupfilter['depselect']));
+      //FIXME: This will not work if we've no subdirs (like i.e. ou=people)? See
+      //       class_userManagement.inc for a fix.
+      $_SESSION['CurrentMainBase']= (preg_replace("/^[^,]+,/","",$this->ui->dn));
+      $_SESSION['CurrentMainBase']= (preg_replace("/^[^,]+,/","",$_SESSION['CurrentMainBase']));
     }
 
     if($s_action=="root"){
-      $groupfilter['depselect']=($this->config->current['BASE']);
+      $_SESSION['CurrentMainBase']=($this->config->current['BASE']);
     }
 
     /* If Backbutton is Posted */
     if($s_action == "back"){
-      $base_back= preg_replace("/^[^,]+,/","",$groupfilter['depselect']);
+      $base_back= preg_replace("/^[^,]+,/","",$_SESSION['CurrentMainBase']);
       $base_back= convert_department_dn($base_back);
 
       if(isset($this->config->departments[trim($base_back)])){
-        $groupfilter['depselect']= $this->config->departments[trim($base_back)];
+        $_SESSION['CurrentMainBase']= $this->config->departments[trim($base_back)];
       }else{
-        $groupfilter['depselect']= $this->config->departments["/"];
+        $_SESSION['CurrentMainBase']= $this->config->departments["/"];
       }
     }
     register_global("groupfilter", $groupfilter);
@@ -172,6 +202,54 @@ class groupManagement extends plugin
       return($message);
     }
 
+    /* Only perform copy / paste if it is enabled
+     */
+    if($this->enableCopyPaste){
+
+      /* Paste copied/cutted object in here
+       */
+      if(($s_action == "editPaste") || ($this->CopyPasteHandler->stillOpen())){
+        $this->CopyPasteHandler->save_object();
+        $this->CopyPasteHandler->SetVar("base",$_SESSION['CurrentMainBase']);
+        if($str = $this->CopyPasteHandler->execute()){
+          return( $str);
+        };
+        /* Ensure that the new object is shown in the list now */
+        $this->relaod();
+      }
+
+
+      /* Copy current object to CopyHandler
+       */
+      if($s_action == "copy"){
+        $this->CopyPasteHandler->Clear();
+        
+        $dn     = $this->grouplist[trim($s_entry)]['dn'];
+        $acl    = get_permissions ($dn, $this->ui->subtreeACL);
+
+        $obj    = new grouptabs($this->config,$this->config->data['TABS']['GROUPTABS'], $dn);
+        $objNew = new grouptabs($this->config,$this->config->data['TABS']['GROUPTABS'], "new");
+        $obj->set_acl($acl);
+        $objNew->set_acl($acl);
+        $this->CopyPasteHandler->Copy($obj,$objNew);
+      }
+
+
+      /* Copy current object to CopyHandler
+       */
+      if($s_action == "cut"){
+        $this->CopyPasteHandler->Clear();
+        $dn = $this->grouplist[trim($s_entry)]['dn'];
+        $acl= get_permissions ($dn, $this->ui->subtreeACL);
+
+        $obj= new grouptabs($this->config,$this->config->data['TABS']['GROUPTABS'], $dn);
+        $obj->set_acl($acl);
+
+        $this->CopyPasteHandler->Cut($obj);
+      }
+    }
+
+
     /* New group? */
     if ($s_action=="new"){
 
@@ -183,7 +261,7 @@ class groupManagement extends plugin
       $this->grouptab= new grouptabs($this->config,
           $this->config->data['TABS']['GROUPTABS'], $this->dn);
       /* Set up the users ACL's for this 'dn' */
-      $acl= get_permissions ($groupfilter['depselect'], $this->ui->subtreeACL);
+      $acl= get_permissions ($_SESSION['CurrentMainBase'], $this->ui->subtreeACL);
       $this->grouptab->set_acl($acl);
     }
 
@@ -198,7 +276,7 @@ class groupManagement extends plugin
     /* Finish group edit is triggered by the tabulator dialog, so
        the user wants to save edited data. Check and save at this
        point. */
-    if (isset($_POST['edit_finish'])){
+    if ((isset($_POST['edit_finish'])) && (isset($this->grouptab->config)) ){
 
       /* Check tabs, will feed message array */
       $message= $this->grouptab->check();
@@ -231,7 +309,7 @@ class groupManagement extends plugin
     }
 
     /* User wants to edit data? */
-    if ($s_action=="edit"){
+    if (($s_action=="edit") && (!isset($this->grouptab-> config))){
 
       /* Get 'dn' from posted 'uid', must be unique */
       $this->dn= $this->grouplist[trim($s_entry)]['dn'];
@@ -278,7 +356,7 @@ class groupManagement extends plugin
 
         /* Lock the current entry, so nobody will edit it during deletion */
         add_lock ($this->dn, $this->ui->dn);
-        $smarty->assign("info", sprintf(_("You're about to delete the group '%s'."), $this->dn));
+        $smarty->assign("info", sprintf(_("You're about to delete the group '%s'."), @LDAP::fix($this->dn)));
         return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
       } else {
 
@@ -327,13 +405,13 @@ class groupManagement extends plugin
     }
 
     /* Show tab dialog if object is present */
-    if ($this->grouptab){
+    if (isset($this->grouptab->config)){
       $display= $this->grouptab->execute();
 
       /* Don't show buttons if tab dialog requests this */
       if (!$this->grouptab->by_object[$this->grouptab->current]->dialog){
         $display.= "<p style=\"text-align:right\">\n";
-        $display.= "<input type=submit name=\"edit_finish\" value=\""._("Finish")."\">\n";
+        $display.= "<input type=submit name=\"edit_finish\" value=\""._("Save")."\">\n";
         $display.= "&nbsp;\n";
         $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
         $display.= "</p>";
@@ -344,28 +422,63 @@ class groupManagement extends plugin
     /* Prepare departments */
     $options= "";
     foreach ($this->config->idepartments as $key => $value){
-            if ($groupfilter['depselect'] == $key){
+            if ($_SESSION['CurrentMainBase'] == $key){
                     $options.= "<option selected value='$key'>$value</option>";
             } else {
                     $options.= "<option value='$key'>$value</option>";
             }
     }
 
+    /* Create paste icon 
+     */
+    if($this->enableCopyPaste){
+      $Copy_Paste = " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;";
+      if($this->CopyPasteHandler->isCurrentObjectPastAble()){
+        if($this->CopyPasteHandler->isCurrentCutted()){
+          $img = "images/cutpaste.png";
+        }else{
+          $img = "images/copypaste.png";
+        }
+        $Copy_Paste .= "<input type='image' name='editPaste' class='center'
+          src='".$img."' alt='"._("Paste")."' title='".$this->CopyPasteHandler->GetCurrentDn()."'>&nbsp;";
+      }else{
+        $Copy_Paste .= "<img class='center' src='images/cant_editpaste.png' alt='"._("Can't paste")."'>&nbsp;";
+      }
+    }else{
+      $Copy_Paste ="";
+    }
+
     // Managment
     $listhead = "<div style='background:#F0F0F9;padding:5px;'>".
-      " <input type='image' class='center' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
       " <input type='image' class='center' src='images/list_root.png' title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;".
+      " <input type='image' class='center' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
       " <input type='image' class='center' src='images/list_home.png' title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'>&nbsp;".
+      " <input class='center' type='image' src='images/list_reload.png' align='middle' title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
       " <img class='center' src='images/list_seperator.png' alt='' height='16' width='1'>&nbsp;".
       " <input type='image' class='center' src='images/list_new_group.png' title='"._("Create new group")."' alt='"._("New")."' name='group_new'>&nbsp;".
+      $Copy_Paste.
       " <img class='center' src='images/list_seperator.png' alt='' height='16' width='1'>&nbsp;".
-      _("Current base")."&nbsp;<select name='depselect' onChange='mainform.submit()' class='center'>$options</select>".
+      _("Base")."&nbsp;<select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
        " <input type='image' class='center' src='images/list_submit.png' title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
       "</div>";
 
     
-    $actions = "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."' name='group_edit_%KEY%' title='"._("Edit this entry")."'>";
-    $actions.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."' name='group_del_%KEY%' title='"._("Delete this entry")."'>";
+    if($this->enableCopyPaste){
+      $actions = "<input class='center' type='image'
+        src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
+      $actions.= "<input class='center' type='image'
+        src='images/editcopy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
+      $actions.= "<input class='center' type='image' 
+        src='images/edit.png' alt='"._("edit")."' name='group_edit_%KEY%' title='"._("Edit this entry")."'>";
+      $actions.= "<input class='center' type='image' 
+        src='images/edittrash.png' alt='"._("delete")."' name='group_del_%KEY%' title='"._("Delete this entry")."'>";
+    }else{
+      $actions = "<input class='center' type='image' 
+        src='images/edit.png' alt='"._("edit")."' name='group_edit_%KEY%' title='"._("Edit this entry")."'>";
+      $actions.= "<input class='center' type='image' 
+        src='images/edittrash.png' alt='"._("delete")."' name='group_del_%KEY%' title='"._("Delete this entry")."'>";
+    }
+
 
     // Defining Links
     $linkopen = "<a href='?plug=".$_GET['plug']."&amp;act=dep_open&amp;dep_id=%s'>%s</a>";
@@ -374,13 +487,35 @@ class groupManagement extends plugin
     $editlink = "<a href='?plug=".$_GET['plug']."&amp;id=%s&amp;act=edit_entry'>%s</a>";
     $userimg  = "<img class='center' src='images/select_groups.png' alt='User'    title='%s'>";
 
-    // Extension images 
-    $posiximg = "<img class='center' src='images/select_groups.png'        alt='P'  title='"._("Posix")  ."'>";
-    $mailimg  = "<img class='center' src='images/mailto.png'             alt='M'  title='"._("Mail")   ."'>";
-    $sambaimg = "<img class='center' src='images/select_winstation.png'  alt='S'  title='"._("Samba")  ."'>";
-    $applimg  = "<img class='center' src='images/select_application.png' alt='A'  title='"._("Application")."'>"; 
-    $phoneimg = "<img class='center' src='images/select_phone.png'      alt='Ph' title='"._("Phone")  ."'>"; 
-    $envimg   = "<img class='center' src='images/smallenv.png'      alt='E' title='"._("Environment")  ."'>"; 
+
+    /* Extension images 
+        group
+        environment
+        appgroup
+        mailgroup
+        acl
+        reference
+
+     */
+    $posiximg = "<input type='image' class='center' src='images/select_groups.png' 
+                 name='group_group_edit_%KEY%' 
+                 alt='P'  title='"._("Posix")  ."'>";
+    $mailimg  = "<input type='image' class='center' src='images/mailto.png'            
+                 name='mailgroup_group_edit_%KEY%' 
+                  alt='M'  title='"._("Mail")   ."'>";
+    $sambaimg = "<input type='image'  class='center' src='images/select_winstation.png'  
+                 name='group_group_edit_%KEY%' 
+                  alt='S'  title='"._("Samba")  ."'>";
+    $applimg  = "<input type='image'  class='center' src='images/select_application.png' 
+                 name='appgroup_group_edit_%KEY%' 
+                  alt='A'  title='"._("Application")."'>"; 
+    $phoneimg = "<input type='image'  class='center' src='images/select_phone.png'      
+                 name='group_group_edit_%KEY%' 
+                  alt='Ph' title='"._("Phone")  ."'>"; 
+    $envimg   = "<input type='image'  class='center' src='images/smallenv.png'      
+                 name='environment_group_edit_%KEY%' 
+                  alt='E' title='"._("Environment")  ."'>"; 
+
     // Space
     $empty    = "<img class='center' src='images/empty.png' style='width:16px;height:16px;' alt=''>";
 
@@ -390,7 +525,7 @@ class groupManagement extends plugin
           array("string" => "&nbsp;", "attach" => "style='text-align:center;width:20px;'"),
           array("string" => _("Groupname")." / "._("Department"), "attach" => "style=''"),
           array("string" => _("Properties"), "attach" => "style='width:136px;'"),
-          array("string" => _("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'")
+          array("string" => _("Actions"), "attach" => "style='width:80px;border-right:0px;text-align:right;'")
           ));
 
     $divlist->SetSummary(_("This table displays all groups, in the selected tree."));
@@ -414,7 +549,7 @@ class groupManagement extends plugin
       $field1 = array("string" => "<img src='images/".$non_empty."folder.png' alt='department'>", "attach" => "style='text-align:center;width:20px;'");
       $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''");
       $field3 = array("string" => "&nbsp;", "attach" => "style='width:136px;'");
-      $field4 = array("string" => "&nbsp;", "attach" => "style='width:60px;border-right:0px;text-align:right;'");
+      $field4 = array("string" => "&nbsp;", "attach" => "style='width:80px;border-right:0px;text-align:right;'");
 
       $divlist->AddEntry(array($field1,$field2,$field3,$field4));
     }
@@ -432,7 +567,7 @@ class groupManagement extends plugin
         $posix=$mail=$samba=$appl=$phone=$empty;
       }
 
-      $title = "title='gid : ".$key." - dn : ".$val['dn']."'";
+      $title = "title='dn:&nbsp;".@LDAP::fix($val['dn'])."'";
 
       if(!isset($val['description'][0])){
         $desc = "";
@@ -441,8 +576,8 @@ class groupManagement extends plugin
       }      
       $field1 = array("string" => sprintf($userimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'");
       $field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)), "attach" => "style='' ".$title);
-      $field3 = array("string" => $posix."&nbsp;".$enviro."&nbsp;".$mail."&nbsp;".$samba."&nbsp;".$appl."&nbsp;".$phone, "attach" => "style='width:136px;'");  
-      $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:60px;border-right:0px;text-align:right;'");
+      $field3 = array("string" => preg_replace("/%KEY%/", $key, $posix."&nbsp;".$enviro."&nbsp;".$mail."&nbsp;".$samba."&nbsp;".$appl."&nbsp;".$phone), "attach" => "style='width:136px;'");  
+      $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:80px;border-right:0px;text-align:right;'");
       
       $divlist->AddEntry(array($field1,$field2,$field3,$field4));    
     }
@@ -456,7 +591,7 @@ class groupManagement extends plugin
     $smarty->assign("infoimage", get_template_path('images/info.png'));
     $smarty->assign("launchimage", get_template_path('images/launch.png'));
     $smarty->assign("deplist", $this->config->idepartments);
-    foreach( array("depselect", "guser", "regex", "primarygroups", "mailgroups","appgroups", "sambagroups", "functionalgroups", "subsearch") as $type){
+    foreach( array("guser", "regex", "primarygroups", "mailgroups","appgroups", "sambagroups", "functionalgroups", "subsearch") as $type){
       $smarty->assign("$type", $groupfilter[$type]);
     }
 
@@ -464,6 +599,11 @@ class groupManagement extends plugin
     $smarty->assign("apply", apply_filter());
     $smarty->assign("alphabet", generate_alphabet());
     $smarty->assign("hint", print_sizelimit_warning());
+    if (isset($this->config->data['MAIN']['NOPRIMARYGROUP'])){
+      $smarty->assign("showprimary", "");
+    } else {
+      $smarty->assign("showprimary", "true");
+    }
 
     return($smarty->fetch(get_template_path('headpage.tpl', TRUE)));
   }
@@ -474,7 +614,7 @@ class groupManagement extends plugin
     $groupfilter= get_global('groupfilter');
 
     /* Set base for all searches */
-    $base= $groupfilter['depselect'];
+    $base= $_SESSION['CurrentMainBase'];
 
     /* Regex filter? */
     if ($groupfilter['regex'] != ""){
@@ -492,11 +632,13 @@ class groupManagement extends plugin
     /* What are primary groups? */
     $primaries= array();
     $ldap= $this->config->get_ldap_link();
-    $ldap->cd($base);
-    $ldap->search("(&(uid=$regex)(!(uid=*$))(objectClass=posixAccount)(gidNumber=*))", array("gidNumber", "cn"));
-    show_ldap_error($ldap->get_error());
-    while ($attrs= $ldap->fetch()){
-      $primaries[$attrs['gidNumber'][0]]= $attrs['cn'][0];
+    if (!isset($this->config->data['MAIN']['NOPRIMARYGROUP'])){
+      $ldap->cd($base);
+      $ldap->search("(&(uid=$regex)(!(uid=*$))(objectClass=posixAccount)(gidNumber=*))", array("gidNumber", "cn"));
+      show_ldap_error($ldap->get_error());
+      while ($attrs= $ldap->fetch()){
+        $primaries[$attrs['gidNumber'][0]]= $attrs['cn'][0];
+      }
     }
 
     /* Set filter depending on selection */
@@ -526,36 +668,24 @@ class groupManagement extends plugin
       }
     }
 
-
-
-
-
-
-
-
     /*
      * We also need to search for the departments
      * So we are able to navigate like in konquerer
      */
 
-    /* Only needed if we are in GroupManagement */
-    if(!$CreatePosixsList){
-      $res3 =  get_list2($this->ui->subtreeACL, "(&(|(ou=$regex)(description=$regex))(objectClass=gosaDepartment))",
-          FALSE, $base, array("ou", "description"), TRUE);
-      $this->departments= array();
-      $tmp = array();
-      foreach ($res3 as $value){
-        $tmp[strtolower($value['dn']).$value['dn']]=$value;
-      }
-      ksort($tmp);
-      foreach($tmp as $value){
-        if(isset($value["description"][0])){
-          $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
-        }else{
-          $this->departments[$value['dn']]= convert_department_dn2($value['dn']);//$value["description"][0];
-        }
+    /* Get all departments within this subtree */
+    $deps= get_list("(&(|(ou=$regex)(description=$regex))(objectClass=gosaDepartment))", $this->ui->subtreeACL,
+        $base, array("ou", "description"), GL_SIZELIMIT | GL_CONVERT);
+
+    $this->departments = array();
+    foreach($deps as $value){
+      if(isset($value['description'][0])){
+        $this->departments[$value['dn']]= get_sub_department($value['dn'])." - [".$value["description"][0]."]";
+      }else{
+        $this->departments[$value['dn']]= get_sub_department($value['dn']);
       }
     }
+    natcasesort($this->departments);
     /*  Ende department generation
      */
 
@@ -570,10 +700,12 @@ class groupManagement extends plugin
     /* Depending on $CreatePosixsList we have to create different lists */
 
     if ($groupfilter['subsearch'] == "checked"){
-      $res= get_list($this->ui->subtreeACL, "$filter", FALSE, $base, array("cn", "description", "gidNumber"), TRUE);
+      $res= get_list($filter, $this->ui->subtreeACL, $base, array("cn", "description", "gidNumber"),
+                     GL_SIZELIMIT);
     } else {
       $base= get_groups_ou().$base;
-      $res= get_list($this->ui->subtreeACL, "$filter", FALSE, $base, array("cn", "description", "gidNumber"), TRUE);
+      $res= get_list($filter, $this->ui->subtreeACL, $base, array("cn", "description", "gidNumber"),
+                     GL_SIZELIMIT);
     }
     if (preg_match("/size limit/i", $error) || preg_match("/size limit/i", $error2)){
       $_SESSION['limit_exceeded']= TRUE;
@@ -594,39 +726,16 @@ class groupManagement extends plugin
 
     $tmp=array();
 
-    /* If true ; this result is used for posix tab, group membership selection. */
-    if($CreatePosixsList){
-
-      /* Addd to array */
-      foreach($this->grouplist as $tkey => $val ){
-        $tmp[strtolower($val['cn'][0]).$val['cn'][0]]=$val;
-      }
-      
-      /* Sort index */
-      ksort($tmp);
-
-      /* Recreate index array[dn]=cn[description]*/
-      $this->grouplist=array();
-      foreach($tmp as $val){
-        if(isset($val['description'])){
-          $this->grouplist[$val['dn']]=$val['cn'][0]."&nbsp;[".$val['description'][0]."]";
-        }else{
-          $this->grouplist[$val['dn']]=$val['cn'][0];
-        }
-      }
-    }else{
-  
-      /* Create result for group management listbox*/
-      foreach($this->grouplist as $tkey => $val ){
-        $tmp[strtolower($val['cn'][0]).$val['cn'][0]]=$val;
-      }
-      ksort($tmp);
-      $this->grouplist=array();
-      foreach($tmp as $val){
-        $this->grouplist[]=$val;
-      }
-      reset ($this->grouplist);
+    /* Create result for group management listbox*/
+    foreach($this->grouplist as $tkey => $val ){
+      $tmp[strtolower($val['cn'][0]).$val['cn'][0]]=$val;
+    }
+    ksort($tmp);
+    $this->grouplist=array();
+    foreach($tmp as $val){
+      $this->grouplist[]=$val;
     }
+    reset ($this->grouplist);
   }
 
   function remove_from_parent()