X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fgroups%2Fclass_divListGroup.inc;h=7c42291e4ce1c156a62ffbba5e21b35aee96da34;hb=645f88d4feb970b4bb1cd54e7e5a26b5f7966ce5;hp=0e40cd438f1dc6ac64c399d3cdf07fbd263a1c75;hpb=0985eccc1c68ba0e76b81b1e9c36ffb54dd227e1;p=gosa.git

diff --git a/gosa-core/plugins/admin/groups/class_divListGroup.inc b/gosa-core/plugins/admin/groups/class_divListGroup.inc
index 0e40cd438..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 = "<input type='checkbox' id='select_all' name='select_all'
+    $chk = "<input type='checkbox' id='select_all' name='select_all' title='"._("Select all")."'
                onClick='toggle_all_(\"^item_selected_[0-9]*$\",\"select_all\");' >";
 
     /* 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,19 +172,17 @@ class divListGroup extends MultiSelectWindow
     
     /* Add department selection */
     $listhead .= _("Base")."&nbsp;<select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
-      " <input type='image' class='center' src='images/list_submit.png' title='"._("Submit department")."' name='submit_department' alt='"._("Submit").
+      " <input type='image' class='center' src='images/lists/submit.png' title='"._("Submit department")."' name='submit_department' alt='"._("Submit").
       "'>&nbsp;";
 
-
-        /* Create Layers menu */
+    /* Create Layers menu */
     $s  = ".|"._("Actions")."|\n";
-    $s .= "..|<img src='images/list_new.png' alt='' border='0' class='center'>".
-      "&nbsp;"._("Create")."|\n";
-
 
     /* Append create options */
-    if(preg_match("/c/",$acl_all)) {
-      $s.= "...|<input class='center' type='image' src='images/list_new_group.png' alt=''>".
+    if(preg_match("/c/",$acl)) {
+      $s .= "..|<img src='images/lists/new.png' alt='' border='0' class='center'>".
+        "&nbsp;"._("Create")."|\n";
+      $s.= "...|<input class='center' type='image' src='plugins/groups/images/new.png' alt=''>".
         "&nbsp;"._("Group")."|group_new|\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.= "..|<img src='images/lists/copy.png' alt='' border='0' class='center'>".
-        "&nbsp;"._("Copy")."|"."multiple_copy_systems|\n";
-      $s.= "..|<img src='images/lists/cut.png' alt='' border='0' class='center'>".
-        "&nbsp;"._("Cut")."|"."multiple_cut_systems|\n";
-
-      if($this->parent->CopyPasteHandler->entries_queued()){
-        $img = "<img border='0' class='center' src='images/lists/paste.png' alt=''>";
-        $s.="..|".$img."&nbsp;"._("Paste")."|editPaste|\n";
-      }else{
-        $img = "<img border='0' class='center' src='images/lists/paste.png' alt=''>";
-        $s.="..|".$img."&nbsp;"._("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 = "<a href='?plug=".$_GET['plug']."&amp;id=%s&amp;act=edit_entry'>%s</a>";
-    $userimg  = "<img class='center' src='images/select_groups.png' alt='User'    title='%s'>";
+    $userimg  = "<img class='center' src='plugins/groups/images/groups.png' alt='User'    title='%s'>";
 
     /* Dynamic action col, depending on snapshot icons */
     $action_col_size = 80;
@@ -257,17 +240,17 @@ class divListGroup extends MultiSelectWindow
     }
 
     /* Assign extension images */
-    $posiximg = "<input type='image' class='center' src='images/select_groups.png'
+    $posiximg = "<input type='image' class='center' src='plugins/groups/images/groups.png'
                  name='group_group_edit_%KEY%' alt='P'  title='"._("Posix")  ."'>";
-    $mailimg  = "<input type='image' class='center' src='images/mailto.png'
+    $mailimg  = "<input type='image' class='center' src='plugins/groups/images/mail.png'
                  name='mailgroup_group_edit_%KEY%' alt='M'  title='"._("Mail")   ."'>";
-    $sambaimg = "<input type='image'  class='center' src='images/select_winstation.png'
+    $sambaimg = "<input type='image'  class='center' src='plugins/groups/images/samba.png'
                  name='group_group_edit_%KEY%' alt='S'  title='"._("Samba")  ."'>";
-    $applimg  = "<input type='image'  class='center' src='images/select_application.png'
+    $applimg  = "<input type='image'  class='center' src='plugins/groups/images/menu.png'
                  name='appgroup_group_edit_%KEY%' alt='A'  title='"._("Application")."'>";
-    $phoneimg = "<input type='image'  class='center' src='images/select_phone.png'
+    $phoneimg = "<input type='image'  class='center' src='plugins/groups/images/asterisk.png'
                  name='group_group_edit_%KEY%' alt='Ph' title='"._("Phone")  ."'>";
-    $envimg   = "<input type='image'  class='center' src='images/smallenv.png'
+    $envimg   = "<input type='image'  class='center' src='plugins/groups/images/environment.png'
                  name='environment_group_edit_%KEY%' alt='E' title='"._("Environment")  ."'>";
 
     // 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.= "<input class='center' type='image'
-          src='images/lists/cut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
-        $actions.= "<input class='center' type='image'
-          src='images/lists/copy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
-      }
+
+      /* Add copy & cut functionality */
+      $actions.= $this->parent->get_copypaste_action($val['dn'],"groups","group");
 
       /* Add edit icon */
       $actions.= "<input class='center' type='image'
         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.= "<input class='center' type='image'
           src='images/lists/trash.png' alt='"._("delete")."' name='group_del_%KEY%' title='"._("Delete this entry")."'>";
+      }else{
+        $actions.= "<img class='center' src='images/empty.png' alt='&nbsp;'
+          title='"._("Not allowed")."'>";
       }
 
-
       $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('/ /', '&nbsp;', @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 = "<img class='center' src='images/select_groups.png'
+    $str = "<img class='center' src='plugins/groups/images/groups.png'
               title='".$num_grp_str."' alt='".$num_grp_str."'>&nbsp;".$num_grps."&nbsp;&nbsp;&nbsp;&nbsp;";
     $str.= "<img class='center' src='images/lists/folder.png'
               title='".$num_dep_str."' alt='".$num_dep_str."'>&nbsp;".$num_deps."&nbsp;&nbsp;&nbsp;&nbsp;";