From a216b291a342270adad4642a0e488bcf2af16851 Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Sun, 15 Jan 2012 15:05:13 +0100
Subject: [PATCH] Fixes: #522 fixed path in setup for php
---
include/php_setup.inc | 4 ++--
include/variables.inc | 6 ++++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/include/php_setup.inc b/include/php_setup.inc
index be6096ddd..e6218174a 100644
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -73,7 +73,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
if(function_exists("prepare4mailbody")){
$version= "unknown";
if(function_exists("get_gosa_version")){
- $version= get_gosa_version();
+ $version= get_gosa_version();
}
$error_collector_mailto .=prepare4mailbody(
"Oups. Seems like you've catched some kind of bug inside FusionDirectory/PHP. You may want to help ".
@@ -285,7 +285,7 @@ ini_set("register_globals",0);
ini_set("track_vars",1);
ini_set("display_errors",1);
ini_set("report_memleaks",1);
-ini_set("include_path",".:$BASE_DIR/include:$BASE_DIR/include/utils/excel:/usr/share/php");
+ini_set("include_path",".:$BASE_DIR/include:$BASE_DIR/EXCEL:PHP_DIR");
/* Do smarty setup */
diff --git a/include/variables.inc b/include/variables.inc
index d8981e3b0..69b752843 100644
--- a/include/variables.inc
+++ b/include/variables.inc
@@ -61,6 +61,12 @@ define ("FAI_LOG_DIR", "/var/cache/fusiondirectory/fai/");
/* Directory containing the vacation files */
define ("VACATION_DIR", "/var/cache/fusiondirectory/vacation/");
+/* php library path */
+define ("PHP_DIR", "/usr/share/php");
+
+/* excel library path */
+define ("EXCEL", "/include/utils/excel");
+
/* fpdf library path */
define("FPDF","/usr/share/php/fpdf/fpdf.php");
--
GitLab