X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Fsetup.php;h=8f733d33907fc9ce62fc61a215bf94c77eafc88d;hb=ab302c2472a7c64058e4f0d7aa11a5cc639ad7ea;hp=19972d263a1e42285c5611a8dd4aaa3117672f74;hpb=c26845a09ed3142dd8805effefce01b35f7ded46;p=gosa.git
diff --git a/gosa-core/html/setup.php b/gosa-core/html/setup.php
index 19972d263..8f733d339 100644
--- a/gosa-core/html/setup.php
+++ b/gosa-core/html/setup.php
@@ -50,20 +50,9 @@ 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());
-/* Check for js */
-if (!isset($_GET['js']) && !session::is_set('js')){
- echo '';
-
- session::set('js',FALSE);
-} elseif(isset($_GET['js'])) {
- session::set('js',TRUE);
-}
-
/* Attribute initialization, reset errors */
session::set('errors',"");
session::set('errorsAlreadyPosted',array());
@@ -80,18 +69,30 @@ if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
}
/* 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());
}
}
-$lang = session::get('lang');
+/* Check for js */
+if (!isset($_GET['js']) && !session::global_is_set('js')){
+ echo '';
+
+ session::global_set('js',FALSE);
+} elseif(isset($_GET['js'])) {
+ session::global_set('js',TRUE);
+}
+
+
+$lang = session::global_get('lang');
/* Append .UTF-8 to language string if necessary */
if(!preg_match("/utf(-)8$/i",$lang)){
$lang .= ".UTF-8";
@@ -130,7 +131,7 @@ $focus.= 'next_msg_dialog();';
$focus.= '';
/* 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());
@@ -142,8 +143,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: