Added easy to replace constant for help base in functions.inc

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@637 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/html/helpviewer.php b/html/helpviewer.php
index c37153fa5f93cb30dfda4f01628e78dcfded53db..14fa4c661a9df72fd24bf5802046583824c784df 100644 (file)
--- a/html/helpviewer.php
+++ b/html/helpviewer.php
@@ -19,14 +19,14 @@
  */
 
 
-
-
 /* Basic setup, remove eventually registered sessions */
 require_once ("../include/php_setup.inc");
-require_once ("../include/functions.inc");
-require_once ("../include/functions_helpviewer.inc");
+require_once ("functions.inc");
+require_once ("functions_helpviewer.inc");
+
 session_start ();
 error_reporting(E_ALL);
+
 /* Logged in? Simple security check */
 if (!isset($_SESSION['ui'])){
   gosa_log ("Error: helpviewer.php called without session");
@@ -34,7 +34,6 @@ if (!isset($_SESSION['ui'])){
   exit;
 }
 
-
 /* Set template compile directory */
 $config= $_SESSION['config'];
 if (isset ($config->data['MAIN']['COMPILE'])){
@@ -72,15 +71,15 @@ My PART ^^
  */
 
 set_error_handler("myone");
-$helpdir                      = "../doc/guide/admin/en/manual_gosa_en/"; // Folder to use for help files
-$defaultpage                  = "index.html";                            // alternative file, shown on error, or on first call
-$prefix                       = "node";                                  // Prefix of the generated help files 
-$suffix                       = ".html";                                 // Suffix of the generated helpfiles
-$maxresults                   = 10;                                      // max number of results shown in result list
-$minwordlength                = 3;                                       // Word less than 3 chars will be dropped in search
-$allowed_chars_in_searchword  = "'[^a-z0-9 %_-]'i";                      // Remove all chars that would disturb our search like < or > ...
-$pre_mark                     = "<b><u><i>" ;  // Sign words with this
-$suf_mark                     = "</i></u></b>";                   //  and this
+$helpdir                      = HELP_BASEDIR."/en/manual_gosa_en/"; // Folder to use for help files
+$defaultpage                  = "index.html";                       // alternative file, shown on error, or on first call
+$prefix                       = "node";                             // Prefix of the generated help files 
+$suffix                       = ".html";                            // Suffix of the generated helpfiles
+$maxresults                   = 10;                                 // max number of results shown in result list
+$minwordlength                = 3;                                  // Word less than 3 chars will be dropped in search
+$allowed_chars_in_searchword  = "'[^a-z0-9 %_-]'i";                 // Remove all chars that would disturb our search like < or > ...
+$pre_mark                     = "<b><u><i>" ;                       // Sign words with this
+$suf_mark                     = "</i></u></b>";                     //  and this
 
 // Only for testing delete this if everything works fine
 function myone($par1,$par2,$par3,$par3)

diff --git a/include/functions.inc b/include/functions.inc
index 983444a31d2413eb6a8869d5d12b93576e442dee..0a711f72209dbeb2453c1b4a11cbebccafdb9272 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -21,6 +21,7 @@
 /* Configuration file location */
 define ("CONFIG_DIR", "/etc/gosa");
 define ("CONFIG_TEMPLATE_DIR", "../contrib/");
+define ("HELP_BASEDIR", "../doc/gosa/guide/admin/");
 
 /* Define globals for revision comparing */
 $svn_path = '$HeadURL$';