Moved setup navigation buttons to page bottom

[gosa.git] / html / setup.php

diff --git a/html/setup.php b/html/setup.php
index 1f3796712c58d912a3aa9f2be8c2fb69b775a972..a05c3a0866d9fb33b23491da3557334b92a378e8 100644 (file)
--- a/html/setup.php
+++ b/html/setup.php
@@ -33,7 +33,9 @@ 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_setupStep6a.inc");
 require_once("../setup/class_setupStep7.inc");
+require_once("../setup/class_setupStep8.inc");
 
 
 /* Set header */
@@ -77,8 +79,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'];
@@ -108,6 +114,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>");
@@ -120,6 +127,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:
 ?>