X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Fhelpviewer.php;h=99710fad4ce7b2a145ec65fcb625160c95976323;hb=88dabea136b599a537f8bcfa4b90ab479b23d6b9;hp=214507005bad8aeaa4286ebbfe3afe1bbcb3e79d;hpb=3e396edcce2b51b1bf7c44a179252d1cb93613a2;p=gosa.git
diff --git a/gosa-core/html/helpviewer.php b/gosa-core/html/helpviewer.php
index 214507005..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","
"._("There is no helpfile specified for this class"))."
";
+ $smarty->assign("iePngWorkaround", $config->get_cfg_value("iePngWorkaround","false" ) == "true");
$header= "".$smarty->fetch(get_template_path('headers.tpl'));
$display= ( $header.$smarty->fetch(get_template_path('help.tpl')));
echo $display;
- session::un_set('current_class_for_help');
+ session::global_un_set('current_class_for_help');
exit();
}
/* Save filename */
- $helpobject['file']= $str[(session::get('current_class_for_help'))]['FILE'];
+ $helpobject['file']= $str[(session::global_get('current_class_for_help'))]['FILE'];
/* Save path to the file */
$helpobject['currentplug'] = $helpdir;
/* Avoid displaying the same help every time */
if(isset($_GET['pg'])){
- session::un_set('current_class_for_help');
+ session::global_un_set('current_class_for_help');
}
}elseif(isset($_GET['plug'])){
/* This displays helpfiles depending on the current $_GET[plug] */
- $tmp = new pluglist(session::get('config'),get_userinfo());
+ $ui= get_userinfo();
+ $tmp = new pluglist($config, $ui);
$path = $tmp->get_path($_GET['plug']);
$helpobject['currentplug'] = $path;
$helpobject['file'] = "index.html";
@@ -156,7 +152,7 @@ if(isset($_GET['pg'])){
if(preg_match("/\//",$_GET['pg'])){
$arr = split("\/",$_GET['pg']);
- $helpobject['currentplug'] = "../doc/guide/user/".$helpobject['lang']."/html/".$arr[0];
+ $helpobject['currentplug'] = "../doc/core/".$helpobject['lang']."/html/".$arr[0];
$helpdir = $helpobject['currentplug'];
$helpobject['file']= $arr[1];
}else{
@@ -170,7 +166,7 @@ if(isset($_GET['pg'])){
$helpobject['file'] = "index.html";
}
/* Create new helpdir (The path where the requested page is located)*/
- $helpdir = "../doc/guide/user/".$helpobject['lang']."/html/".preg_replace("/^.*\//i","",$helpobject['currentplug']);
+ $helpdir = "../doc/core/".$helpobject['lang']."/html/".preg_replace("/^.*\//i","",$helpobject['currentplug']);
/* If helpdir is empty, force index */
if(empty($helpobject['currentplug'])){
@@ -181,7 +177,7 @@ if(isset($_GET['pg'])){
$helpdir.="/";
/* Save current settings */
-session::set('helpobject',$helpobject);
+session::global_set('helpobject',$helpobject);
/*
* Display management
@@ -225,7 +221,7 @@ if($helpobject['file'] == "index.html"){
/* If there is no helpdir or file defined, display the index */
if(isset($_POST['search'])){
- $helpdir = "../doc/guide/user/".$helpobject['lang']."/html/";
+ $helpdir = "../doc/core/".$helpobject['lang']."/html/";
/* read all available directories */
$index = readfiles($helpdir,$prefix,$suffix,false,false);
$smarty->assign("help_contents",((searchlist($index,search($index,$_POST['search_string']),10))));
@@ -249,7 +245,7 @@ if(isset($_POST['search'])){
* parse it, rework links images and so on */
$index = readfiles($helpdir,$prefix,$suffix,false,$helpobject['file']);
- $lastresults = session::get('lastresults');
+ $lastresults = session::global_get('lastresults');
/* if this page is result from a search, mark the search strings */
if(isset($_GET['mark'])){