Updated users

[gosa.git] / gosa-core / include / functions_helpviewer.inc

diff --git a/gosa-core/include/functions_helpviewer.inc b/gosa-core/include/functions_helpviewer.inc
index ab9b3a1d7c8a87cfe72d586f8cb4854c269e88ac..b363e305e3c75d680422d306d4b0fefd3e736b2c 100644 (file)
--- a/gosa-core/include/functions_helpviewer.inc
+++ b/gosa-core/include/functions_helpviewer.inc
@@ -61,9 +61,11 @@ function genIndex()
 {
   global $helpobject;
   $str = "";
-  $test = new pluglist($_SESSION['config'],NULL);
+  $config = session::get('config');
+  $helpobject = session::get('helpobject');
+  $test = new pluglist($config,get_userinfo());
   $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)."/";
@@ -270,9 +272,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 +291,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 +343,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 +386,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);