Phonequeues won't detect themselfes as used phonenumber

[gosa.git] / html / helpviewer.php
diff --git a/html/helpviewer.php b/html/helpviewer.php

index 83c3a0240472cf19b3865527f44764e198c5d933..308500d0aa1da9fe7d56d1980ffc71a401a197a9 100644 (file)
--- 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 "<b>"._("Help is not available if you are not logged in.")."</b>";
-  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 "<b>"._("Help is not available if you are not logged in.")."</b>";
+  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                 = "<a href=\"?pg=%s\"  class=\"maintitlebar\">
                                    <img src='images/forward.png' align=\"middle\" alt=\""._("next")."\" border=\"0\">
                                   </a>";
  
-$error_collector= "";
-set_error_handler('gosaRaiseError');
-
  /* Define which tags musst be delete, header, navigation, banner */
  $replacements=array();
  $replacements['from']=array("@<!DOC.*<BODY >@si",
-    "@<DIV[^>]*?>.*?DIV>@si",
+    "/border=\".*\"/i",
      "'<code.*code>'",
+//    "/alt=\".*\"/i",
      "/<HR>/",
      "@<ADDRESS[^>]*?>.*?ADDRESS>@si",
      "@<\/BODY[^>]*?>.*?HTML>@si",
      "'<TABLE.*>'",
      "/src.*icons/i",
-    "/<H1 ALIGN=\"CENTER\">/");
+    "/src=\"/i",
+    "/<H1 ALIGN=\"CENTER\">/",
+ /* picture replacements */
+ //  "",
+    );
+
+
  $replacements['to']=array("",
+    " border=\"0\" ",
      "",
+  //  "",
      "",
      "",
      "",
-    "",
-    "<table border=1 cellspacing=0 bgcolor=\"#E0E0E0\" width=\"95%\" align=\"center\" cellpadding=\"3\">",
-    "src=\"images",
-    "<H1>");
+    "<table border=1 cellspacing=0 bgcolor=\"#E0E0E0\" width=\"95%\" align=\"center\" cellpadding=\"3\" summary=\"\">",
+    "src=\"",
+    "src=\"images/",
+    "<H1>",
+ /* 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);