diff --git a/gosa-core/include/functions_helpviewer.inc b/gosa-core/include/functions_helpviewer.inc
index 1339332ac34e5591be194bd173abd7789edcb111..947489171cfa35dc3889781058b96a1d6ddb2d83 100644 (file)
<?php
/*
<?php
/*
- This code is part of GOsa (https://gosa.gonicus.de)
- Copyright (C) 2005, Fabian Hickert
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id$$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/* Simple class to parse the xml help file */
*/
/* Simple class to parse the xml help file */
{
global $helpobject;
$str = "";
{
global $helpobject;
$str = "";
- $test = new pluglist($_SESSION['config'],get_userinfo());
+ $helpobject = session::get('helpobject');
+ $ui= get_userinfo();
+ $test = new pluglist(session::get('config'), $ui);
$current_hl = "";
$current_hl = "";
- foreach($_SESSION['helpobject']['helpconf'] as $id => $attrs){
+ foreach($helpobject['helpconf'] as $id => $attrs){
$path = $test -> get_path($id);
$exists = true;
$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;
}
if(!is_dir($helpdir)){
$exists = false;
}
$tryword = ""; // Temporary searchword handling
$result['global']['maxhit'] = 0;
session::un_set('lastresults');
$tryword = ""; // Temporary searchword handling
$result['global']['maxhit'] = 0;
session::un_set('lastresults');
- unset($_SESSION['parsed_search_keyword']);
+ session::un_set('parsed_search_keyword');
session::set('parsed_search_keyword',"");
error_reporting(E_ALL | E_STRICT);
session::set('parsed_search_keyword',"");
error_reporting(E_ALL | E_STRICT);
/* Filter words smaler than 3 chars */
if(strlen($tryword)>=$minwordlength) {
/* 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;
}
}
$useablewords[]=$tryword;
}
}
$ret.= "<br>
".sprintf(_("%s results for your search with the keyword %s"),
"<b>".count($topten)."</b>",
$ret.= "<br>
".sprintf(_("%s results for your search with the keyword %s"),
"<b>".count($topten)."</b>",
- "<b>".$_SESSION['parsed_search_keyword']."</b>");
+ "<b>".session::get('parsed_search_keyword')."</b>");
$ret.="<br>
<br>";
return($ret);
$ret.="<br>
<br>";
return($ret);