Updated function.inc

-Allow setting the configuration file in the apache configuration file.

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

diff --git a/include/functions.inc b/include/functions.inc
index cebbb4a3f9c3e82321775d45d97a90c015869d42..6b55a0cf94ef7b5a40cf318fe84a1194aa8f8f0a 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -18,9 +18,24 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* Configuration file location */
-define ("CONFIG_DIR", "/etc/gosa");
-define ("CONFIG_FILE", "gosa.conf");
+/* Allow setting the config patih in the apache configuration
+   e.g.  SetEnv CONFIG_FILE /etc/path
+ */
+if(!isset($_SERVER['CONFIG_DIR'])){
+  define ("CONFIG_DIR", "/etc/gosa");
+}else{
+  define ("CONFIG_DIR",$_SERVER['CONFIG_DIR']);
+}
+
+/* Allow setting the config file in the apache configuration
+    e.g.  SetEnv CONFIG_FILE gosa.conf.2.5
+ */
+if(!isset($_SERVER['CONFIG_FILE'])){
+  define ("CONFIG_FILE", "gosa.conf");
+}else{
+  define ("CONFIG_FILE",$_SERVER['CONFIG_FILE']);
+}
+
 define ("CONFIG_TEMPLATE_DIR", "../contrib/");
 define ("HELP_BASEDIR", "/var/www/doc/");