From be982ce632af26deb3f07b88044e495fe3ec9474 Mon Sep 17 00:00:00 2001 From: cajus Date: Fri, 10 Jun 2005 05:26:52 +0000 Subject: [PATCH] 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 --- html/helpviewer.php | 27 +++++++++++++-------------- include/functions.inc | 1 + 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/html/helpviewer.php b/html/helpviewer.php index c37153fa5..14fa4c661 100644 --- 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 = "" ; // Sign words with this -$suf_mark = ""; // 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 = "" ; // Sign words with this +$suf_mark = ""; // 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 983444a31..0a711f722 100644 --- 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$'; -- 2.30.2