From 4d8b16bb2d0db3f0ab8c3be973293ad8f8192cc7 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 18 May 2010 15:14:24 +0000
Subject: [PATCH] Added Warning message for existing objects

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18534 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../propertyEditor/migration/class_migrateRDN.inc     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gosa-core/plugins/addons/propertyEditor/migration/class_migrateRDN.inc b/gosa-core/plugins/addons/propertyEditor/migration/class_migrateRDN.inc
index 46c70356c..4d619ba08 100644
--- a/gosa-core/plugins/addons/propertyEditor/migration/class_migrateRDN.inc
+++ b/gosa-core/plugins/addons/propertyEditor/migration/class_migrateRDN.inc
@@ -195,7 +195,16 @@ class migrateRDN implements propertyMigration
             $tmp = new plugin($this->config,NULL);
             foreach($this->found['move'] as $id => $data){
                 if(isset($_POST["migrateEntry_{$id}"])){
-                    $tmp->move($data['from'], $data['to']);
+                    if($tmp->move($data['from'], $data['to'])){
+                    }elseif($ldap->dn_exists($data['to'])){
+                        msg_dialog::display(_("Error"), 
+                                sprintf(_("Migration failed for object %s, dn already exists!"), 
+                                    bold($data['to'])), ERROR_DIALOG);
+                    }else{
+                        msg_dialog::display(_("Error"), 
+                                sprintf(_("Migration failed for object %s, please check if it already exists!"), 
+                                    bold($data['to'])), ERROR_DIALOG);
+                    }
                 }
             }
             $this->checkForIssues();
-- 
2.30.2