X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Fhelpviewer.php;h=99710fad4ce7b2a145ec65fcb625160c95976323;hb=88dabea136b599a537f8bcfa4b90ab479b23d6b9;hp=0be42bbe6c461df88b8df59dbba692eba3ee5061;hpb=f7bd29eeb2f192eaa659b0cb7799506f4c1abf68;p=gosa.git
diff --git a/gosa-core/html/helpviewer.php b/gosa-core/html/helpviewer.php
index 0be42bbe6..99710fad4 100644
--- a/gosa-core/html/helpviewer.php
+++ b/gosa-core/html/helpviewer.php
@@ -32,20 +32,19 @@ header("Content-type: text/html; charset=UTF-8");
session::start();
/* If no config object is found in the session, abort help */
-if (!session::is_set('config')){
+if (!session::global_is_set('config')){
new log("security","all/all","",array(),"Help viewer called without session") ;
header ("Location: index.php");
exit;
}
-$ui= session::get('ui');
-$config= session::get('config');
+$ui= session::global_get('ui');
+$config= session::global_get('config');
/* Language setup */
-if ($config->data['MAIN']['LANG'] == ""){
+$lang= $config->get_cfg_value("language");
+if ($lang == ""){
$lang= get_browser_language();
-} else {
- $lang= $config->data['MAIN']['LANG'];
}
$lang.=".UTF-8";
@@ -61,23 +60,18 @@ bindtextdomain($domain, LOCALE_DIR);
textdomain($domain);
@DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $lang, "Setting language to");
-$config= session::get('config');
-if (isset ($config->data['MAIN']['COMPILE'])){
- $smarty->compile_dir= $config->data['MAIN']['COMPILE'];
-} else {
- $smarty->compile_dir= '/var/spool/gosa/';
-}
+$smarty->compile_dir= $config->get_cfg_value("compile", "/var/spool/gosa/");
$smarty->assign("title", "GOsa - "._("Help browser"));
/* HELP management starts here ...
*/
/* Generate helpobject */
-if(session::is_set('helpobject')){
- $helpobject = session::get('helpobject');
+if(session::global_is_set('helpobject')){
+ $helpobject = session::global_get('helpobject');
}else{
- $plist = session::get('plist');
+ $plist = session::global_get('plist');
$helpobject['lang'] = $lang;
$helpobject['helpconf'] = array();
@@ -103,11 +97,11 @@ $forward ="node1.html";
$helpdir ="";
/* Every class which is called within a tab, stores its name in the Session.
- * If session::is_set('current_class_for_help') is true,
+ * If session::global_is_set('current_class_for_help') is true,
* get the helpfile specified in the xml file and display it.
* Unset this Session entry, to avoid displaying it again.
*/
-if(session::is_set('current_class_for_help')){
+if(session::global_is_set('current_class_for_help')){
/* Create new XML parser with the path to the Xml file */
$xml = new parseXml("../doc/guide.xml");
@@ -116,33 +110,35 @@ if(session::is_set('current_class_for_help')){
$str = $xml->parse();
/* __LANG__ is used as placeholder for the used language*/
- $helpdir= @preg_replace("/__LANG__/i",$lang,$str[(session::get('current_class_for_help'))]['PATH']);
+ $helpdir= @preg_replace("/__LANG__/i",$lang,$str[(session::global_get('current_class_for_help'))]['PATH']);
/* If there is no entry in the xml file for this class, display an error message */
if($helpdir == ""){
$smarty->assign("help_contents","