Updated copy & Paste

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

diff --git a/include/class_CopyPasteHandler.inc b/include/class_CopyPasteHandler.inc
index 425f2a08f6283d586cc35f339e070685998672ab..83ecc51d91e7e7509267afa1eb65ee9cd554a8c8 100644 (file)
--- a/include/class_CopyPasteHandler.inc
+++ b/include/class_CopyPasteHandler.inc
@@ -153,7 +153,7 @@ class CopyPasteHandler {
 
 
   /* Paste one entry from queue */
-  function paste_entries()
+  function load_entry_from_queue()
   {
 
     /* Save posted variables, handle dialog posts like 'cancel' */
@@ -188,8 +188,6 @@ class CopyPasteHandler {
       $this->current = $entry;
       unset($this->queue[$key]);
     }
-    
-    return($this->execute());
   }
 
   
@@ -230,6 +228,9 @@ class CopyPasteHandler {
           $this->current['object']->save();
           $this->lastdn = $this->current['object']->dn;
           $this->current =FALSE;
+  
+          /* Load next queue entry */
+          $this->load_entry_from_queue();
         }
       }
       if($this->current){

diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 0d8adba855935651c6fba664503434dfdc53aebe..e9fc05ba62c8ad2040f000a56858a35cb36451ac 100644 (file)
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -114,62 +114,17 @@ class userManagement extends plugin
       $s_tab = "user";
     }
 
-    /* Display the copy & paste dialog, if it is currently open */
-    $ret = $this->copyPasteHandling_from_queue($s_action);
-    if($ret){
-      return($ret);
-    }
-
-
-    /********************
-      Edit existing entry 
-     ********************/
-
-    /* User wants to edit data? */
-    if (($s_action=="edit") && (!isset($this->usertab->config))){
-
-      /* Get 'dn' from posted 'uid', must be unique */
-      $this->dn= $this->list[trim($s_entry)]['dn'];
-
-      /* Check locking, save current plugin in 'back_plugin', so
-         the dialog knows where to return. */
-      if (($user= get_lock($this->dn)) != ""){
-        return(gen_locked_message ($user, $this->dn));
-      }
-
-      /* Lock the current entry, so everyone will get the
-         above dialog */
-      add_lock ($this->dn, $this->ui->dn);
-
-      /* Register usertab to trigger edit dialog */
-      $this->usertab= new usertabs($this->config, 
-          $this->config->data['TABS']['USERTABS'], $this->dn);
-
-      /* Switch tab, if it was requested by the user */
-      $this->usertab->current = $s_tab;
-
-      /* Set ACL and move DN to the headline */
-      $this->usertab->set_acl_base($this->dn);
-      $_SESSION['objectinfo']= $this->dn;
-    }
-
 
     /********************
-      Edit canceled 
+      Copy & Paste 
      ********************/
 
-    /* Reset all relevant data, if we get a _cancel request */
-    if (isset($_POST['edit_cancel']) || isset($_POST['password_cancel'])){
-      if (isset($this->usertab)){
-        del_lock ($this->usertab->dn);
-        unset ($this->usertab);
+    /* Display the copy & paste dialog, if it is currently open */
+    if($this->CPPasswordChange == ""){
+      $ret = $this->copyPasteHandling_from_queue($s_action);
+      if($ret){
+        return($ret);
       }
-      $this->usertab= NULL;
-      $this->lognames= array();;
-      $this->sn= "";
-      $this->givenName= "";
-      $this->uid= "";
-      unset ($_SESSION['objectinfo']);
     }
 
 
@@ -272,7 +227,6 @@ class userManagement extends plugin
           if (isset($config->data['MAIN']['EXTERNALPWDHOOK'])){
             exec($config->data['MAIN']['EXTERNALPWDHOOK']." ".$username." ".$_POST['new_password'], $resarr);
           }
-
           new log("modify","users/".get_class($this),$this->dn,array(),"Password has been changed");
         }
       } else {
@@ -292,6 +246,58 @@ class userManagement extends plugin
     }
 
 
+    /********************
+      Edit existing entry 
+     ********************/
+
+    /* User wants to edit data? */
+    if (($s_action=="edit") && (!isset($this->usertab->config))){
+
+      /* Get 'dn' from posted 'uid', must be unique */
+      $this->dn= $this->list[trim($s_entry)]['dn'];
+
+      /* Check locking, save current plugin in 'back_plugin', so
+         the dialog knows where to return. */
+      if (($user= get_lock($this->dn)) != ""){
+        return(gen_locked_message ($user, $this->dn));
+      }
+
+      /* Lock the current entry, so everyone will get the
+         above dialog */
+      add_lock ($this->dn, $this->ui->dn);
+
+      /* Register usertab to trigger edit dialog */
+      $this->usertab= new usertabs($this->config, 
+          $this->config->data['TABS']['USERTABS'], $this->dn);
+
+      /* Switch tab, if it was requested by the user */
+      $this->usertab->current = $s_tab;
+
+      /* Set ACL and move DN to the headline */
+      $this->usertab->set_acl_base($this->dn);
+      $_SESSION['objectinfo']= $this->dn;
+    }
+
+
+    /********************
+      Edit canceled 
+     ********************/
+
+    /* Reset all relevant data, if we get a _cancel request */
+    if (isset($_POST['edit_cancel']) || isset($_POST['password_cancel'])){
+      if (isset($this->usertab)){
+        del_lock ($this->usertab->dn);
+        unset ($this->usertab);
+      }
+      $this->usertab= NULL;
+      $this->lognames= array();;
+      $this->sn= "";
+      $this->givenName= "";
+      $this->uid= "";
+      unset ($_SESSION['objectinfo']);
+    }
+
+
     /********************
       Delete MULTIPLE entries requested, display confirm dialog
      ********************/
@@ -875,6 +881,8 @@ class userManagement extends plugin
 
   function copyPasteHandling_from_queue($s_action)
   {
+
+    /* Add entries to queue */
     if($s_action == "copy_multiple" || $s_action == "cut_multiple"){
 
       /* Cleanup object queue */
@@ -893,16 +901,20 @@ class userManagement extends plugin
       }
     }
     
+    /* Start pasting entries */
     if($s_action == "editPaste"){
       $this->start_pasting_copied_objects = TRUE;
     }
 
     /* Return C&P dialog */ 
-    if($this->start_pasting_copied_objects && 
-        ($this->CopyPasteHandler->entries_queued() || $this->CopyPasteHandler->current)){
+    if($this->start_pasting_copied_objects && $this->CopyPasteHandler->entries_queued()){
    
+      /* Load entry from queue and set base */
+      $this->CopyPasteHandler->load_entry_from_queue();
       $this->CopyPasteHandler->SetVar("base",$this->DivListUsers->selectedBase); 
-      $data = $this->CopyPasteHandler->paste_entries();
+
+      /* Get dialog */
+      $data = $this->CopyPasteHandler->execute();
 
       /* Set CPPasswordChange to s_entry which indicates that this entry requires a new password. */
       if(isset($_POST['passwordTodo']) && ($_POST['passwordTodo'] == "new")){
@@ -916,12 +928,15 @@ class userManagement extends plugin
       }
 
       /* Return dialog data */
-      if(!empty($data)){
+      if(!empty($data) && $this->CPPasswordChange == ""){
         return($data);
       }
     }
-  
-    $this->start_pasting_copied_objects = FALSE;
+
+    /* Automatically disable status for pasting */ 
+    if(!$this->CopyPasteHandler->entries_queued()){
+      $this->start_pasting_copied_objects = FALSE;
+    }
     return("");
   }