index 87eb0ec8901d8f757dd1d74c70437f035e10264a..4b692e02639a45e2ea2bda33de2afc8496408e68 100644 (file)
--- a/gosa-core/html/setup.php
+++ b/gosa-core/html/setup.php
require_once ("../include/php_setup.inc");
require_once ("functions.inc");
+// Do not use the GOsa default error handler.
+// To do so we require a valid config object - and at this point
+// we doesn't have one.
+restore_error_handler();
+
require_once("../setup/class_setup.inc");
require_once("../setup/class_setupStep.inc");
require_once("../setup/class_setupStep_Welcome.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");
/* Start session */
session::start();
-session::global_set('DEBUGLEVEL',1);
+session::global_set('debugLevel',1);
session::set('errorsAlreadyPosted',array());
/* Attribute initialization, reset errors */
session::set('errorsAlreadyPosted',array());
session::set('LastError',"");
-/* Set template compile directory */
-$smarty->compile_dir= '/var/spool/gosa/';
+$smarty->compile_dir= "/var/spool/gosa/";
+if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
+
+ if(isset($_SERVER['SCRIPT_FILENAME'])){
+ $smarty->compile_dir= preg_replace("#/html/.*$#","",$_SERVER['SCRIPT_FILENAME']);
+ }
+}
/* 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();
+ msg_dialog::display(_("Smarty"),sprintf( _("Compile directory %s is not accessible!"),
+ bold('/var/spool/gosa/')),FATAL_ERROR_DIALOG);
+ exit();
}
/* Get posted language */
-if(!session::global_is_set('language')){
- session::global_set('language',get_browser_language());
+if(!session::global_is_set('lang')){
+ session::global_set('lang',get_browser_language());
}
if(isset($_POST['lang_selected'])){
if($_POST['lang_selected'] != ""){
$display = "";
require_once("../setup/main.inc");
+$smarty->assign ("title","GOsa");
$smarty->assign("date", date("l, dS F Y H:i:s O"));
$header= "<!-- headers.tpl-->".$smarty->fetch(get_template_path('setup_headers.tpl'));
} else {
$smarty->assign("php_errors", "");
}
-
-$smarty->assign("version",get_gosa_version());
+if(function_exists("get_gosa_version")){
+ $smarty->assign("version",get_gosa_version());
+}else{
+ $smarty->assign("version","");
+}
echo $header.$smarty->fetch("../setup/setup_frame.tpl");
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: