Added check if copy & paste is activated

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

diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc
index 14c88b6e16d490106e7d22eb97f8c429c8adccb2..401feca714d046abfcd6774765de87686d53e298 100644 (file)
--- a/plugins/admin/applications/class_applicationManagement.inc
+++ b/plugins/admin/applications/class_applicationManagement.inc
@@ -521,8 +521,13 @@ class applicationManagement extends plugin
   }
 
 
- function copyPasteHandling_from_queue($s_action,$s_entry)
+  function copyPasteHandling_from_queue($s_action,$s_entry)
   {
+    /* Check if Copy & Paste is disabled */
+    if(!is_object($this->CopyPasteHandler)){
+      return("");
+    }
+
     /* Add a single entry to queue */
     if($s_action == "cut" || $s_action == "copy"){
 

diff --git a/plugins/admin/applications/class_divListApplication.inc b/plugins/admin/applications/class_divListApplication.inc
index e1e364362b5c0ce186b077bd183795d96ed6d160..4e82dbdd7a9c9312b18e9127df5e42c2dc005968 100755 (executable)
--- a/plugins/admin/applications/class_divListApplication.inc
+++ b/plugins/admin/applications/class_divListApplication.inc
@@ -179,11 +179,14 @@ class divListApplication extends MultiSelectWindow
         /* Multiple options */
     $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/edittrash.png'
         title='"._("Remove selected applications")."' alt='"._("Remove applications")."' name='remove_multiple_applications'>&nbsp;";
-    $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/editcopy.png'
+
+    /* Add multiple copy & cut icons */
+    if(is_object($this->parent->CopyPasteHandler)){
+      $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/editcopy.png'
         title='"._("Copy selected group")."' alt='"._("Copy groups")."' name='multiple_copy_groups'>&nbsp;";
-    $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/editcut.png'
+      $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/editcut.png'
         title='"._("cut selected group")."' alt='"._("Cut groups")."' name='multiple_cut_groups'>&nbsp;";
-
+    }
     $listhead .="</div>";
 
     $this->SetListHeader($listhead);

diff --git a/plugins/admin/groups/class_divListGroup.inc b/plugins/admin/groups/class_divListGroup.inc
index 53e38f59eeeade32529650fe3cf389cf11186d0e..26e46ce1a8750f04faa388ad60b3decc31b8f66e 100644 (file)
--- a/plugins/admin/groups/class_divListGroup.inc
+++ b/plugins/admin/groups/class_divListGroup.inc
@@ -185,11 +185,15 @@ class divListGroup extends MultiSelectWindow
     /* Multiple options */
     $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/edittrash.png'
         title='"._("Remove selected groups")."' alt='"._("Remove groups")."' name='remove_multiple_groups'>&nbsp;";
-    $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/editcopy.png'
+  
+    /* Add multiple copy & cut icons */
+    if(is_object($this->parent->CopyPasteHandler)){
+      $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/editcopy.png'
         title='"._("Copy selected group")."' alt='"._("Copy groups")."' name='multiple_copy_groups'>&nbsp;";
-    $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/editcut.png'
+      $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/editcut.png'
         title='"._("cut selected group")."' alt='"._("Cut groups")."' name='multiple_cut_groups'>&nbsp;";
-    $listhead .= "</div>";
+      $listhead .= "</div>";
+    }
     $this->SetListHeader($listhead);
   }
 

diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 7fe75e3d2ae31928f26fee79a7565187c1584bbc..0935151545fa7267191ff858a410a68557889b97 100644 (file)
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -597,6 +597,11 @@ class groupManagement extends plugin
 
   function copyPasteHandling_from_queue($s_action,$s_entry)
   {
+    /* Check if Copy & Paste is disabled */
+    if(!is_object($this->CopyPasteHandler)){
+      return("");
+    }
+
     /* Add a single entry to queue */
     if($s_action == "cut" || $s_action == "copy"){
 

diff --git a/plugins/admin/ogroups/class_divListOGroup.inc b/plugins/admin/ogroups/class_divListOGroup.inc
index 8489aed068d563ab6f41199db3807864faa5b206..24607ab6094b41b7dde77b10fa261f2e2fea90b2 100755 (executable)
--- a/plugins/admin/ogroups/class_divListOGroup.inc
+++ b/plugins/admin/ogroups/class_divListOGroup.inc
@@ -185,10 +185,14 @@ class divListOGroup extends MultiSelectWindow
     /* Multiple options */
     $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/edittrash.png'
         title='"._("Remove selected object groups")."' alt='"._("Remove object groups")."' name='remove_multiple_ogroups'>&nbsp;";
-    $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/editcopy.png'
+
+    /* Add multiple copy & cut icons */
+    if(is_object($this->parent->CopyPasteHandler)){
+      $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/editcopy.png'
         title='"._("Copy selected object group")."' alt='"._("Copy object groups")."' name='multiple_copy_ogroups'>&nbsp;";
-    $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/editcut.png'
+      $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/editcut.png'
         title='"._("cut selected object group")."' alt='"._("Cut object groups")."' name='multiple_cut_ogroups'>&nbsp;";
+    }
     $listhead .="</div>";
 
     $this->SetListHeader($listhead);

diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index be2c78cf87ebe9cc2d2cb176996531d38ce4a277..82550f477e61818cad138804579339fca8bb9070 100644 (file)
--- a/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -537,6 +537,10 @@ class ogroupManagement extends plugin
 
   function copyPasteHandling_from_queue($s_action,$s_entry)
   {
+    /* Check if Copy & Paste is disabled */
+    if(!is_object($this->CopyPasteHandler)){
+      return("");
+    }
 
     /* Add a single entry to queue */
     if($s_action == "cut" || $s_action == "copy"){

diff --git a/plugins/admin/systems/class_divListSystem.inc b/plugins/admin/systems/class_divListSystem.inc
index 99aaf9d0d8401f477531385d9d9db79a5c7cce97..edc65f0a4f6057c7f0fe0a891c97d55de694f9e9 100644 (file)
--- a/plugins/admin/systems/class_divListSystem.inc
+++ b/plugins/admin/systems/class_divListSystem.inc
@@ -232,11 +232,13 @@ class divListSystem extends MultiSelectWindow
     $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/edittrash.png'
         title='"._("Remove selected systems")."' alt='"._("Remove systems")."' name='remove_multiple_systems'>&nbsp;";
 
-    $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/editcopy.png'
-      title='"._("Copy selected system")."' alt='"._("Copy systems")."' name='multiple_copy_systems'>&nbsp;";
-    $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/editcut.png'
-      title='"._("cut selected system")."' alt='"._("Cut systems")."' name='multiple_cut_systems'>&nbsp;";
-
+    /* Add multiple copy & cut icons */
+    if(is_object($this->parent->CopyPasteHandler)){
+      $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/editcopy.png'
+        title='"._("Copy selected system")."' alt='"._("Copy systems")."' name='multiple_copy_systems'>&nbsp;";
+      $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/editcut.png'
+        title='"._("cut selected system")."' alt='"._("Cut systems")."' name='multiple_cut_systems'>&nbsp;";
+    }
     $listhead .="</div>";
 
     $this->SetListHeader($listhead);

diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index 704bfee508b5baafbcb293390d95c7d26316d665..5b8f7daf9ec84ba9ae343ed436b8b2811917f5f3 100644 (file)
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -1143,6 +1143,11 @@ class systems extends plugin
 
   function copyPasteHandling_from_queue($s_action,$s_entry)
   {
+    /* Check if Copy & Paste is disabled */
+    if(!is_object($this->CopyPasteHandler)){
+      return("");
+    }
+
 
     $tabs = array(
         "terminal"    => array( "CLASS"     =>"TERMTABS",     "TABNAME" =>"termgeneric",     

diff --git a/plugins/admin/users/class_divListUsers.inc b/plugins/admin/users/class_divListUsers.inc
index f22979edf3b35b560a59bf1473eff2804813b394..b9500e4fc047ff946b0f63d7d078c626f0e8a298 100644 (file)
--- a/plugins/admin/users/class_divListUsers.inc
+++ b/plugins/admin/users/class_divListUsers.inc
@@ -167,10 +167,14 @@ class divListUsers extends MultiSelectWindow
     /* Multiple options */ 
     $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/edittrash.png'
         title='"._("Remove selected user")."' alt='"._("Remove user")."' name='remove_multiple_users'>&nbsp;";
-    $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/editcopy.png'
+
+    /* Add multiple copy & cut icons */
+    if(is_object($this->parent->CopyPasteHandler)){
+      $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/editcopy.png'
         title='"._("Copy selected user")."' alt='"._("Copy users")."' name='multiple_copy_users'>&nbsp;";
-    $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/editcut.png'
+      $listhead .= "&nbsp;<input class='center' type='image' align='middle' src='images/editcut.png'
         title='"._("cut selected user")."' alt='"._("Cut users")."' name='multiple_cut_users'>&nbsp;";
+    }
 
     $listhead .="</div>";;
     $this->SetListHeader($listhead);

diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index ce16140a12c22bb89361745f92ef377007b0b11b..e9b1904722153f6022453aaa58e232bfa0e7428d 100644 (file)
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -881,6 +881,11 @@ class userManagement extends plugin
 
   function copyPasteHandling_from_queue($s_action,$s_entry)
   {
+    /* Check if Copy & Paste is disabled */
+    if(!is_object($this->CopyPasteHandler)){
+      return("");
+    }
+
     /* Add a single entry to queue */
     if($s_action == "cut" || $s_action == "copy"){
       /* Cleanup object queue */