X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=html%2Fsetup.php;h=e98b41cfbf7810569d90ea8d37e42f1a9fcb785c;hb=6e8abbd4123cbceb3edfba6a3d2617227bafd8b1;hp=a05c3a0866d9fb33b23491da3557334b92a378e8;hpb=df0b22c38244e29b96848e0364fa44247c6f6392;p=gosa.git

diff --git a/html/setup.php b/html/setup.php
index a05c3a086..e98b41cfb 100644
--- a/html/setup.php
+++ b/html/setup.php
@@ -27,15 +27,18 @@ 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_setupStep6a.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_Feedback.inc");
+require_once("../setup/class_setupStep_Finish.inc");
 
 
 /* Set header */
@@ -67,13 +70,14 @@ $_SESSION['errorsAlreadyPosted']= array();
 $_SESSION['LastError']          = "";
 
 /* Set template compile directory */
-if (isset ($config->data['MAIN']['COMPILE'])){
-  $smarty->compile_dir= $config->data['MAIN']['COMPILE'];
-} else {
-  $smarty->compile_dir= '/var/spool/gosa/';
-}
-
+$smarty->compile_dir= '/var/spool/gosa/';
 
+/* Check for compile directory */
+if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
+  msg_dialog::display(_("Smarty"),sprintf(_("Directory '%s' specified as compile directory is not accessible!"),
+    $smarty->compile_dir),FATAL_ERROR_DIALOG);
+  exit();
+}
 
 /* Get posted language */
 if(!isset($_SESSION['lang'])){
@@ -88,7 +92,10 @@ if(isset($_POST['lang_selected'])){
 }
 
 $lang = $_SESSION['lang'];
-$lang.=".UTF-8";
+/* Append .UTF-8 to language string if necessary */
+if(!preg_match("/utf(-)8$/i",$lang)){
+  $lang .= ".UTF-8";
+}
 putenv("LANGUAGE=");
 putenv("LANG=$lang");
 setlocale(LC_ALL, $lang);
@@ -110,22 +117,33 @@ print_red(NULL);
 
 $smarty->assign("date", date("l, dS F Y H:i:s O"));
 $header= "<!-- headers.tpl-->".$smarty->fetch(get_template_path('setup_headers.tpl'));
+
+
+
+/* Set focus to the error button if we've an error message */
+$focus= "";
+if (isset($_SESSION['errors']) && $_SESSION['errors'] != ""){
+  $focus= '<script language="JavaScript" type="text/javascript">';
+  $focus.= 'document.forms[0].error_accept.focus();';
+  $focus.= '</script>';
+}
+
+$focus= '<script language="JavaScript" type="text/javascript">';
+$focus.= 'next_msg_dialog();';
+$focus.= '</script>';
+
 /* show web frontend */
 $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());
+$smarty->assign("bottom", $focus.$_SESSION['setup']->get_bottom_html());
+$smarty->assign("msg_dialogs", msg_dialog::get_dialogs());
 
 if ($error_collector != ""){
-  $smarty->assign("php_errors", $error_collector."</div>");
+  $smarty->assign("php_errors", preg_replace("/%BUGBODY%/",$error_collector_mailto,$error_collector)."</div>");
 } else {
   $smarty->assign("php_errors", "");
 }
-if (isset($_SESSION['errors'])){
-  $smarty->assign("errors", $_SESSION['errors']);
-}else{
-  $smarty->assign("errors"    , "");
-}
 
 $smarty->assign("version",get_gosa_version());