lib/base.local.php -> config/horde.local.php

diff --git a/ansel/lib/base.load.php b/ansel/lib/base.load.php
index f38bf4c..a91f176 100644 (file)
--- a/ansel/lib/base.load.php
+++ b/ansel/lib/base.load.php
@@ -7,22 +7,19 @@
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
  *
- * @package Turba
+ * @package Ansel
  */
 
-$curr_dir = dirname(__FILE__);
+if (!defined('ANSEL_BASE')) {
+    define('ANSEL_BASE', dirname(__FILE__) . '/..');
+}
 
 if (!defined('HORDE_BASE')) {
-    /* Temporary fix - if horde does not live directly under the app
-     * directory, the HORDE_BASE constant should be defined in
-     * lib/base.local.php. */
-    if (file_exists($curr_dir . '/base.local.php')) {
-        include $curr_dir . '/base.local.php';
+    /* If horde does not live directly under the app directory, the HORDE_BASE
+     * constant should be defined in config/horde.local.php. */
+    if (file_exists(ANSEL_BASE . '/config/horde.local.php')) {
+        include ANSEL_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', $curr_dir . '/../..');
+        define('HORDE_BASE', ANSEL_BASE . '/..');
     }
 }
-
-if (!defined('ANSEL_BASE')) {
-    define('ANSEL_BASE', $curr_dir . '/..');
-}

diff --git a/chora/lib/base.load.php b/chora/lib/base.load.php
index a763fd5..ddc9a88 100644 (file)
--- a/chora/lib/base.load.php
+++ b/chora/lib/base.load.php
@@ -10,19 +10,16 @@
  * @package Chora
  */
 
-$curr_dir = dirname(__FILE__);
+if (!defined('CHORA_BASE')) {
+    define('CHORA_BASE', dirname(__FILE__) . '/..');
+}
 
 if (!defined('HORDE_BASE')) {
-    /* Temporary fix - if horde does not live directly under the app
-     * directory, the HORDE_BASE constant should be defined in
-     * lib/base.local.php. */
-    if (file_exists($curr_dir . '/base.local.php')) {
-        include $curr_dir . '/base.local.php';
+    /* If horde does not live directly under the app directory, the HORDE_BASE
+     * constant should be defined in config/horde.local.php. */
+    if (file_exists(CHORA_BASE . '/config/horde.local.php')) {
+        include CHORA_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', $curr_dir . '/../..');
+        define('HORDE_BASE', CHORA_BASE . '/..');
     }
 }
-
-if (!defined('CHORA_BASE')) {
-    define('CHORA_BASE', $curr_dir . '/..');
-}

diff --git a/gollem/lib/base.load.php b/gollem/lib/base.load.php
index 6d8432b..d6fcbe5 100644 (file)
--- a/gollem/lib/base.load.php
+++ b/gollem/lib/base.load.php
@@ -10,19 +10,16 @@
  * @package Gollem
  */
 
-$curr_dir = dirname(__FILE__);
+if (!defined('GOLLEM_BASE')) {
+    define('GOLLEM_BASE', dirname(__FILE__) . '/..');
+}
 
 if (!defined('HORDE_BASE')) {
-    /* Temporary fix - if horde does not live directly under the app
-     * directory, the HORDE_BASE constant should be defined in
-     * lib/base.local.php. */
-    if (file_exists($curr_dir . '/base.local.php')) {
-        include $curr_dir . '/base.local.php';
+    /* If horde does not live directly under the app directory, the HORDE_BASE
+     * constant should be defined in lib/horde.local.php. */
+    if (file_exists(GOLLEM_BASE . '/config/horde.local.php')) {
+        include GOLLEM_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', $curr_dir . '/../..');
+        define('HORDE_BASE', GOLLEM_BASE . '/..');
     }
 }
-
-if (!defined('GOLLEM_BASE')) {
-    define('GOLLEM_BASE', $curr_dir . '/..');
-}

diff --git a/imp/lib/Application.php b/imp/lib/Application.php
index 54dd55c..06c8ad4 100644 (file)
--- a/imp/lib/Application.php
+++ b/imp/lib/Application.php
@@ -1,10 +1,8 @@
 <?php
 
 /* Determine the base directories. */
-$curr_dir = dirname(__FILE__);
-
 if (!defined('IMP_BASE')) {
-    define('IMP_BASE', $curr_dir . '/..');
+    define('IMP_BASE', dirname(__FILE__) . '/..');
 }
 
 if (!defined('HORDE_BASE')) {
@@ -13,7 +11,7 @@ if (!defined('HORDE_BASE')) {
     if (file_exists(IMP_BASE . '/config/horde.local.php')) {
         include IMP_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', $curr_dir . '/../..');
+        define('HORDE_BASE', IMP_BASE . '/..');
     }
 }
 

diff --git a/ingo/lib/base.load.php b/ingo/lib/base.load.php
index 6c330a1..c214fbf 100644 (file)
--- a/ingo/lib/base.load.php
+++ b/ingo/lib/base.load.php
@@ -10,19 +10,16 @@
  * @package Ingo
  */
 
-$curr_dir = dirname(__FILE__);
+if (!defined('INGO_BASE')) {
+    define('INGO_BASE', dirname(__FILE__) . '/..');
+}
 
 if (!defined('HORDE_BASE')) {
-    /* Temporary fix - if horde does not live directly under the app
-     * directory, the HORDE_BASE constant should be defined in
-     * lib/base.local.php. */
-    if (file_exists($curr_dir . '/base.local.php')) {
-        include $curr_dir . '/base.local.php';
+    /* If horde does not live directly under the app directory, the HORDE_BASE
+     * constant should be defined in config/horde.local.php. */
+    if (file_exists(INGO_BASE . '/config/horde.local.php')) {
+        include INGO_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', $curr_dir . '/../..');
+        define('HORDE_BASE', INGO_BASE . '/..');
     }
 }
-
-if (!defined('INGO_BASE')) {
-    define('INGO_BASE', $curr_dir . '/..');
-}

diff --git a/jeta/lib/base.load.php b/jeta/lib/base.load.php
index fa3ae22..f1c2f1e 100644 (file)
--- a/jeta/lib/base.load.php
+++ b/jeta/lib/base.load.php
@@ -10,19 +10,16 @@
  * @package Jeta
  */
 
-$curr_dir = dirname(__FILE__);
+if (!defined('JETA_BASE')) {
+    define('JETA_BASE', dirname(__FILE__) . '/..');
+}
 
 if (!defined('HORDE_BASE')) {
-    /* Temporary fix - if horde does not live directly under the app
-     * directory, the HORDE_BASE constant should be defined in
-     * lib/base.local.php. */
-    if (file_exists($curr_dir . '/base.local.php')) {
-        include $curr_dir . '/base.local.php';
+    /* If horde does not live directly under the app directory, the HORDE_BASE
+     * constant should be defined in config/horde.local.php. */
+    if (file_exists(JETA_BASE . '/config/horde.local.php')) {
+        include JETA_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', $curr_dir . '/../..');
+        define('HORDE_BASE', JETA_BASE . '/..');
     }
 }
-
-if (!defined('JETA_BASE')) {
-    define('JETA_BASE', $curr_dir . '/..');
-}

diff --git a/kronolith/lib/base.load.php b/kronolith/lib/base.load.php
index 373081d..1a30cb4 100644 (file)
--- a/kronolith/lib/base.load.php
+++ b/kronolith/lib/base.load.php
@@ -10,19 +10,16 @@
  * @package Kronolith
  */
 
-$curr_dir = dirname(__FILE__);
+if (!defined('KRONOLITH_BASE')) {
+    define('KRONOLITH_BASE', dirname(__FILE__) . '/..');
+}
 
 if (!defined('HORDE_BASE')) {
-    /* Temporary fix - if horde does not live directly under the app
-     * directory, the HORDE_BASE constant should be defined in
-     * lib/base.local.php. */
-    if (file_exists($curr_dir . '/base.local.php')) {
-        include $curr_dir . '/base.local.php';
+    /* If horde does not live directly under the app directory, the HORDE_BASE
+     * constant should be defined in config/horde.local.php. */
+    if (file_exists(KRONOLITH_BASE . '/config/horde.local.php')) {
+        include KRONOLITH_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', $curr_dir . '/../..');
+        define('HORDE_BASE', KRONOLITH_BASE . '/..');
     }
 }
-
-if (!defined('KRONOLITH_BASE')) {
-    define('KRONOLITH_BASE', $curr_dir . '/..');
-}

diff --git a/nag/lib/base.load.php b/nag/lib/base.load.php
index 1023844..1d538e3 100644 (file)
--- a/nag/lib/base.load.php
+++ b/nag/lib/base.load.php
@@ -10,19 +10,16 @@
  * @package Nag
  */
 
-$curr_dir = dirname(__FILE__);
+if (!defined('NAG_BASE')) {
+    define('NAG_BASE', dirname(__FILE__) . '/..');
+}
 
 if (!defined('HORDE_BASE')) {
-    /* Temporary fix - if horde does not live directly under the app
-     * directory, the HORDE_BASE constant should be defined in
-     * lib/base.local.php. */
-    if (file_exists($curr_dir . '/base.local.php')) {
-        include $curr_dir . '/base.local.php';
+    /* If horde does not live directly under the app directory, the HORDE_BASE
+     * constant should be defined in config/horde.local.php. */
+    if (file_exists(NAG_BASE . '/config/horde.local.php')) {
+        include NAG_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', $curr_dir . '/../..');
+        define('HORDE_BASE', NAG_BASE . '/..');
     }
 }
-
-if (!defined('NAG_BASE')) {
-    define('NAG_BASE', $curr_dir . '/..');
-}

diff --git a/skeleton/lib/base.load.php b/skeleton/lib/base.load.php
index f5486a0..9a0b058 100644 (file)
--- a/skeleton/lib/base.load.php
+++ b/skeleton/lib/base.load.php
@@ -10,19 +10,16 @@
  * @package Skeleton
  */
 
-$curr_dir = dirname(__FILE__);
+if (!defined('SKELETON_BASE')) {
+    define('SKELETON_BASE', dirname(__FILE__). '/..');
+}
 
 if (!defined('HORDE_BASE')) {
-    /* Temporary fix - if horde does not live directly under the app
-     * directory, the HORDE_BASE constant should be defined in
-     * lib/base.local.php. */
-    if (file_exists($curr_dir . '/base.local.php')) {
-        include $curr_dir . '/base.local.php';
+    /* If horde does not live directly under the app directory, the HORDE_BASE
+     * constant should be defined in config/horde.local.php. */
+    if (file_exists(SKELETON_BASE. '/config/horde.local.php')) {
+        include SKELETON_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', $curr_dir . '/../..');
+        define('HORDE_BASE', SKELETON_BASE . '/..');
     }
 }
-
-if (!defined('SKELETON_BASE')) {
-    define('SKELETON_BASE', $curr_dir . '/..');
-}

diff --git a/timeobjects/lib/base.php b/timeobjects/lib/base.php
index ed0b609..76b6f74 100644 (file)
--- a/timeobjects/lib/base.php
+++ b/timeobjects/lib/base.php
@@ -3,17 +3,19 @@
  * Base inclusion file
  *
  */
-$rto_dir = dirname(__FILE__);
+
+if (!defined('TIMEOBJECTS_BASE')) {
+    define('TIMEOBJECTS_BASE', dirname(__FILE__) . '/..');
+}
 
 // Check for a prior definition of HORDE_BASE.
 if (!defined('HORDE_BASE')) {
-    /* Temporary fix - if horde does not live directly under the imp
-     * directory, the HORDE_BASE constant should be defined in
-     * imp/lib/base.local.php. */
-    if (file_exists($rto_dir . '/base.local.php')) {
-        include $rto_dir . '/base.local.php';
+    /* If horde does not live directly under the app directory, the HORDE_BASE
+     * constant should be defined in config/horde.local.php. */
+    if (file_exists(TIMEOBJECTS_BASE . '/config/horde.local.php')) {
+        include TIMEOBJECTS_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', $rto_dir . '/../..');
+        define('HORDE_BASE', TIMEOBJECTS_BASE . '/..');
     }
 }
 
@@ -35,7 +37,3 @@ try {
 } catch (Horde_Exception $e) {
     Horde_Auth::authenticateFailure('timeobjects', $e);
 }
-
-if (!defined('TIMEOBJECTS_BASE')) {
-    define('TIMEOBJECTS_BASE', $rto_dir . '/..');
-}

diff --git a/turba/lib/base.load.php b/turba/lib/base.load.php
index 3fced9d..45fe6b6 100644 (file)
--- a/turba/lib/base.load.php
+++ b/turba/lib/base.load.php
@@ -10,19 +10,16 @@
  * @package Turba
  */
 
-$curr_dir = dirname(__FILE__);
+if (!defined('TURBA_BASE')) {
+    define('TURBA_BASE', dirname(__FILE__) . '/..');
+}
 
 if (!defined('HORDE_BASE')) {
-    /* Temporary fix - if horde does not live directly under the app
-     * directory, the HORDE_BASE constant should be defined in
-     * lib/base.local.php. */
-    if (file_exists($curr_dir . '/base.local.php')) {
-        include $curr_dir . '/base.local.php';
+    /* If horde does not live directly under the app directory, the HORDE_BASE
+     * constant should be defined in config/horde.local.php. */
+    if (file_exists(TURBA_BASE . '/config/horde.local.php')) {
+        include TURBA_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', $curr_dir . '/../..');
+        define('HORDE_BASE', TURBA_BASE . '/..');
     }
 }
-
-if (!defined('TURBA_BASE')) {
-    define('TURBA_BASE', $curr_dir . '/..');
-}