X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Ffunctions_helpviewer.inc;h=947489171cfa35dc3889781058b96a1d6ddb2d83;hb=f5a365f5ce54675a7b990f4a6cfa02485f1926cc;hp=ab9b3a1d7c8a87cfe72d586f8cb4854c269e88ac;hpb=894aa86d1d4d57416d43052ea7b781ff680f03c9;p=gosa.git

diff --git a/gosa-core/include/functions_helpviewer.inc b/gosa-core/include/functions_helpviewer.inc
index ab9b3a1d7..947489171 100644
--- a/gosa-core/include/functions_helpviewer.inc
+++ b/gosa-core/include/functions_helpviewer.inc
@@ -1,21 +1,23 @@
 <?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 */
@@ -61,12 +63,14 @@ function genIndex()
 {
   global $helpobject;
   $str = "";
-  $test = new pluglist($_SESSION['config'],NULL);
+  $helpobject = session::get('helpobject');
+  $ui= get_userinfo();
+  $test = new pluglist(session::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;
     }
@@ -270,9 +274,9 @@ function search($arr,$word)
   $useablewords               =array(); // Temporary searchword handling
   $tryword                    = "";     // Temporary searchword handling
   $result['global']['maxhit'] = 0;
-  unset($_SESSION['lastresults']);
-  unset($_SESSION['parsed_search_keyword']);
-  $_SESSION['parsed_search_keyword']="";
+  session::un_set('lastresults');
+  session::un_set('parsed_search_keyword');
+  session::set('parsed_search_keyword',"");
 
   error_reporting(E_ALL | E_STRICT);
 
@@ -289,7 +293,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 +345,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 +388,7 @@ function searchlist($arr,$res,$maxresults)
   $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);