X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fogroups%2Fclass_ogroupManagement.inc;h=1cbeb8d93517d1294329a6ab7003290c2c2c2ba2;hb=513518cdfce4dc5fd7ed4fa41e398d2dbe5cfaa0;hp=4d01afdbaff0dc570c80df138c68035aad687822;hpb=317f1e4c9f590ddfacb40f5d8f7f92283c92e1ba;p=gosa.git
diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index 4d01afdba..1cbeb8d93 100644
--- 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()) != ""){
@@ -394,7 +383,7 @@ name='dep_root' alt='"._("Root")."'> ".
$empty = "
";
// List Setup
- $divlist = new divlist();
+ $divlist = new divlist("ogroubstab");
$divlist->SetHeader(array(
array("string" => " ","attach"=>"style='width:20px;'"),
array("string" => _("Name of object groups")." / "._("Departments")),
@@ -408,7 +397,21 @@ name='dep_root' alt='"._("Root")."'> ".
foreach($this->departments as $key=> $val){
- $field1 = array("string" => "
");
+ if(!isset($this->config->departments[trim($key)])){
+ $this->config->departments[trim($key)]="";
+ }
+
+ $non_empty="";
+ $keys= str_replace("/","\/",$key);
+ foreach($this->config->departments as $keyd=>$vald ){
+ if(preg_match("/".$keys."\/.*/",$keyd)){
+ $non_empty="full";
+ }
+ }
+
+
+
+ $field1 = array("string" => "
");
$field2 = array("string" => sprintf($linkopen,base64_encode($key),$val));
$field3 = array("string" => " ");
$field4 = array("string" => " ","attach"=>"style='text-align:right;border:none'");
@@ -564,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);