Updated setup.

Reimplemented redirect to index.php if gosa.conf exists

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

diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index 3b2fe43aad3413ad9bfb566c6c2747ac43d24c96..d93bc4b6765e1e1e3e1590e6fe7089a59eefbe26 100644 (file)
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -41,6 +41,13 @@ class setup
     $this->o_steps[8] = new setup_step_7();
     $this->o_steps[9] = new setup_step_8();
 
+    /* Ensure that setup is not reachable if gosa.conf */
+    if(file_exists(CONFIG_DIR."/gosa.conf")){
+      session_destroy();
+      header("Location: index.php")    ;
+      exit();
+    }
+    
     foreach($this->o_steps as $key => $step){
       $this->o_steps[$key]->parent = $this;
     }

diff --git a/setup/class_setupStep8.inc b/setup/class_setupStep8.inc
index 822940453d043f7fe692f7fd8747538fdfab2050..72b6dffbbb6c4d331d579b51a7d3f0dadcd238e9 100644 (file)
--- a/setup/class_setupStep8.inc
+++ b/setup/class_setupStep8.inc
@@ -68,6 +68,13 @@ class setup_step_8 extends setup_step
       $writeable = is_writeable(CONFIG_DIR);
     }
 
+    /* Redirect to GOsa login */
+    if(isset($_POST['use_gosa'])){
+      session_destroy();
+      header("Location: index.php");
+      exit();
+    }
+
     /* Downlaod config */
     if(isset($_POST['getconf'])){
 

diff --git a/setup/setup_step6.tpl b/setup/setup_step6.tpl
index 39a42de00e69b18865e64f53239d628ef68d1de8..ad12837f37426c4efbdcc3825960c9c0e663ab2a 100644 (file)
--- a/setup/setup_step6.tpl
+++ b/setup/setup_step6.tpl
@@ -189,54 +189,54 @@
                 <div style='float:left;width:120px;'>
                                        {t}Snapshot base{/t}&nbsp;
                                </div>
-                               <input style='width:60%' id='snapshot_base' name='snapshot_base' 
+                               <input style='width:220' id='snapshot_base' name='snapshot_base' 
                                        type='text' value='{$generic_settings.snapshot_base}' disabled><br>
                 <div style='float:left;width:120px;'>
                    {t}Ldap base{/t}&nbsp;
                                </div>
-                               <input style='width:60%' id='snapshot_ldap_base' name='snapshot_ldap_base' 
+                               <input style='width:220' id='snapshot_ldap_base' name='snapshot_ldap_base' 
                                        type='text' value='{$generic_settings.snapshot_ldap_base}' disabled><br>
                 <div style='float:left;width:120px;'>
                    {t}Server{/t}&nbsp;
                                </div>
-                               <input style='width:60%' id='snapshot_server' name='snapshot_server' 
+                               <input style='width:220' id='snapshot_server' name='snapshot_server' 
                                        type='text' value='{$generic_settings.snapshot_server}' disabled><br>
                 <div style='float:left;width:120px;'>
                        {t}User{/t}&nbsp;
                                </div>
-                               <input style='width:60%' id='snapshot_user' name='snapshot_user' 
+                               <input style='width:220' id='snapshot_user' name='snapshot_user' 
                                        type='text' value='{$generic_settings.snapshot_user}' disabled><br>
                 <div style='float:left;width:120px;'>
                        {t}Password{/t}&nbsp;
                                </div>
-                               <input style='width:60%' id='snapshot_password' name='snapshot_password' 
+                               <input style='width:220' id='snapshot_password' name='snapshot_password' 
                                        type='password' value='{$generic_settings.snapshot_password}' disabled>
             {else}
                 <input type='checkbox' value='1' name='snapshot_active' checked>{t}Enable{/t}<br>
                 <div style='float:left;width:120px;'>
                    {t}Snapshot base{/t}&nbsp;
                                </div>
-                               <input style='width:60%' id='snapshot_base' name='snapshot_base' 
+                               <input style='width:220' id='snapshot_base' name='snapshot_base' 
                                        type='text' value='{$generic_settings.snapshot_base}'><br>
                 <div style='float:left;width:120px;'>
                    {t}Ldap base{/t}&nbsp;
                                </div>
-                               <input style='width:60%' id='snapshot_ldap_base' name='snapshot_ldap_base' 
+                               <input style='width:220' id='snapshot_ldap_base' name='snapshot_ldap_base' 
                                        type='text' value='{$generic_settings.snapshot_ldap_base}'><br>
                 <div style='float:left;width:120px;'>
                        {t}Server{/t}&nbsp;
                                </div>
-                               <input style='width:60%' id='snapshot_server' name='snapshot_server' 
+                               <input style='width:220' id='snapshot_server' name='snapshot_server' 
                                        type='text' value='{$generic_settings.snapshot_server}'><br>
                 <div style='float:left;width:120px;'>
                    {t}User{/t}&nbsp;
                                </div>
-                               <input style='width:60%' id='snapshot_user' name='snapshot_user' 
+                               <input style='width:220' id='snapshot_user' name='snapshot_user' 
                                        type='text' value='{$generic_settings.snapshot_user}'><br>
                 <div style='float:left;width:120px;'>
                        {t}Password{/t}&nbsp;
                                </div>
-                               <input style='width:60%' id='snapshot_password' name='snapshot_password' 
+                               <input style='width:220;' id='snapshot_password' name='snapshot_password' 
                                        type='password' value='{$generic_settings.snapshot_password}'>
             {/if}
         </div>

diff --git a/setup/setup_step7.tpl b/setup/setup_step7.tpl
index 2105ab37f8cdc1d147c27b575f563757e1a13df0..51a6b57651593d87e89ca707e013c8a5cf270dff 100644 (file)
--- a/setup/setup_step7.tpl
+++ b/setup/setup_step7.tpl
@@ -17,7 +17,7 @@
             <img class='center' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
         </div>
     </div>
-       <div style='float:left'>
+       <div style='float:left; width:600px;' >
 
                {if $failed_checks == 0}
                        <h2>{t}Schema check was completely successful{/t}</h2>

diff --git a/setup/setup_step8.tpl b/setup/setup_step8.tpl
index bcde3ef39fd268c778a21eaa95555a25af401f12..8d242f7f8eff7b4d8446997d27e7e5552e4f288c 100644 (file)
--- a/setup/setup_step8.tpl
+++ b/setup/setup_step8.tpl
@@ -34,6 +34,16 @@
                                <br>
                                <div style='padding-left:20px;'>{t}Last created backup{/t}: &nbsp;<i>{$last_backup_name}</i></div> 
                        {/if}
+
+
+                       
+                       {if $exists}
+                               <br>
+                               <br>
+                               <b>{t}Use GOsa with current configuration file{/t}</b>
+                               <br>
+                               <input type='submit' name='use_gosa' value='{t}Use GOsa now{/t}'> 
+                       {/if}
                {else}          
                        <div style='font-weight: bold; color: red;'>{t}Can't write configuration file, please check permissions.{/t}</div>
                        <pre>