X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fgroups%2Fclass_divListGroup.inc;h=2ee9518e86b05ae1c04993a459963255f9ef569a;hb=049d82cc1f343b829bcfdcb751a0b2222d3d7f15;hp=6c3304f2b8a8088126ec0c1f94040b9f0d9dfc4a;hpb=83bb8e870e4ef8558170ff028d2398b193d85c90;p=gosa.git diff --git a/gosa-core/plugins/admin/groups/class_divListGroup.inc b/gosa-core/plugins/admin/groups/class_divListGroup.inc index 6c3304f2b..2ee9518e8 100644 --- a/gosa-core/plugins/admin/groups/class_divListGroup.inc +++ b/gosa-core/plugins/admin/groups/class_divListGroup.inc @@ -104,69 +104,16 @@ class divListGroup extends MultiSelectWindow function GenHeader() { - /* Prepare departments, - which are shown in the listbox on top of the listbox - */ - $options= ""; - - - /* Get all departments within this subtree */ $ui= get_userinfo(); $first = ""; $found = FALSE; $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("groups"); - $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.= ""; - } else { - $options.= ""; - } - } - } - - /* 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); /* Get acls */ $acl = $ui->get_permissions($this->selectedBase,"groups/group"); - /* Add default header */ $listhead = MultiSelectWindow::get_default_header(); @@ -207,29 +154,11 @@ class divListGroup extends MultiSelectWindow /* Add multiple copy & cut icons */ $acl_all= $ui->has_complete_category_acls($this->selectedBase,"groups"); - if(is_object($this->parent->CopyPasteHandler) && preg_match("/r/",$acl_all)){ - $s.= "..|". - " "._("Copy")."|"."multiple_copy_systems|\n"; - } - if(is_object($this->parent->CopyPasteHandler) && preg_match("/(r.*d|d.*r)/",$acl_all)){ - $s.= "..|". - " "._("Cut")."|"."multiple_cut_systems|\n"; - } - - /* Copy & paste icons */ - if(is_object($this->parent->CopyPasteHandler) && $this->parent->CopyPasteHandler->entries_queued()){ - $img = ""; - $s.="..|".$img." "._("Paste")."|editPaste|\n"; - }else{ - $img = ""; - $s.="..|".$img." "._("Paste")."\n"; - } - - /* Add snapshot icons */ - if(preg_match("/(c.*w|w.*c)/",$acl_all)){ - $s .= "..|---|\n"; - $s .= $this->get_snapshot_header(TRUE); - } + /* Add Copy & Paste header */ + $s .= $this->parent->get_copypaste_header($this->selectedBase,$this->module); + + /* Add snapshot functionality */ + $s .= $this->parent->get_snapshot_header($this->selectedBase,$this->module); $this->SetDropDownHeaderMenu($s); @@ -244,9 +173,6 @@ class divListGroup extends MultiSelectWindow function setEntries($groups) { - // Defining Links - $linkopen = "%s"; - // image Buttons $editlink = "%s"; $userimg = "User"; @@ -287,7 +213,7 @@ class divListGroup extends MultiSelectWindow $ldap->search("(objectClass=gotoMenuEntry)",array("dn")); $configured_apps = array(); while($entry = $ldap->fetch()){ - $dn = preg_replace("/^.*(cn=[^,]+,".normalizePreg(get_groups_ou()).")/","\\1",$entry['dn']); + $dn = preg_replace("/^.*(cn=[^,]+,".preg_quote(get_groups_ou(), '/').")/","\\1",$entry['dn']); $configured_apps[$dn] = $dn; } @@ -299,32 +225,17 @@ class divListGroup extends MultiSelectWindow $acl_all = $ui->has_complete_category_acls($val['dn'],"groups"); $actions= ""; - if(preg_match("/(r.*d|r.*d)/",$acl_all) && $this->parent->CopyPasteHandler){ - $actions.= " "; - }else{ - $actions.="  "; - } - if(preg_match("/r/",$acl_all) && $this->parent->CopyPasteHandler){ - $actions.= " "; - }else{ - $actions.="  "; - } + /* Add copy & cut functionality */ + $actions.= $this->parent->get_copypaste_action($val['dn'],"groups","group"); /* Add edit icon */ $actions.= ""; /* Add snapshot functionality */ - if(preg_match("/(r.*w|w.*r)/",$acl_all)){ - $actions.= $this->GetSnapShotActions($val['dn']); - }else{ - $actions.="  "; - $actions.="  "; - } - + $actions.= $this->parent->get_snapshot_action($val['dn'],$this->module); + if(preg_match("/d/",$acl)){ $actions.= ""; @@ -347,7 +258,7 @@ class divListGroup extends MultiSelectWindow $appl = $applimg; } - $title = "title='".preg_replace('/ /', ' ', @LDAP::fix($val['dn']))."'"; + $title = "title='".preg_replace('/ /', ' ', LDAP::fix($val['dn']))."'"; if(!isset($val['description'][0])){ $desc = "";