Reverted add function.

[gosa.git] / gosa-core / html / helpviewer.php

diff --git a/gosa-core/html/helpviewer.php b/gosa-core/html/helpviewer.php
index 214507005bad8aeaa4286ebbfe3afe1bbcb3e79d..b09ea4cd46092222915b9e889d014dc8b9fe6a33 100644 (file)
--- a/gosa-core/html/helpviewer.php
+++ b/gosa-core/html/helpviewer.php
@@ -142,7 +142,8 @@ if(session::is_set('current_class_for_help')){
 
 }elseif(isset($_GET['plug'])){
   /* This displays helpfiles depending on the current $_GET[plug] */
-  $tmp                          = new pluglist(session::get('config'),get_userinfo());
+  $ui= get_userinfo();
+  $tmp                          = new pluglist(session::get('config'), $ui);
   $path                         = $tmp->get_path($_GET['plug']);
   $helpobject['currentplug']    = $path;
   $helpobject['file']           = "index.html";
@@ -156,7 +157,7 @@ if(isset($_GET['pg'])){
  
   if(preg_match("/\//",$_GET['pg'])){
     $arr = split("\/",$_GET['pg']);
-    $helpobject['currentplug'] = "../doc/guide/user/".$helpobject['lang']."/html/".$arr[0];
+    $helpobject['currentplug'] = "../doc/core/".$helpobject['lang']."/html/".$arr[0];
     $helpdir = $helpobject['currentplug'];
     $helpobject['file']= $arr[1];
   }else{
@@ -170,7 +171,7 @@ if(isset($_GET['pg'])){
       $helpobject['file'] = "index.html";
     }
     /* Create new helpdir (The path where the requested page is located)*/
-    $helpdir = "../doc/guide/user/".$helpobject['lang']."/html/".preg_replace("/^.*\//i","",$helpobject['currentplug']);
+    $helpdir = "../doc/core/".$helpobject['lang']."/html/".preg_replace("/^.*\//i","",$helpobject['currentplug']);
 
     /* If helpdir is empty, force index */
     if(empty($helpobject['currentplug'])){
@@ -225,7 +226,7 @@ if($helpobject['file'] == "index.html"){
 
 /* If there is no helpdir or file defined, display the index */
 if(isset($_POST['search'])){
-  $helpdir = "../doc/guide/user/".$helpobject['lang']."/html/";
+  $helpdir = "../doc/core/".$helpobject['lang']."/html/";
   /* read all available directories */
   $index = readfiles($helpdir,$prefix,$suffix,false,false);
   $smarty->assign("help_contents",((searchlist($index,search($index,$_POST['search_string']),10))));