Updated acl handling for devices. Updated Copy&paste ACL checks.

[gosa.git] / gosa-plugins / goto / admin / devices / class_divListDevices.inc

diff --git a/gosa-plugins/goto/admin/devices/class_divListDevices.inc b/gosa-plugins/goto/admin/devices/class_divListDevices.inc
index 9d9e520e7881bf021466bf89b39bccedda01c91e..0407757c67f1434f022dfe6eba1fb36b11520373 100644 (file)
--- a/gosa-plugins/goto/admin/devices/class_divListDevices.inc
+++ b/gosa-plugins/goto/admin/devices/class_divListDevices.inc
@@ -42,7 +42,7 @@ class divListDevices extends MultiSelectWindow
     $this->EnableSaveButton (false);
 
     /* 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 */
@@ -128,40 +128,40 @@ class divListDevices extends MultiSelectWindow
 
     /* And at least add a department selection box */
     $listhead .=  _("Base")."&nbsp;<select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
-      " <input class='center' type='image' src='images/list_submit.png' align='middle' 
+      " <input class='center' type='image' src='images/lists/submit.png' align='middle' 
         title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;";
 
     /* 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)) {
+      $s .= "..|<img src='images/lists/new.png' alt='' border='0' class='center'>".
+        "&nbsp;"._("Create")."|\n";
       $s.= "...|<input class='center' type='image' src='images/list_new_device.png' alt=''>".
         "&nbsp;"._("Device")."|device_new|\n";
+      $s.= "..|---|\n";
     }
 
     /* Multiple options */
-    $s.= "..|---|\n";
     $s.= "..|<img src='images/lists/trash.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Remove")."|"."remove_multiple|\n";
 
-    /* Add multiple copy & cut icons */
-    if(is_object($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){
+    if(is_object($this->parent->CopyPasteHandler) && preg_match("/r/",$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";
-      }
+    /* Copy & paste icons */
+    if(is_object($this->parent->CopyPasteHandler) && $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-grey.png' alt=''>";
+      $s.="..|".$img."&nbsp;"._("Paste")."\n";
     }
 
     /* Add snapshot icons */
@@ -193,7 +193,7 @@ class divListDevices extends MultiSelectWindow
     /* Create links */
     $linkopen = "<a href='?plug=".$_GET['plug']."&amp;act=dep_open&amp;dep_id=%s'>%s</a>";
     $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'>";
     $deviceimg  = "<img class='center' src='images/select_device.png' alt='A'  title='"._("Device")."'>";
     $empty    = "<img class='center' src='images/empty.png' style='width:16px;height:16px;' alt=''>";
 
@@ -213,22 +213,31 @@ class divListDevices extends MultiSelectWindow
       $acl      = $ui->get_permissions($val['dn'],"devices/deviceGeneric");
       $acl_all  = $ui->has_complete_category_acls($val['dn'],"devices") ;
 
-      /* Create action icons */
       $actions = "";
-      if(preg_match("/(c.*w|w.*c)/",$acl_all)){
-        $actions .= $this->GetSnapShotActions($val['dn']);
+      if(preg_match("/(r.*d|r.*d)/",$acl_all) && $this->parent->CopyPasteHandler){
+        $actions .= "<input class='center' type='image'
+          src='images/lists/cut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
+      }else{
+        $actions.="<img src='images/empty.png' alt=' ' class='center'>&nbsp;";
       }
 
-      /* Get copy Paste icons */
-      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;";
+      if(preg_match("/r/",$acl_all) && $this->parent->CopyPasteHandler){
         $actions.= "<input class='center' type='image'
           src='images/lists/copy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
+      }else{
+        $actions.="<img src='images/empty.png' alt=' ' class='center'>&nbsp;";
       }
 
       $actions.= "<input class='center' type='image'
-        src='images/edit.png' alt='"._("edit")."' name='device_edit_%KEY%' title='"._("Edit this entry")."'>";
+        src='images/lists/edit.png' alt='"._("edit")."' name='device_edit_%KEY%' title='"._("Edit this entry")."'>";
+
+#     /* Add snapshot icon */
+#     if(preg_match("/(r.*w|w.*r)/",$acl_all)){
+#       $actions.= $this->GetSnapShotActions($val['dn']);
+#     }else{
+#       $actions.="<img src='images/empty.png' alt=' ' class='center'>&nbsp;";
+#       $actions.="<img src='images/empty.png' alt=' ' class='center'>&nbsp;";
+#     }
 
       /* Add delete button */
       if(preg_match("/d/",$acl)){