Removed debug output

[gosa.git] / gosa-core / include / class_CopyPasteHandler.inc

diff --git a/gosa-core/include/class_CopyPasteHandler.inc b/gosa-core/include/class_CopyPasteHandler.inc
index 114beeaa777229d1fce7a5fae8bccaff9c88d0ed..ad94b984d1566d1b6c0d99ad1c4673884062aef2 100644 (file)
--- a/gosa-core/include/class_CopyPasteHandler.inc
+++ b/gosa-core/include/class_CopyPasteHandler.inc
@@ -298,6 +298,7 @@ class CopyPasteHandler {
           $entry = $this->load_entry_from_queue($entry);
           $this->queue[$key] = $entry;
         }
+        $entry= $this->_update_vars($entry);
         $msgs = $entry['object']->check();
         $acl = $ui->get_category_permissions($entry['dn'], $entry['tab_acl_category']);
 
@@ -342,7 +343,6 @@ class CopyPasteHandler {
       /* Load next queue entry */
       if(!count($msgs)){
         $this->lastdn = $this->current['object']->dn;
-        $this->current= $this->_update_vars($this->current);
         $this->current['object']->save();
         $this->current = FALSE;
       }else{
@@ -355,12 +355,18 @@ class CopyPasteHandler {
     /* Display a list of all pastable entries 
      */
     if(count($this->clean_objects)){
+      
+      $dns = array();
+      foreach($this->clean_objects as $object){
+        $dns[] = $object['dn'];
+      }
+
       $smarty = get_smarty();
       $smarty->assign("type","directly");
       $smarty->assign("Complete",false);
       $smarty->assign("AttributesToFix"," ");
       $smarty->assign("SubDialog","");
-      $smarty->assign("message"  , sprintf(_("These objects will be pasted: %s"), "<br>".msgPool::buildList($this->clean_objects)));
+      $smarty->assign("message"  , sprintf(_("These objects will be pasted: %s"), "<br>".msgPool::buildList($dns)));
       return($smarty->fetch(get_template_path("copyPasteDialog.tpl",FALSE)));
     }
 
@@ -372,6 +378,7 @@ class CopyPasteHandler {
         $key = key($this->objects_to_fix);
         if(isset($this->objects_to_fix[$key])){
           $this->current = $this->objects_to_fix[$key];
+          $this->current= $this->_update_vars($this->current);
           unset($this->objects_to_fix[$key]);
           unset($this->queue[$key]); 
         }
@@ -446,6 +453,10 @@ class CopyPasteHandler {
 
       /* Update all attributes specified with SetVar */
       foreach($this->setvar_array as $name => $value){
+
+        /* Do not update parent for plugins, this may break things */
+        if($name == "parent") continue;
+
         if(isset($entry['object']->by_object[$key]->$name)){
           $entry['object']->by_object[$key]->$name = $value;
         }
@@ -471,13 +482,13 @@ class CopyPasteHandler {
   /* returns the paste icon for headpages */ 
   function generatePasteIcon()
   {
-    $Copy_Paste= "&nbsp;<img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;";
+    $Copy_Paste= "&nbsp;<img class='center' src='images/lists/seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;";
     if($this->entries_queued()){
-      $img= "images/copypaste.png";
+      $img= "images/lists/paste.png";
       $Copy_Paste.= "<input type='image' name='editPaste' class='center'
         src='".$img."' alt='"._("Paste")."'>&nbsp;";
     }else{
-      $Copy_Paste.= "<img class='center' src='images/cant_editpaste.png' alt=\""._("Cannot paste")."\">&nbsp;";
+      $Copy_Paste.= "<img class='center' src='images/lists/paste-grey.png' alt=\""._("Cannot paste")."\">&nbsp;";
     }
     return ($Copy_Paste);
   }