X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Ffunctions_helpviewer.inc;h=13a528d7d7e7df9ef51f8f2ce2e201a49c1d7a48;hb=62c2547a71af33f8815bf3627822599c95153527;hp=2f2e9c8142dee217999ba466d97b517eb78bfe25;hpb=1e8f2011f6156e8d446113adcfa37f311cba1f6e;p=gosa.git
diff --git a/gosa-core/include/functions_helpviewer.inc b/gosa-core/include/functions_helpviewer.inc
index 2f2e9c814..13a528d7d 100644
--- a/gosa-core/include/functions_helpviewer.inc
+++ b/gosa-core/include/functions_helpviewer.inc
@@ -1,21 +1,23 @@
$attrs){
+ foreach($helpobject['helpconf'] as $id => $attrs){
$path = $test -> get_path($id);
$exists = true;
- $helpdir = "../doc/guide/user/".$helpobject['lang']."/html/".preg_replace("/^.*\//i","",$path)."/";
+ $helpdir = "../doc/core/".$helpobject['lang']."/html/".preg_replace("/^.*\//i","",$path)."/";
if(!is_dir($helpdir)){
$exists = false;
}
@@ -254,8 +258,7 @@ function remove_unwanted_tags($str,$replacements)
function linkwrapper($str,$link)
{
$str = preg_replace("/HREF=\"http/i","target=\"_blank\" href=\"http",$str);
- $str = preg_replace("/HREF=\"/","href=\"".$link."?pg=",$str);
- $str=str_replace("HREF=\"","href=\"".$link."?pg=",$str);
+ $str = str_replace("HREF=\"","href=\"".$link."?pg=",$str);
return($str);
}
@@ -271,8 +274,8 @@ function search($arr,$word)
$tryword = ""; // Temporary searchword handling
$result['global']['maxhit'] = 0;
session::un_set('lastresults');
- unset($_SESSION['parsed_search_keyword']);
- $_SESSION['parsed_search_keyword']="";
+ session::un_set('parsed_search_keyword');
+ session::set('parsed_search_keyword',"");
error_reporting(E_ALL | E_STRICT);
@@ -289,7 +292,7 @@ function search($arr,$word)
/* Filter words smaler than 3 chars */
if(strlen($tryword)>=$minwordlength) {
- $_SESSION['parsed_search_keyword'].=$tryword." ";
+ session::set('parsed_search_keyword', session::get('parsed_search_keyword').$tryword." ");
$useablewords[]=$tryword;
}
}
@@ -341,7 +344,7 @@ function search($arr,$word)
}
/* Save result in Session, so we can mark words later, or go back to search, without searching again*/
- $_SESSION['lastresults'] = $result;
+ session::set('lastresults',$result);
return($result);
}
@@ -384,7 +387,7 @@ function searchlist($arr,$res,$maxresults)
$ret.= "
".sprintf(_("%s results for your search with the keyword %s"),
"".count($topten)."",
- "".$_SESSION['parsed_search_keyword']."");
+ "".session::get('parsed_search_keyword')."");
$ret.="
";
return($ret);