Some migration fixes

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

diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index 57fc5efdcba52fefec994aa229ccb0e15a896a25..5469bd52222d8c80fdebac76baa16acdd98ff081 100644 (file)
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -172,6 +172,8 @@ class Step_Migrate extends setup_step
   }
 
 
+  /* Check if there are uidNumbers which are used more than once. 
+   */
   function check_uidNumber()
   {
     $cv = $this->parent->captured_values;
@@ -218,6 +220,9 @@ class Step_Migrate extends setup_step
     }
   }
 
+  
+  /* Check if there are duplicated gidNumbers present in ldap
+   */
   function check_gidNumber()
   {
     $cv = $this->parent->captured_values;
@@ -265,7 +270,8 @@ class Step_Migrate extends setup_step
   }
 
 
-  /* Search for winstations outside the winstation ou */
+  /* Search for winstations outside the winstation ou 
+   */
   function search_outside_winstations()
   {
     $cv = $this->parent->captured_values;
@@ -275,8 +281,6 @@ class Step_Migrate extends setup_step
         FALSE,
         $cv['tls']);
 
-    
-
     /* Get winstation ou */
     if($cv['generic_settings']['wws_ou_active']) {
       $winstation_ou = $cv['generic_settings']['ws_ou'];
@@ -324,7 +328,8 @@ class Step_Migrate extends setup_step
   }
 
 
-  /* Search for groups outside the group ou */
+  /* Search for groups outside the group ou 
+   */
   function search_outside_groups()
   {
     $cv = $this->parent->captured_values;
@@ -369,7 +374,9 @@ class Step_Migrate extends setup_step
     }
   }
 
-  /* Search for users outside the people ou */
+
+  /* Search for users outside the people ou 
+   */
   function search_outside_users()
   {
     $cv = $this->parent->captured_values;
@@ -747,6 +754,7 @@ class Step_Migrate extends setup_step
     }elseif($ldap->count()){
       $this->checks['acls']['STATUS']    = TRUE;
       $this->checks['acls']['STATUS_MSG']= _("Ok");
+      $this->checks['acls']['ERROR_MSG'] = "";
     }else{
       $this->checks['acls']['STATUS']    = FALSE;
       $this->checks['acls']['STATUS_MSG']= _("Failed");
@@ -1385,6 +1393,7 @@ class Step_Migrate extends setup_step
       if($just_check){
         $this->checks['root']['STATUS']    = FALSE;
         $this->checks['root']['STATUS_MSG']= _("Failed");
+        $this->checks['root']['ERROR_MSG'] =  "The ldap root object is missing, but it is required to use GOsa. ";
         $this->checks['root']['ERROR_MSG'].=  "<input type='submit' name='retry_root_create' value='"._("Try to create root object")."'>";
         return(FALSE);
       }else{
@@ -1544,7 +1553,6 @@ class Step_Migrate extends setup_step
   }
 
 
-
   function get_all_group_ous()
   {
     /* Get collected configuration settings */

diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl
index b4c7d7452fa441e8523d860c7a5af4c76ca269a1..8a6beab6b1bda274963331e7f4d4a408173245e2 100644 (file)
--- a/setup/setup_migrate.tpl
+++ b/setup/setup_migrate.tpl
@@ -3,7 +3,7 @@
        <h1 style='color:red'>Style fixes necessary here ;-)</h1>
     <div class='default'>
 
-               {if $method == "default"}
+       {if $method == "default"}
 
        <p>     
                Create a reload for each entry later 
@@ -20,7 +20,7 @@
                                        {/if}
                                        </div>
                                {else}
-                                       <div class='step2_failed'>{$checks.$key.STATUS_MSG}
+                                       <div class='step2_failed' style='float:none'>{$checks.$key.STATUS_MSG}
                                        </div>
                                        <div>
                                        {if $checks.$key.ERROR_MSG}
@@ -50,13 +50,13 @@
 
                                &nbsp;{$outside_winstations.$key.dn}
                                {if $outside_winstations.$key.ldif != ""}
-                      <div class="step2_entry_container_info" id="sol_8">
-<div style='padding-left:20px;'>
-<pre>
-{$outside_winstations.$key.ldif}
-</pre>
-</div>
-</div>
+                    <div class="step2_entry_container_info" id="sol_8">
+                                               <div style='padding-left:20px;'>
+                                                       <pre>
+                                                               {$outside_winstations.$key.ldif}
+                                                       </pre>
+                                               </div>
+                                       </div>
                                {/if}
                                <br>
                        {/foreach}
@@ -229,7 +229,7 @@
                        
                        <p>&nbsp;</p>
                        <b>{t}Append administrational acls to existing an user or a group{/t}</b><br>
-                       Bla {t}To grant administrative permissions to a user or a group, select an element and use button below.{/t}
+                       {t}To grant administrative permissions to a user or a group, select an element and use button below.{/t}
                        <p style='padding-left:10px;'>
                        <select name='acl_create_type' onChange='document.mainform.submit();' >
                                {if $type == "user"}