X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fgroups%2Fclass_divListGroup.inc;h=7c42291e4ce1c156a62ffbba5e21b35aee96da34;hb=645f88d4feb970b4bb1cd54e7e5a26b5f7966ce5;hp=aec943a89de080ace9366b6281743735623aee9a;hpb=83321358a98571a4a4b01f90be0e776ec8012c07;p=gosa.git
diff --git a/gosa-core/plugins/admin/groups/class_divListGroup.inc b/gosa-core/plugins/admin/groups/class_divListGroup.inc
index aec943a89..7c42291e4 100644
--- a/gosa-core/plugins/admin/groups/class_divListGroup.inc
+++ b/gosa-core/plugins/admin/groups/class_divListGroup.inc
@@ -70,7 +70,7 @@ class divListGroup extends MultiSelectWindow
}
/* Toggle all selected / deselected */
- $chk = "";
/* set Page header */
@@ -98,7 +98,7 @@ class divListGroup extends MultiSelectWindow
/* Name ,Text ,Default , Connect with alphabet */
$this->AddRegex ("Regex", _("Regular expression for matching group names"), "*" , true);
- $this->AddRegex ("UserRegex", _("User name of which groups are shown"), "*" , false, "images/search_user.png");
+ $this->AddRegex ("UserRegex", _("User name of which groups are shown"), "*" , false, "images/lists/search-user.png");
}
@@ -164,8 +164,7 @@ class divListGroup extends MultiSelectWindow
}
/* Get acls */
- $acls = $ui->get_permissions($this->selectedBase,"groups/group");
- $acl_all= $ui->has_complete_category_acls($this->selectedBase,"groups");
+ $acl = $ui->get_permissions($this->selectedBase,"groups/group");
/* Add default header */
@@ -173,25 +172,23 @@ class divListGroup extends MultiSelectWindow
/* Add department selection */
$listhead .= _("Base")." ".
- " ";
-
- /* Create Layers menu */
+ /* Create Layers menu */
$s = ".|"._("Actions")."|\n";
- $s .= "..|
".
- " "._("Create")."|\n";
-
/* Append create options */
- if(preg_match("/c/",$acl_all)) {
- $s.= "...|".
+ if(preg_match("/c/",$acl)) {
+ $s .= "..|
".
+ " "._("Create")."|\n";
+ $s.= "...|".
" "._("Group")."|group_new|\n";
}
/* Multiple options */
$s.= "..|---|\n";
- $s.= "..|
".
+ $s.= "..|
".
" "._("Edit")."|"."multiple_edit|\n";
$s.= "..|
".
" "._("Remove")."|"."remove_multiple|\n";
@@ -208,27 +205,13 @@ class divListGroup extends MultiSelectWindow
}
/* Add multiple copy & cut icons */
- if(is_object($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){
- $s.= "..|---|\n";
- $s.= "..|
".
- " "._("Copy")."|"."multiple_copy_systems|\n";
- $s.= "..|
".
- " "._("Cut")."|"."multiple_cut_systems|\n";
-
- if($this->parent->CopyPasteHandler->entries_queued()){
- $img = "
";
- $s.="..|".$img." "._("Paste")."|editPaste|\n";
- }else{
- $img = "
";
- $s.="..|".$img." "._("Paste")."\n";
- }
- }
+ $acl_all= $ui->has_complete_category_acls($this->selectedBase,"groups");
- /* 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);
@@ -248,7 +231,7 @@ class divListGroup extends MultiSelectWindow
// image Buttons
$editlink = "%s";
- $userimg = "
";
+ $userimg = "
";
/* Dynamic action col, depending on snapshot icons */
$action_col_size = 80;
@@ -257,17 +240,17 @@ class divListGroup extends MultiSelectWindow
}
/* Assign extension images */
- $posiximg = "";
- $mailimg = "";
- $sambaimg = "";
- $applimg = "";
- $phoneimg = "";
- $envimg = "";
// Space
@@ -278,47 +261,59 @@ class divListGroup extends MultiSelectWindow
$ui = get_userinfo();
+ /* Fetch all application menu entries
+ */
+ $base = get_groups_ou().$this->selectedBase;
+ $ldap = $this->config->get_ldap_link();
+ $ldap->cd ($base);
+ $ldap->search("(objectClass=gotoMenuEntry)",array("dn"));
+ $configured_apps = array();
+ while($entry = $ldap->fetch()){
+ $dn = preg_replace("/^.*(cn=[^,]+,".normalizePreg(get_groups_ou()).")/","\\1",$entry['dn']);
+ $configured_apps[$dn] = $dn;
+ }
+
// Test Every Entry and generate divlist Array
foreach($groups as $key => $val){
/* Create action icons - copy & paste icons */
$acl = $ui->get_permissions($val['dn'],"groups/group");
- $acl_all= $ui->has_complete_category_acls($val['dn'],"groups");
+ $acl_all = $ui->has_complete_category_acls($val['dn'],"groups");
$actions= "";
- if(($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){
- $actions.= " ";
- $actions.= " ";
- }
+
+ /* Add copy & cut functionality */
+ $actions.= $this->parent->get_copypaste_action($val['dn'],"groups","group");
/* Add edit icon */
$actions.= "";
+ src='images/lists/edit.png' alt='"._("edit")."' name='group_edit_%KEY%' title='"._("Edit this entry")."'>";
/* Add snapshot functionality */
- if(preg_match("/(c.*w|w.*c)/", $acl_all)){
- $actions.= $this->GetSnapShotActions($val['dn']);
- }
-
+ $actions.= $this->parent->get_snapshot_action($val['dn'],$this->module);
+
if(preg_match("/d/",$acl)){
$actions.= "";
+ }else{
+ $actions.= "
";
}
-
$posix=$mail=$samba=$appl=$phone=$enviro=$empty;
if(isset($val['objectClass'])){
if(in_array("posixGroup", $val['objectClass'])) $posix = $posiximg;
if(in_array("gosaMailAccount", $val['objectClass'])) $mail = $mailimg;
if(in_array("sambaGroupMapping", $val['objectClass'])) $samba = $sambaimg;
- if(in_array("gosaApplicationGroup", $val['objectClass'])) $appl = $applimg;
if(in_array("goFonPickupGroup", $val['objectClass'])) $phone = $phoneimg;
if(in_array("gotoEnvironment", $val['objectClass'])) $enviro= $envimg;
}
+ if(isset($configured_apps[$val['dn']])){
+ $appl = $applimg;
+ }
+
$title = "title='".preg_replace('/ /', ' ', @LDAP::fix($val['dn']))."'";
if(!isset($val['description'][0])){
@@ -364,7 +359,7 @@ class divListGroup extends MultiSelectWindow
$num_grp_str = _("Number of listed groups");
$num_dep_str = _("Number of listed departments");
- $str = "
".$num_grps." ";
$str.= "
".$num_deps." ";