Updated stats handling.

[gosa.git] / gosa-core / html / setup.php

diff --git a/gosa-core/html/setup.php b/gosa-core/html/setup.php
index e4be820b13353faaa4034969c3d5317e1f5c3a7e..4b692e02639a45e2ea2bda33de2afc8496408e68 100644 (file)
--- a/gosa-core/html/setup.php
+++ b/gosa-core/html/setup.php
@@ -24,6 +24,11 @@
 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");
@@ -31,9 +36,6 @@ 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");
@@ -50,7 +52,7 @@ ini_set("session.gc_maxlifetime",24*60*60);
 
 /* Start session */
 session::start();
-session::set('DEBUGLEVEL',1);
+session::global_set('debugLevel',1);
 session::set('errorsAlreadyPosted',array());
 
 /* Attribute initialization, reset errors */
@@ -58,41 +60,46 @@ session::set('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::is_set('lang')){
-  session::set('lang',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'] != ""){
-    session::set('lang',$_POST['lang_selected']);
+    session::global_set('lang',$_POST['lang_selected']);
   }else{
-    session::set('lang',get_browser_language());
+    session::global_set('lang',get_browser_language());
   }
 }
 
 /* Check for js */
-if (!isset($_GET['js']) && !session::is_set('js')){
+if (!isset($_GET['js']) && !session::global_is_set('js')){
   echo '<script language="JavaScript" type="text/javascript">';
   echo '  location = "setup.php?js=true";';
   echo '</script>';
 
-  session::set('js',FALSE);
+  session::global_set('js',FALSE);
 } elseif(isset($_GET['js'])) {
-  session::set('js',TRUE);
+  session::global_set('js',TRUE);
 }
 
 
-$lang = session::get('lang');
+$lang = session::global_get('lang');
 /* Append .UTF-8 to language string if necessary */
 if(!preg_match("/utf(-)8$/i",$lang)){
   $lang .= ".UTF-8";
@@ -113,6 +120,7 @@ textdomain($domain);
 $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'));
 
@@ -131,7 +139,7 @@ $focus.= 'next_msg_dialog();';
 $focus.= '</script>';
 
 /* show web frontend */
-$setup = session::get('setup');
+$setup = session::global_get('setup');
 $smarty->assign("contents"  , $display);
 $smarty->assign("navigation", $setup->get_navigation_html());
 $smarty->assign("header", $setup->get_header_html());
@@ -143,8 +151,11 @@ if ($error_collector != ""){
 } 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: