diff --git a/html/setup.php b/html/setup.php
index 37c3802116babb64b7005ecbfac7cf1ff723f25d..623394b1a5587758ba7df906583d0860e1ade9ec 100644 (file)
--- a/html/setup.php
+++ b/html/setup.php
/* Get standard functions */
require_once ("../include/php_setup.inc");
require_once ("functions.inc");
/* Get standard functions */
require_once ("../include/php_setup.inc");
require_once ("functions.inc");
+require_once ("class_timezones.inc");
require_once("../setup/class_setup.inc");
require_once("../setup/class_setupStep.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 */
/* Set header */
$_SESSION['LastError'] = "";
/* Set template compile directory */
$_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))){
+ echo sprintf(_("Directory '%s' specified as compile directory is not accessible!"),
+ $smarty->compile_dir);
+ exit();
+}
/* Get posted language */
if(!isset($_SESSION['lang'])){
/* Get posted language */
if(!isset($_SESSION['lang'])){
}
$lang = $_SESSION['lang'];
}
$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);
putenv("LANGUAGE=");
putenv("LANG=$lang");
setlocale(LC_ALL, $lang);
@@ -114,9 +122,10 @@ $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("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 != ""){
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", "");
}
} else {
$smarty->assign("php_errors", "");
}