X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Ffunctions_helpviewer.inc;h=437ffe12e1a649bd63bccc83c458e343497d65be;hb=b9fc1972cf2270252fc2a9940feab21c93372e94;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..437ffe12e 100644
--- a/gosa-core/include/functions_helpviewer.inc
+++ b/gosa-core/include/functions_helpviewer.inc
@@ -1,21 +1,23 @@
parser, chop($xmldata))){
- print(sprintf(_("XML error in guide.xml: %s at line %d"),
- xml_error_string(xml_get_error_code($this->parser)),
- xml_get_current_line_number($this->parser)));
+ print(sprintf(_("XML error in guide.xml: %s at line %s"),
+ bold(xml_error_string(xml_get_error_code($this->parser))),
+ bold(xml_get_current_line_number($this->parser))));
exit;
}
return($this->entries);
@@ -61,12 +63,14 @@ function genIndex()
{
global $helpobject;
$str = "";
- $test = new pluglist($_SESSION['config'],get_userinfo());
+ $helpobject = session::global_get('helpobject');
+ $ui= get_userinfo();
+ $test = new pluglist(session::global_get('config'), $ui);
$current_hl = "";
- foreach($_SESSION['helpobject']['helpconf'] as $id => $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);
@@ -281,7 +284,7 @@ function search($arr,$word)
/* Filter all unusable chars */
$word = preg_replace($allowed_chars_in_searchword,"",$word);
- $words = split(" ",str_replace("+"," ",$word));
+ $words = explode(" ",str_replace("+"," ",$word));
/* Check all wordlengths */
foreach($words as $tryword){
@@ -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);
}
@@ -373,7 +376,7 @@ function searchlist($arr,$res,$maxresults)
/* Foreach */
foreach($topten as $key => $hits) {
- $ks = split("\/",$key);
+ $ks = explode("/",$key);
$k1 = $ks[0];
$k2 = $ks[1];
@@ -383,8 +386,8 @@ function searchlist($arr,$res,$maxresults)
/* appending footer message for resultlist */
$ret.= "
".sprintf(_("%s results for your search with the keyword %s"),
- "".count($topten)."",
- "".$_SESSION['parsed_search_keyword']."");
+ bold(count($topten)),
+ bold(session::get('parsed_search_keyword')));
$ret.="
";
return($ret);
@@ -455,9 +458,7 @@ function createResultEntry($entry,$res,$name,$max)