X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=html%2Fhelpviewer.php;h=308500d0aa1da9fe7d56d1980ffc71a401a197a9;hb=af68c0eb4e77ea7e8f783b08fa1396a8fd8463b7;hp=83c3a0240472cf19b3865527f44764e198c5d933;hpb=a05cf3d7a2b3b9e40f4a816b76f4dc287712c82f;p=gosa.git
diff --git a/html/helpviewer.php b/html/helpviewer.php
index 83c3a0240..308500d0a 100644
--- a/html/helpviewer.php
+++ b/html/helpviewer.php
@@ -23,25 +23,11 @@
require_once ("../include/php_setup.inc");
require_once ("functions.inc");
require_once ("functions_helpviewer.inc");
+header("Content-type: text/html; charset=UTF-8");
session_start ();
error_reporting(E_ALL);
-/* Logged in? Simple security check */
-if (!isset($_SESSION['ui'])){
- gosa_log ("Error: helpviewer.php called without session");
- echo ""._("Help is not available if you are not logged in.")."";
- exit;
-}
-
-/* Set template compile directory */
-$config= $_SESSION['config'];
-if (isset ($config->data['MAIN']['COMPILE'])){
- $smarty->compile_dir= $config->data['MAIN']['COMPILE'];
-} else {
- $smarty->compile_dir= '/var/spool/gosa/';
-}
-
/* Language setup */
if ($config->data['MAIN']['LANG'] == ""){
$lang= get_browser_language();
@@ -61,6 +47,22 @@ bindtextdomain($domain, "$BASE_DIR/locale");
textdomain($domain);
@DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $lang, "Setting language to");
+
+/* Logged in? Simple security check */
+if (!isset($_SESSION['ui'])){
+ gosa_log ("Error: helpviewer.php called without session");
+ echo ""._("Help is not available if you are not logged in.")."";
+ exit;
+}
+
+/* Set template compile directory */
+$config= $_SESSION['config'];
+if (isset ($config->data['MAIN']['COMPILE'])){
+ $smarty->compile_dir= $config->data['MAIN']['COMPILE'];
+} else {
+ $smarty->compile_dir= '/var/spool/gosa/';
+}
+
/* Get plugin list */
$plist= $_SESSION['plist'];
@@ -87,29 +89,38 @@ $forwardlink = "
";
-$error_collector= "";
-set_error_handler('gosaRaiseError');
-
/* Define which tags musst be delete, header, navigation, banner */
$replacements=array();
$replacements['from']=array("@@si",
- "@]*?>.*?DIV>@si",
+ "/border=\".*\"/i",
"''",
+// "/alt=\".*\"/i",
"/
/",
"@]*?>.*?ADDRESS>@si",
"@<\/BODY[^>]*?>.*?HTML>@si",
"''",
"/src.*icons/i",
- "//");
+ "/src=\"/i",
+ "//",
+ /* picture replacements */
+ // "",
+ );
+
+
$replacements['to']=array("",
+ " border=\"0\" ",
"",
+ // "",
"",
"",
"",
- "",
- "
",
- "src=\"images",
- "");
+ "
",
+ "src=\"",
+ "src=\"images/",
+ "",
+ /* picture replacements */
+// "",
+ );
/* Default pages */
@@ -236,9 +247,9 @@ if(!file_exists(HELP_BASEDIR."/en/manual_gosa_en/")){
if(isset($_GET['mark'])){
$marks = ($_SESSION['lastresults']) ;
$help_contents = markup_page($help_contents[$page]['content'],$marks[$page]);
- $help_contents=remove_unwanted_tags($help_contents,$replacements);
+ $help_contents=$help_contents;
}else{
- $help_contents=remove_unwanted_tags($help_contents[$page]['content'],$replacements);
+ $help_contents=$help_contents[$page]['content'];
}
$smarty->assign("help_contents",$help_contents);