X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=html%2Fhelpviewer.php;h=4cbc459abf94bd630ae888d5c414469b832aef5e;hb=4b0ae24d1609910eaaa03f2b5cd2fc0057c5f020;hp=0f0c168056de74dfed575d2165427495deae466c;hpb=36a75b7abebc7a1c914a32d754f6891597b27fc1;p=gosa.git
diff --git a/html/helpviewer.php b/html/helpviewer.php
index 0f0c16805..4cbc459ab 100644
--- a/html/helpviewer.php
+++ b/html/helpviewer.php
@@ -23,13 +23,17 @@
@require_once ("functions.inc");
@require_once ("functions_helpviewer.inc");
-error_reporting(0);
+error_reporting(E_ALL | E_STRICT);
+restore_error_handler();
header("Content-type: text/html; charset=UTF-8");
+
session_start();
+$ui= $_SESSION["ui"];
+$config= $_SESSION['config'];
/* If no config object is found in the session, abort help */
if (!isset($_SESSION['config'])){
- gosa_log ("main.php called without session");
+ new log("security","all/all","",array(),"Help viewer called without session") ;
header ("Location: index.php");
exit;
}
@@ -42,6 +46,7 @@ if ($config->data['MAIN']['LANG'] == ""){
}
$lang.=".UTF-8";
+
putenv("LANGUAGE=");
putenv("LANG=$lang");
setlocale(LC_ALL, $lang);
@@ -59,6 +64,7 @@ if (isset ($config->data['MAIN']['COMPILE'])){
} else {
$smarty->compile_dir= '/var/spool/gosa/';
}
+$smarty->assign("title", "GOsa - "._("Help browser"));
/* HELP management starts here ...
*/
@@ -67,14 +73,13 @@ if (isset ($config->data['MAIN']['COMPILE'])){
if(isset($_SESSION['helpobject'])){
$helpobject = $_SESSION['helpobject'];
}else{
- $helpobject['lang'] = "en";
+ $helpobject['lang'] = $lang;
$helpobject['helpconf'] = array();
$helpobject['currentplug'] = "";
$helpobject['file'] = "index.html";
$helpobject['helpconf'] = $_SESSION['plist']->gen_headlines();
}
-$lang = get_browser_language();
$lang = $lang[0].$lang[1];
$helpobject['lang'] = $lang;
@@ -90,7 +95,7 @@ $backward =$defaultpage;
$index =$defaultpage;
$forward ="node1.html";
-
+$helpdir ="";
/* Every class which is called within a tab, stores its name in the Session.
* If $_SESSION['current_class_for_help'] isset,
* get the helpfile specified in the xml file and display it.
@@ -105,14 +110,14 @@ if(isset($_SESSION['current_class_for_help'])){
$str = $xml->parse();
/* __LANG__ is used as placeholder for the used language*/
- $helpdir= preg_replace("/__LANG__/i",$lang,$str[($_SESSION['current_class_for_help'])]['PATH']);
+ $helpdir= @preg_replace("/__LANG__/i",$lang,$str[($_SESSION['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","