From 81c8bd058ea757f0cf94674948cc831c52e58730 Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 10 Jun 2005 13:06:02 +0000 Subject: [PATCH] images shown correct git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@673 594d385d-05f5-0310-b6e9-bd551577e9d8 --- html/helpviewer.php | 24 +++++++++++++++++++----- include/functions_helpviewer.inc | 4 ++-- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/html/helpviewer.php b/html/helpviewer.php index 83c3a0240..bde8ffb1c 100644 --- a/html/helpviewer.php +++ b/html/helpviewer.php @@ -93,23 +93,37 @@ set_error_handler('gosaRaiseError'); /* Define which tags musst be delete, header, navigation, banner */ $replacements=array(); $replacements['from']=array("@@si", + "/border=\".*\"/i", "@]*?>.*?DIV>@si", "''", +// "/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 +250,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); diff --git a/include/functions_helpviewer.inc b/include/functions_helpviewer.inc index 9d699c589..cc6abafc0 100644 --- a/include/functions_helpviewer.inc +++ b/include/functions_helpviewer.inc @@ -63,7 +63,7 @@ function readfiles($basedir,$prefix,$suffix,$onlyIndex,$singlepage=false) / Readfile conent too ? / if(!$onlyIndex){ - $str[$file]['content']= remove_unwanted_tags(linkwrapper(getcontents($basedir.$file),""),$replacements); + $str[$file]['content'] = remove_unwanted_tags(linkwrapper(getcontents($basedir.$file),""),$replacements); $str[$file]['headline'] = getheader_from_content($str[$file]['content']); } @@ -86,7 +86,7 @@ function readfiles($basedir,$prefix,$suffix,$onlyIndex,$singlepage=false) / If onlyIndex == true skip reading content */ if(!$onlyIndex){ - $str[$file]['content']= remove_unwanted_tags(linkwrapper(getcontents($basedir.$file),""),$replacements); + $str[$file]['content'] = remove_unwanted_tags(linkwrapper(getcontents($basedir.$file),""),$replacements); $str[$file]['headline'] = getheader_from_content($str[$file]['content']); } -- 2.30.2