From f7bd29eeb2f192eaa659b0cb7799506f4c1abf68 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 27 Mar 2008 12:37:21 +0000 Subject: [PATCH] updated helpviewer git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10026 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/html/helpviewer.php | 6 +++--- gosa-core/include/functions_helpviewer.inc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gosa-core/html/helpviewer.php b/gosa-core/html/helpviewer.php index 214507005..0be42bbe6 100644 --- a/gosa-core/html/helpviewer.php +++ b/gosa-core/html/helpviewer.php @@ -156,7 +156,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 +170,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 +225,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)))); diff --git a/gosa-core/include/functions_helpviewer.inc b/gosa-core/include/functions_helpviewer.inc index 0be630163..a44a06d0d 100644 --- a/gosa-core/include/functions_helpviewer.inc +++ b/gosa-core/include/functions_helpviewer.inc @@ -70,7 +70,7 @@ function genIndex() 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; } -- 2.30.2