X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Ffunctions_helpviewer.inc;h=13a528d7d7e7df9ef51f8f2ce2e201a49c1d7a48;hb=37a863af6c001e5760070adb1d74dc77e4df61f9;hp=0be6301638731a2c7fb7c8d187e8d17abbcaa2a6;hpb=6b08ffcaafe0d9755aca07c6b9f624c3775c2dd0;p=gosa.git diff --git a/gosa-core/include/functions_helpviewer.inc b/gosa-core/include/functions_helpviewer.inc index 0be630163..13a528d7d 100644 --- a/gosa-core/include/functions_helpviewer.inc +++ b/gosa-core/include/functions_helpviewer.inc @@ -63,14 +63,14 @@ function genIndex() { global $helpobject; $str = ""; - $config = session::get('config'); - $helpobject = session::get('helpobject'); - $test = new pluglist($config,get_userinfo()); + $helpobject = session::global_get('helpobject'); + $ui= get_userinfo(); + $test = new pluglist(session::global_get('config'), $ui); $current_hl = ""; 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; } @@ -258,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); }