X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=html%2Fsetup.php;h=dfc4c8e56ff5f26cb5ad12005a7561e4925203cf;hb=97a9e509efa11193f95466c279207f69bf538d8c;hp=dc02aad3d231852c85340cb030b6fb9fd1e56b77;hpb=f6c6299f57889e70a6d01d296bc5083f1a297274;p=gosa.git

diff --git a/html/setup.php b/html/setup.php
index dc02aad3d..dfc4c8e56 100644
--- a/html/setup.php
+++ b/html/setup.php
@@ -27,14 +27,17 @@ require_once ("functions.inc");
 
 require_once("../setup/class_setup.inc");
 require_once("../setup/class_setupStep.inc");
-require_once("../setup/class_setupStep1.inc");
-require_once("../setup/class_setupStep2.inc");
-require_once("../setup/class_setupStep3.inc");
-require_once("../setup/class_setupStep4.inc");
-require_once("../setup/class_setupStep5.inc");
-require_once("../setup/class_setupStep6.inc");
-require_once("../setup/class_setupStep7.inc");
-require_once("../setup/class_setupStep8.inc");
+require_once("../setup/class_setupStep_Welcome.inc");
+require_once("../setup/class_setupStep_Language.inc");
+require_once("../setup/class_setupStep_Checks.inc");
+require_once("../setup/class_setupStep_License.inc");
+require_once("../setup/class_setupStep_Ldap.inc");
+require_once("../setup/class_setupStep_Config1.inc");
+require_once("../setup/class_setupStep_Config2.inc");
+require_once("../setup/class_setupStep_Config3.inc");
+require_once("../setup/class_setupStep_Schema.inc");
+require_once("../setup/class_setupStep_Migrate.inc");
+require_once("../setup/class_setupStep_Finish.inc");
 
 
 /* Set header */
@@ -78,8 +81,12 @@ if (isset ($config->data['MAIN']['COMPILE'])){
 if(!isset($_SESSION['lang'])){
   $_SESSION['lang'] = get_browser_language();
 }
-if(isset($_POST['lang'])){
-  $_SESSION['lang'] = $_POST['lang'];
+if(isset($_POST['lang_selected'])){
+  if($_POST['lang_selected'] != ""){
+    $_SESSION['lang'] = $_POST['lang_selected'];
+  }else{
+    $_SESSION['lang'] = get_browser_language();
+  }
 }
 
 $lang = $_SESSION['lang'];
@@ -109,6 +116,7 @@ $header= "<!-- headers.tpl-->".$smarty->fetch(get_template_path('setup_headers.t
 $smarty->assign("contents"  , $display);
 $smarty->assign("navigation", $_SESSION['setup']->get_navigation_html());
 $smarty->assign("header", $_SESSION['setup']->get_header_html());
+$smarty->assign("bottom", $_SESSION['setup']->get_bottom_html());
 
 if ($error_collector != ""){
   $smarty->assign("php_errors", $error_collector."</div>");
@@ -121,6 +129,8 @@ if (isset($_SESSION['errors'])){
   $smarty->assign("errors"    , "");
 }
 
+$smarty->assign("version",get_gosa_version());
+
 echo $header.$smarty->fetch("../setup/setup_frame.tpl");
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>