Added mysql_persistent connections, and missing mysql_close ()

[gosa.git] / plugins / admin / ogroups / class_ogroupManagement.inc

diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index e7b70cf2a3f2a12ebb1b4f3ba6d89f23c33d4e1a..1cbeb8d93517d1294329a6ab7003290c2c2c2ba2 100644 (file)
--- a/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -132,7 +132,6 @@ class ogroupManagement extends plugin
     /* Department changed? */
     if(isset($_POST['depselect']) && $_POST['depselect']){
       $ogroupfilter['depselect']= $_POST['depselect'];
-      $this->reload();
     }
 
     /* Start for New List Managment */
@@ -140,7 +139,6 @@ class ogroupManagement extends plugin
       $s_action="open";
       $s_entry = base64_decode($_GET['dep_id']);
       $ogroupfilter['depselect']= "".$this->config->departments[trim($s_entry)];
-      $this->reload();
     }
 
     /* If Backbutton is Posted */
@@ -154,20 +152,17 @@ class ogroupManagement extends plugin
         $ogroupfilter['depselect']= $this->config->departments["/"];
       }
       register_global("ogroupfilter", $ogroupfilter);
-      $this->reload();
     }
 
     /* Homebutton is posted */
     if($s_action=="home"){
       $ogroupfilter['depselect']=(preg_replace("/^[^,]+,/","",$this->ui->dn));
       $ogroupfilter['depselect']=(preg_replace("/^[^,]+,/","",$ogroupfilter['depselect']));
-      $this->reload();
     }
 
     /* root posted */ 
     if($s_action=="root"){
       $ogroupfilter['depselect']=($this->config->current['BASE']);
-      $this->reload();
     }
 
     // Edit if
@@ -178,13 +173,7 @@ class ogroupManagement extends plugin
 
     register_global("ogroupfilter", $ogroupfilter);
 
-    /* Prepare formular */
-    if (!isset($this->ogroup) &&
-        !isset($_POST['new_group']) &&
-        !isset($_POST['delete_group']) &&
-        !isset($_POST['select_group'])){
-      $this->reload();
-    }
+    $this->reload();
 
     /* Check for exeeded sizelimit */
     if (($message= check_sizelimit()) != ""){
@@ -578,7 +567,10 @@ name='dep_root' alt='"._("Root")."'> ".
     } else {
       $filter= "(&(cn=$regex)(objectClass=gosaGroupOfNames))";
     }
-    $res= get_list($this->ui->subtreeACL, "$filter", TRUE, $base, array("*"), TRUE);
+    
+   $groups = ($this->config->current['GROUPS']);
+
+    $res= get_list($this->ui->subtreeACL, "$filter",FALSE, $groups.",".$base, array("*"), TRUE);
     $this->ogrouplist= $res;
     ksort ($this->ogrouplist);
     reset ($this->ogrouplist);