X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Fsetup.php;h=0c0056b1d7dc2688283541e05c76a4f47b605871;hb=bf5082df658ccc3f3ff9a22ae00e407e8bcb5a17;hp=d513ec88449c5bc5daec1d80cbc952056f37310b;hpb=61cf7ed149664b7fbab691ecb23777ebdeb8047e;p=gosa.git

diff --git a/gosa-core/html/setup.php b/gosa-core/html/setup.php
index d513ec884..0c0056b1d 100644
--- a/gosa-core/html/setup.php
+++ b/gosa-core/html/setup.php
@@ -1,25 +1,24 @@
 <?php
-
-/* 
- This code is part of GOsa (https://gosa.gonicus.de)
- Copyright (C) 2007 Fabian Hickert
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-
+/*
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id$$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 /* Get standard functions */
 require_once ("../include/php_setup.inc");
@@ -51,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 '<script language="JavaScript" type="text/javascript">';
-  echo '  location = "setup.php?js=true";';
-  echo '</script>';
-
-  session::set('js',FALSE);
-} elseif(isset($_GET['js'])) {
-  session::set('js',TRUE);
-}
-
 /* Attribute initialization, reset errors */
 session::set('errors',"");
 session::set('errorsAlreadyPosted',array());
@@ -81,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('language')){
+  session::global_set('language',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 '<script language="JavaScript" type="text/javascript">';
+  echo '  location = "setup.php?js=true";';
+  echo '</script>';
+
+  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";
@@ -131,7 +131,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 +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: