Fixed copy'n paste switch for users

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

diff --git a/gosa-core/Changelog b/gosa-core/Changelog
index 524cb457865db6fd1fc94abfad79d5f09dd34247..403bd3e86fdcebc92dd9163660de35cf000a6c69 100644 (file)
--- a/gosa-core/Changelog
+++ b/gosa-core/Changelog
@@ -6,6 +6,7 @@ GOsa2 changelog
   - Fixed generation of kerberos host keys when DNS is enabled
   - Fixed template error message when no sshkey plugin is enabled
   - Speed up group and user removal by large factors
+  - Fix Problem where arrays got shortened by one in copy and paste
 
 * gosa 2.6.6
   - Added ssh public key management

diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index 27ed27e18fbd1fe019139acfbee6693e9e1fc5ba..1b14c0a5a7b0e8d26eb1fedba2f7490c979d2580 100644 (file)
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -665,13 +665,17 @@ class userManagement extends management
   function copyPasteHandler($action="",$target=array(),$all=array(),
       $altTabClass ="", $altTabType = "", $altAclCategory="",$altAclPlugin="")
   {
-    $this->cpHandler->lastdn = "";
-    $str = management::copyPasteHandler($action,$target,$all);
-    if($this->cpHandler->lastdn != "" && isset($_POST['passwordTodo']) && $_POST['passwordTodo'] == "new"){
-      $this->pwd_change_queue[] = $this->cpHandler->lastdn;
-      return($this->handlePasswordQueue());
+    if ($this->config->boolValueIsTrue("main", "copyPaste")){
+      $this->cpHandler->lastdn = "";
+      $str = management::copyPasteHandler($action,$target,$all);
+      if($this->cpHandler->lastdn != "" && isset($_POST['passwordTodo']) && $_POST['passwordTodo'] == "new"){
+        $this->pwd_change_queue[] = $this->cpHandler->lastdn;
+        return($this->handlePasswordQueue());
+      }
+      return($str);
     }
-    return($str);
+
+    return "";
   }