From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 27 May 2008 12:06:31 +0000 (+0000)
Subject: Updated ACLs for listed ogroups .
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=941c021e0f467f1d9d135eca09fa427d68a4eea4;p=gosa.git

Updated ACLs for listed ogroups .


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11030 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc b/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc
index 3aa455673..7ffedd183 100644
--- a/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc
@@ -179,15 +179,10 @@ class divListOGroup extends MultiSelectWindow
     /* Get copy & paste icon */
     $acls  = $ui->get_permissions($this->selectedBase,"ogroups/ogroup");
     $acl_all= $ui->has_complete_category_acls($this->selectedBase,"ogroups");
-    $Copy_Paste ="";
-    if(preg_match("/(c.*w|w.*c)/",$acl_all) &&  $this->parent->CopyPasteHandler){
-      $Copy_Paste = $this->parent->CopyPasteHandler->generatePasteIcon();
-      $add_sep = true;
-    }
+
 
     /* Add default header */
     $listhead = MultiSelectWindow::get_default_header();
-
   
     /* Add department selector */
     $listhead .= _("Base")."&nbsp;<select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
@@ -197,20 +192,19 @@ class divListOGroup extends MultiSelectWindow
 
     /* Create Layers menu */
     $s  = ".|"._("Actions")."|\n";
-    $s .= "..|<img src='images/lists/new.png' alt='' border='0' class='center'>".
-      "&nbsp;"._("Create")."|\n";
 
     /* Append create options */
     if(preg_match("/c/",$acls)) {
+      $s .= "..|<img src='images/lists/new.png' alt='' border='0' class='center'>".
+        "&nbsp;"._("Create")."|\n";
       $s.= "...|<input class='center' type='image' src='plugins/ogroups/images/new.png' alt=''>".
         "&nbsp;"._("Object group")."|group_new|\n";
     }
 
     /* Multiple options */
     $s.= "..|---|\n";
-#    $s.= "..|<img src='images/lists/edit.png' alt='' border='0' class='center'>".
-#      "&nbsp;"._("Edit")."|"."multiple_edit|\n";
-
+#   $s.= "..|<img src='images/lists/edit.png' alt='' border='0' class='center'>".
+#     "&nbsp;"._("Edit")."|"."multiple_edit|\n";
     $s.= "..|<img src='images/lists/trash.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Remove")."|"."remove_multiple_ogroups/|\n";
 
@@ -225,23 +219,26 @@ class divListOGroup extends MultiSelectWindow
       }
     }
 
-    /* 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";
+      if(is_object($this->parent->CopyPasteHandler) && preg_match("/(r.*d|d.*r)/",$acl_all)){
+        $s.= "..|<img src='images/lists/cut.png' alt='' border='0' class='center'>".
+          "&nbsp;"._("Cut")."|"."multiple_cut_systems|\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 */
     if(preg_match("/(c.*w|w.*c)/",$acl_all)){
       $s .= "..|---|\n";
@@ -252,6 +249,7 @@ class divListOGroup extends MultiSelectWindow
     $this->SetListHeader($listhead);
   }
 
+
   function execute()
   {
     $this->ClearElementsList();
@@ -281,23 +279,38 @@ class divListOGroup extends MultiSelectWindow
     foreach($list as $key => $val){
 
       /* Create action icons */
-      $actions= "";
+      $acl    = $ui->get_permissions($val['dn'],"ogroups/ogroup");
       $acl_all= $ui->has_complete_category_acls($val['dn'],"ogroups");
-      if(($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){
-        $actions.= "<input class='center' type='image'
+
+      // Cut
+      $actions= "";
+      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;";
+      }
+
+      // Copy 
+      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/lists/edit.png' alt='"._("edit")."' name='group_edit_%KEY%' title='"._("Edit this entry")."'>";
     
-      if(preg_match("/(c.*w|w.*c)/", $acl_all)){
+      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;";
       }
 
-      if(preg_match("/d/",$ui->get_permissions($val['dn'],"ogroups/ogroup"))) {
+      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{
@@ -305,7 +318,6 @@ class divListOGroup extends MultiSelectWindow
           title='".msgPool::permDelete()."'>";
       }
 
-
       if(isset($val['mail'])){
         $mail = $mailimg;
       }else{