Fixes #2919 Finished implementing migrate step using simplePlugin

Conflicts:
	plugins/config/class_configInLdap.inc
	setup/class_setupStep_Migrate.inc

plugins/config/class_configInLdap.inc

@@ -54,19 +54,22 @@ class configInLdap extends simplePlugin
   static function plInfo()
   {
     return array(
-      "plShortName"     => _("Configuration"),
-      "plDescription"   => _("FusionDirectory configuration"),
-      "plIcon"          => "geticon.php?context=categories&icon=settings&size=48",
-      "plObjectType"    => array("configuration" => array(
-        "name"    => _("FusionDirectory configuration"),
-        "filter"  => "objectClass=fusionDirectoryConf",
-        "icon"    => "geticon.php?context=categories&icon=settings&size=16",
-      )),
-      "plSection"       => array("conf" => array("name" => _("Configuration"), "priority" => 20)),
+      'plShortName'     => _('Configuration'),
+      'plDescription'   => _('FusionDirectory configuration'),
+      'plIcon'          => 'geticon.php?context=categories&icon=settings&size=48',
+      'plObjectType'    => array(
+        'configuration' => array(
+          'name'    => _('FusionDirectory configuration'),
+          'filter'  => 'objectClass=fusionDirectoryConf',
+          'icon'    => 'geticon.php?context=categories&icon=settings&size=16',
+          'ou'      => preg_replace('/^[^,]+,/', '', CONFIGRDN)
+        )
+      ),
+      'plSection'       => array('conf' => array('name' => _('Configuration'), 'priority' => 20)),
       'plManages'       => array('configuration'),
-      "plPriority"      => 0,
+      'plPriority'      => 0,
 
-      "plProvidedAcls"  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(self::getAttributesInfo())
     );
   }
 

setup/setup_migrate_gosaAccounts.tpl

@@ -2,14 +2,30 @@
   <div class="default">
     <h2>{$infos.title}</h2>
 
-    <p>{t}The listed entries are currently invisible in the FusionDirectory interface. If you want to change this for a couple of entries only, just select them and use the 'Migrate' button below.{/t}</p>
-    <p>{t}If you want to know what will be done when migrating the selected entries, use the 'Show changes' button to see the LDIF.{/t}</p>
+    {if $infos.outside}
+      <p>
+      {t}This dialog allows moving a couple of entries to the configured tree. Doing this may straighten your LDAP service.{/t}
+      </p>
+      <p style="color:red">
+      {t}Be careful with this option! There may be references pointing to these entries. The FusionDirectory setup can't migrate references, so you may want to cancel the migration in this case.{/t}
+      </p>
+      <p>
+        {t}Move selected entries into this tree{/t}:
+        <select name="destination">
+          {html_options values=$infos.ous output=$infos.ous selected=$infos.destination}
+        </select>
+      </p>
+    {else}
+      <p>{t}The listed entries are currently invisible in the FusionDirectory interface. If you want to change this for a couple of entries only, just select them and use the 'Migrate' button below.{/t}</p>
+      <p>{t}If you want to know what will be done when migrating the selected entries, use the 'Show changes' button to see the LDIF.{/t}</p>
+    {/if}
+
     {foreach from=$infos.entries item=entry key=key}
       {if $entry.checked}
         <input type="checkbox" name="migrate_{$key}" checked="checked" id="migrate_{$key}"/>
         <label for="migrate_{$key}">{$entry.dn}</label>
         {if $entry.after != ""}
-          <div class="step2_entry_container_info" id="sol_8">
+          <div class="step2_entry_container_info">
             {t}Current{/t}
             <div style="padding-left:20px;">
 <pre>
@@ -25,6 +41,12 @@ dn: {$entry.dn}
 </pre>
             </div>
           </div>
+        {elseif $entry.ldif != ""}
+          <div class="step2_entry_container_info">
+            <div style="padding-left:20px;">
+              <pre>{$entry.ldif}</pre>
+            </div>
+          </div>
         {/if}
       {else}
         <input type="checkbox" name="migrate_{$key}" id="migrate_{$key}"/>
@@ -36,11 +58,7 @@ dn: {$entry.dn}
     <label for="toggle_calue">{t}Select all{/t}</label>
     <br/>
 
-    {if $user_details}
-      <input type="submit" name="dialog_hidechanges" value="{t}Hide changes{/t}"/>
-    {else}
-      <input type="submit" name="dialog_showchanges" value="{t}Show changes{/t}"/>
-    {/if}
+    <input type="submit" name="dialog_showchanges" value="{t}Show changes{/t}"/>
 
     <hr/>