X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fgroups%2Fclass_groupManagement.inc;h=83d6a5ddfc5527dd8ad0823813953b2ce6b9306d;hb=875a3f2fab1278394aa011b5998a1943d346d885;hp=34f248dbbd70a0ced6935273dc391f8ba476ac57;hpb=55efc556c6252e5233c8e537e52e179688bf9391;p=gosa.git diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc index 34f248dbb..83d6a5ddf 100644 --- a/plugins/admin/groups/class_groupManagement.inc +++ b/plugins/admin/groups/class_groupManagement.inc @@ -56,6 +56,9 @@ class groupManagement extends plugin function execute() { + /* Call parent execute */ + plugin::execute(); + /* Save data */ $groupfilter= get_global("groupfilter"); $s_action = ""; @@ -179,7 +182,9 @@ class groupManagement extends plugin /* Create new usertab object */ $this->grouptab= new grouptabs($this->config, $this->config->data['TABS']['GROUPTABS'], $this->dn); - $this->grouptab->set_acl(array(':all')); + /* Set up the users ACL's for this 'dn' */ + $acl= get_permissions ($groupfilter['depselect'], $this->ui->subtreeACL); + $this->grouptab->set_acl($acl); } /* Cancel dialogs */ @@ -233,7 +238,10 @@ class groupManagement extends plugin /* Check locking, save current plugin in 'back_plugin', so the dialog knows where to return. */ - if (($user= get_lock($this->dn)) != ""){ + + $user = get_lock($this->dn); + + if ($user != ""){ return(gen_locked_message ($user, $this->dn)); } @@ -345,51 +353,48 @@ class groupManagement extends plugin // Managment $listhead = "
". - "  ". - "  ". - "  ". - "  ". - "  ". - "  ". - _("Current base")." ". - "  ". + "  ". + "  ". + "  ". + "  ". + "  ". + "  ". + _("Base")." ". + "  ". "
"; - $actions = ""; - $actions.= ""; + $actions = ""; + $actions.= ""; // Defining Links $linkopen = "%s"; // image Buttons $editlink = "%s"; - $userimg = "User"; + $userimg = "User"; // Extension images - $posiximg = "P"; - $mailimg = "M"; - $sambaimg = "S"; - $applimg = "A"; - $phoneimg = "Ph"; - $envimg = "E"; + $posiximg = "P"; + $mailimg = "M"; + $sambaimg = "S"; + $applimg = "A"; + $phoneimg = "Ph"; + $envimg = "E"; // Space - $empty = ""; + $empty = ""; $divlist = new divlist("groupstab"); $divlist->SetHeader(array( - array("string" => " "), - array("string" => _("Groupname")." / "._("Department")), - array("string" => _("Properties"), "attach" => "style='width:116px;'"), - array("string" => _("Actions") ,"attach" => "style='border:none'") + array("string" => " ", "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;'") )); - $divlist->SetSummary(_("This table displays all groups, in the selected tree.")); - $divlist->SetEntriesPerPage(20); + $divlist->SetEntriesPerPage(0); foreach($this->departments as $key=> $val){ @@ -406,10 +411,10 @@ class groupManagement extends plugin } - $field1 = array("string" => "department"); - $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val)); - $field3 = array("string" => " "); - $field4 = array("string" => " ","attach"=>"style='text-align:right;border:none'"); + $field1 = array("string" => "department", "attach" => "style='text-align:center;width:20px;'"); + $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''"); + $field3 = array("string" => " ", "attach" => "style='width:136px;'"); + $field4 = array("string" => " ", "attach" => "style='width:60px;border-right:0px;text-align:right;'"); $divlist->AddEntry(array($field1,$field2,$field3,$field4)); } @@ -434,10 +439,10 @@ class groupManagement extends plugin }else{ $desc = " - [ ".$val['description'][0]." ]"; } - $field1 = array("string" => sprintf($userimg,$val['dn']),"attach"=>"style='width:20px;align:middle;'"); - $field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)),"attach"=>$title); - $field3 = array("string" => $posix." ".$enviro." ".$mail." ".$samba." ".$appl." ".$phone); - $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions),"attach"=>"style='text-align:right;border:none;width:32px;'"); + $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." ".$enviro." ".$mail." ".$samba." ".$appl." ".$phone, "attach" => "style='width:136px;'"); + $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:60px;border-right:0px;text-align:right;'"); $divlist->AddEntry(array($field1,$field2,$field3,$field4)); } @@ -521,6 +526,13 @@ class groupManagement extends plugin } } + + + + + + + /* * We also need to search for the departments * So we are able to navigate like in konquerer @@ -537,10 +549,10 @@ class groupManagement extends plugin } ksort($tmp); foreach($tmp as $value){ - if($value["description"][0]!=".."){ + if(isset($value["description"][0])){ $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]"; }else{ - $this->departments[$value['dn']]=$value["description"][0]; + $this->departments[$value['dn']]= convert_department_dn2($value['dn']);//$value["description"][0]; } } }