From: hickert Date: Wed, 13 Jun 2007 08:08:36 +0000 (+0000) Subject: Added check if copy & paste is activated X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=01994e83968b057c9fc9b44078e14755e2ad60f9;p=gosa.git 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 14c88b6e1..401feca71 100644 --- 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 e1e364362..4e82dbdd7 100755 --- 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 .= "  "; - $listhead .= " parent->CopyPasteHandler)){ + $listhead .= "  "; - $listhead .= "  "; - + } $listhead .=""; $this->SetListHeader($listhead); diff --git a/plugins/admin/groups/class_divListGroup.inc b/plugins/admin/groups/class_divListGroup.inc index 53e38f59e..26e46ce1a 100644 --- 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 .= "  "; - $listhead .= " parent->CopyPasteHandler)){ + $listhead .= "  "; - $listhead .= "  "; - $listhead .= ""; + $listhead .= ""; + } $this->SetListHeader($listhead); } diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc index 7fe75e3d2..093515154 100644 --- 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 8489aed06..24607ab60 100755 --- 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 .= "  "; - $listhead .= " parent->CopyPasteHandler)){ + $listhead .= "  "; - $listhead .= "  "; + } $listhead .=""; $this->SetListHeader($listhead); diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc index be2c78cf8..82550f477 100644 --- 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 99aaf9d0d..edc65f0a4 100644 --- a/plugins/admin/systems/class_divListSystem.inc +++ b/plugins/admin/systems/class_divListSystem.inc @@ -232,11 +232,13 @@ class divListSystem extends MultiSelectWindow $listhead .= "  "; - $listhead .= "  "; - $listhead .= "  "; - + /* Add multiple copy & cut icons */ + if(is_object($this->parent->CopyPasteHandler)){ + $listhead .= "  "; + $listhead .= "  "; + } $listhead .=""; $this->SetListHeader($listhead); diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc index 704bfee50..5b8f7daf9 100644 --- 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 f22979edf..b9500e4fc 100644 --- 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 .= "  "; - $listhead .= " parent->CopyPasteHandler)){ + $listhead .= "  "; - $listhead .= "  "; + } $listhead .="";; $this->SetListHeader($listhead); diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc index ce16140a1..e9b190472 100644 --- 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 */