diff --git a/html/setup.php b/html/setup.php
index 52f528b38b1fc285dbc4855a89959338f119c36e..e37452c06c6883aa017ad18a56a64e5eea1054bd 100644 (file)
--- a/html/setup.php
+++ b/html/setup.php
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_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");
require_once("../setup/class_setupStep_Finish.inc");
$_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);
$smarty->assign("bottom", $_SESSION['setup']->get_bottom_html());
if ($error_collector != ""){
$smarty->assign("bottom", $_SESSION['setup']->get_bottom_html());
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", "");
}