From 06f8705baffa100e04b56d41595ef7b2ac3216d3 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 9 Jun 2009 13:21:29 -0600
Subject: [PATCH] Move *_BASE determination to base.load.php.

---
 chora/index.php             |  5 ++---
 chora/lib/base.load.php     | 28 ++++++++++++++++++++++++++++
 chora/test.php              |  9 ++-------
 imp/ajax.php                | 14 ++------------
 imp/cache.php               | 14 ++------------
 imp/index.php               | 13 +------------
 imp/lib/base.load.php       | 28 ++++++++++++++++++++++++++++
 imp/lib/base.php            | 19 ++-----------------
 imp/test.php                |  9 ++-------
 ingo/index.php              | 13 +------------
 ingo/lib/base.load.php      | 28 ++++++++++++++++++++++++++++
 ingo/lib/base.php           | 19 ++-----------------
 ingo/test.php               |  9 ++-------
 kronolith/add.php           |  3 +--
 kronolith/ajax.php          | 14 ++------------
 kronolith/attend.php        |  3 +--
 kronolith/attendees.php     |  3 +--
 kronolith/contacts.php      |  3 +--
 kronolith/data.php          |  3 +--
 kronolith/delete.php        |  3 +--
 kronolith/edit.php          |  3 +--
 kronolith/event.php         |  3 +--
 kronolith/fb.php            |  3 +--
 kronolith/imple.php         |  3 +--
 kronolith/index.php         |  4 ++--
 kronolith/lib/base.load.php | 28 ++++++++++++++++++++++++++++
 kronolith/lib/base.php      | 18 ++----------------
 kronolith/new.php           |  3 +--
 kronolith/perms.php         |  3 +--
 kronolith/pref_api.php      |  2 +-
 kronolith/search.php        |  3 +--
 kronolith/test.php          |  9 ++-------
 32 files changed, 152 insertions(+), 170 deletions(-)
 create mode 100644 chora/lib/base.load.php
 create mode 100644 imp/lib/base.load.php
 create mode 100644 ingo/lib/base.load.php
 create mode 100644 kronolith/lib/base.load.php

diff --git a/chora/index.php b/chora/index.php
index 05362c2fc..5ccfb14a8 100644
--- a/chora/index.php
+++ b/chora/index.php
@@ -9,15 +9,14 @@
  * @package Chora
  */
 
-define('CHORA_BASE', dirname(__FILE__));
+require_once dirname(__FILE__) . '/lib/base.load.php';
 $chora_configured = (is_readable(CHORA_BASE . '/config/conf.php') &&
                      is_readable(CHORA_BASE . '/config/sourceroots.php') &&
                      is_readable(CHORA_BASE . '/config/mime_drivers.php') &&
                      is_readable(CHORA_BASE . '/config/prefs.php'));
 
 if (!$chora_configured) {
-    /* Chora isn't configured. */
-    require CHORA_BASE . '/../lib/Test.php';
+    require HORDE_BASE . '/lib/Test.php';
     Horde_Test::configFilesMissing('Chora', CHORA_BASE,
         array('conf.php', 'prefs.php', 'mime_drivers.php'),
         array('sourceroots.php' => 'This file defines all of the source repositories that you wish Chora to display.'));
diff --git a/chora/lib/base.load.php b/chora/lib/base.load.php
new file mode 100644
index 000000000..a763fd5ec
--- /dev/null
+++ b/chora/lib/base.load.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Script to determine the correct *_BASE values.
+ *
+ * Copyright 2009 The Horde Project (http://www.horde.org/)
+ *
+ * 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 Chora
+ */
+
+$curr_dir = 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';
+    } else {
+        define('HORDE_BASE', $curr_dir . '/../..');
+    }
+}
+
+if (!defined('CHORA_BASE')) {
+    define('CHORA_BASE', $curr_dir . '/..');
+}
diff --git a/chora/test.php b/chora/test.php
index 4f6844f36..fcac2cc71 100644
--- a/chora/test.php
+++ b/chora/test.php
@@ -9,12 +9,7 @@
  */
 
 /* Include Horde's core.php file. */
-$filedir = dirname(__FILE__);
-if (file_exists($filedir . '/lib/base.local.php')) {
-    include_once $filedir . '/lib/base.local.php';
-} elseif (!defined('HORDE_BASE')) {
-    define('HORDE_BASE', $filedir . '/..');
-}
+require_once dirname(__FILE__) . '/lib/base.load.php';
 include_once HORDE_BASE . '/lib/core.php';
 
 /* We should have loaded the String class, from the Horde_Util
@@ -35,7 +30,7 @@ $horde_test = new Horde_Test;
 
 /* Chora version. */
 $module = 'Chora';
-require_once $filedir . '/lib/version.php';
+require_once CHORA_BASE . '/lib/version.php';
 $module_version = CHORA_VERSION;
 
 /* Chora configuration files. */
diff --git a/imp/ajax.php b/imp/ajax.php
index d24f16414..15687bb31 100644
--- a/imp/ajax.php
+++ b/imp/ajax.php
@@ -140,17 +140,7 @@ function _getQuota()
 }
 
 // Need to load Util:: to give us access to Util::getPathInfo().
-$imp_dir = dirname(__FILE__);
-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($imp_dir . '/lib/base.local.php')) {
-        include $imp_dir . '/lib/base.local.php';
-    } else {
-        define('HORDE_BASE', $imp_dir . '/..');
-    }
-}
+require_once dirname(__FILE__) . '/lib/base.load.php';
 require_once HORDE_BASE . '/lib/core.php';
 $action = basename(Util::getPathInfo());
 if (empty($action)) {
@@ -168,7 +158,7 @@ if (in_array($action, array('chunkContent', 'Html2Text', 'Text2Html', 'GetReplyD
 
 $dimp_logout = ($action == 'LogOut');
 $session_timeout = 'json';
-require_once $imp_dir . '/lib/base.php';
+require_once IMP_BASE . '/lib/base.php';
 
 // Process common request variables.
 $mbox = Util::getPost('view');
diff --git a/imp/cache.php b/imp/cache.php
index e3700c29c..4f662a6da 100644
--- a/imp/cache.php
+++ b/imp/cache.php
@@ -20,17 +20,7 @@
 $expire_time = 525600;
 
 /* Load IMP.php to access IMP::getPathInfo(). */
-$imp_dir = dirname(__FILE__);
-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($imp_dir . '/lib/base.local.php')) {
-        include $imp_dir . '/lib/base.local.php';
-    } else {
-        define('HORDE_BASE', $imp_dir . '/..');
-    }
-}
+require_once dirname(__FILE__) . '/lib/base.load.php';
 require_once HORDE_BASE . '/lib/core.php';
 $path_info = trim(Util::getPathInfo(), '/');
 if (empty($path_info)) {
@@ -56,7 +46,7 @@ if ($type == 'fckeditor') {
 }
 $session_control = 'readonly';
 $session_timeout = 'none';
-require_once $imp_dir . '/lib/base.php';
+require_once IMP_BASE . '/lib/base.php';
 
 switch ($type) {
 case 'css':
diff --git a/imp/index.php b/imp/index.php
index 068de145c..c6ee32662 100644
--- a/imp/index.php
+++ b/imp/index.php
@@ -9,24 +9,13 @@
  * @package IMP
  */
 
-@define('IMP_BASE', dirname(__FILE__));
+require_once dirname(__FILE__) . '/lib/base.load.php';
 $imp_configured = (is_readable(IMP_BASE . '/config/conf.php') &&
                    is_readable(IMP_BASE . '/config/mime_drivers.php') &&
                    is_readable(IMP_BASE . '/config/prefs.php') &&
                    is_readable(IMP_BASE . '/config/servers.php'));
 
 if (!$imp_configured) {
-    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(IMP_BASE . '/lib/base.local.php')) {
-            include IMP_BASE . '/lib/base.local.php';
-        } else {
-            define('HORDE_BASE', IMP_BASE . '/..');
-        }
-    }
-
     require HORDE_BASE . '/lib/Test.php';
     Horde_Test::configFilesMissing('IMP', IMP_BASE,
         array('conf.php', 'mime_drivers.php', 'prefs.php'),
diff --git a/imp/lib/base.load.php b/imp/lib/base.load.php
new file mode 100644
index 000000000..d7b1de949
--- /dev/null
+++ b/imp/lib/base.load.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Script to determine the correct *_BASE values.
+ *
+ * Copyright 2009 The Horde Project (http://www.horde.org/)
+ *
+ * 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 IMP
+ */
+
+$curr_dir = 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';
+    } else {
+        define('HORDE_BASE', $curr_dir . '/../..');
+    }
+}
+
+if (!defined('IMP_BASE')) {
+    define('IMP_BASE', $curr_dir . '/..');
+}
diff --git a/imp/lib/base.php b/imp/lib/base.php
index bdb09f424..3d12554a1 100644
--- a/imp/lib/base.php
+++ b/imp/lib/base.php
@@ -31,24 +31,9 @@
  * @package IMP
  */
 
+// Determine BASE directories.
 $imp_dir = 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($imp_dir . '/base.local.php')) {
-        include $imp_dir . '/base.local.php';
-    } else {
-        define('HORDE_BASE', $imp_dir . '/../..');
-    }
-}
-
-// Find the base file path of IMP.
-if (!defined('IMP_BASE')) {
-    define('IMP_BASE', $imp_dir . '/..');
-}
+require_once $imp_dir . '/base.load.php';
 
 // Load the Horde Framework core, and set up inclusion paths.
 require_once HORDE_BASE . '/lib/core.php';
diff --git a/imp/test.php b/imp/test.php
index 0722901ae..8bdfff26c 100644
--- a/imp/test.php
+++ b/imp/test.php
@@ -92,12 +92,7 @@ function _errorMsg($e)
 
 
 /* Include Horde's core.php file. */
-$filedir = dirname(__FILE__);
-if (file_exists($filedir . '/lib/base.local.php')) {
-    include_once $filedir . '/lib/base.local.php';
-} elseif (!defined('HORDE_BASE')) {
-    define('HORDE_BASE', $filedir . '/..');
-}
+require_once dirname(__FILE__) . '/lib/base.load.php';
 include_once HORDE_BASE . '/lib/core.php';
 
 /* We should have loaded the String class, from the Horde_Util
@@ -119,7 +114,7 @@ $horde_test = new Horde_Test;
 
 /* IMP version. */
 $module = 'IMP';
-require_once $filedir .'/lib/version.php';
+require_once IMP_BASE .'/lib/version.php';
 $module_version = IMP_VERSION;
 
 require TEST_TEMPLATES . 'header.inc';
diff --git a/ingo/index.php b/ingo/index.php
index 40f9ee388..02fcfcaff 100644
--- a/ingo/index.php
+++ b/ingo/index.php
@@ -10,24 +10,13 @@
  * @author Mike Cochrane <mike@graftonhall.co.nz>
  */
 
-@define('INGO_BASE', dirname(__FILE__));
+require_once dirname(__FILE__) . '/base.load.php';
 $ingo_configured = (is_readable(INGO_BASE . '/config/conf.php') &&
                     is_readable(INGO_BASE . '/config/prefs.php') &&
                     is_readable(INGO_BASE . '/config/backends.php') &&
                     is_readable(INGO_BASE . '/config/fields.php'));
 
 if (!$ingo_configured) {
-    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(INGO_BASE . '/lib/base.local.php')) {
-            include INGO_BASE . '/lib/base.local.php';
-        } else {
-            define('HORDE_BASE', INGO_BASE . '/..');
-        }
-    }
-
     require HORDE_BASE . '/lib/Test.php';
     Horde_Test::configFilesMissing('Ingo', INGO_BASE,
         array('conf.php', 'prefs.php', 'backends.php'),
diff --git a/ingo/lib/base.load.php b/ingo/lib/base.load.php
new file mode 100644
index 000000000..6c330a126
--- /dev/null
+++ b/ingo/lib/base.load.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Script to determine the correct *_BASE values.
+ *
+ * Copyright 2009 The Horde Project (http://www.horde.org/)
+ *
+ * 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 Ingo
+ */
+
+$curr_dir = 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';
+    } else {
+        define('HORDE_BASE', $curr_dir . '/../..');
+    }
+}
+
+if (!defined('INGO_BASE')) {
+    define('INGO_BASE', $curr_dir . '/..');
+}
diff --git a/ingo/lib/base.php b/ingo/lib/base.php
index 7d1abd260..1325ce861 100644
--- a/ingo/lib/base.php
+++ b/ingo/lib/base.php
@@ -12,24 +12,9 @@
  * did not receive this file, see http://www.horde.org/licenses/asl.php.
  */
 
+// Determine BASE directories.
 $ingo_dir = 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($ingo_dir . '/base.local.php')) {
-        include $ingo_dir . '/base.local.php';
-    } else {
-        define('HORDE_BASE', $ingo_dir . '/../..');
-    }
-}
-
-// Find the base file path of Ingo.
-if (!defined('INGO_BASE')) {
-    define('INGO_BASE', $ingo_dir . '/..');
-}
+require_once $ingo_dir . '/base.load.php';
 
 // Load the Horde Framework core, and set up inclusion paths.
 require_once HORDE_BASE . '/lib/core.php';
diff --git a/ingo/test.php b/ingo/test.php
index 25f7aa2c4..2103c64f4 100644
--- a/ingo/test.php
+++ b/ingo/test.php
@@ -12,12 +12,7 @@
  */
 
 /* Include Horde's core.php file. */
-$filedir = dirname(__FILE__);
-if (file_exists($filedir . '/lib/base.local.php')) {
-        include_once $filedir . '/lib/base.local.php';
-} elseif (!defined('HORDE_BASE')) {
-        define('HORDE_BASE', $filedir . '/..');
-}
+require_once dirname(__FILE__) . '/lib/base.load.php';
 include_once HORDE_BASE . '/lib/core.php';
 
 /* We should have loaded the String class, from the Horde_Util
@@ -38,7 +33,7 @@ $horde_test = new Horde_Test;
 
 /* Ingo version. */
 $module = 'Ingo';
-require_once $filedir . '/lib/version.php';
+require_once INGO_BASE . '/lib/version.php';
 $module_version = INGO_VERSION;
 
 require TEST_TEMPLATES . 'header.inc';
diff --git a/kronolith/add.php b/kronolith/add.php
index 0030a8afe..8edc165c9 100644
--- a/kronolith/add.php
+++ b/kronolith/add.php
@@ -6,8 +6,7 @@
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
  */
 
-@define('KRONOLITH_BASE', dirname(__FILE__));
-require_once KRONOLITH_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 
 if (!Util::getFormData('cancel')) {
     $targetcalendar = Util::getFormData('targetcalendar');
diff --git a/kronolith/ajax.php b/kronolith/ajax.php
index 9f424cd59..4feea972f 100644
--- a/kronolith/ajax.php
+++ b/kronolith/ajax.php
@@ -72,17 +72,7 @@ function saveEvent($event)
 }
 
 // Need to load Util:: to give us access to Util::getPathInfo().
-$kronolith_dir = dirname(__FILE__);
-if (!defined('HORDE_BASE')) {
-    /* Temporary fix - if horde does not live directly under the kronolith
-     * directory, the HORDE_BASE constant should be defined in
-     * kronolith/lib/base.local.php. */
-    if (file_exists($kronolith_dir . '/lib/base.local.php')) {
-        include $kronolith_dir . '/lib/base.local.php';
-    } else {
-        define('HORDE_BASE', $kronolith_dir . '/..');
-    }
-}
+require_once dirname(__FILE__) . '/base.load.php';
 require_once HORDE_BASE . '/lib/core.php';
 $action = basename(Util::getPathInfo());
 if (empty($action)) {
@@ -99,7 +89,7 @@ if (in_array($action, array())) {
 }
 
 $session_timeout = 'json';
-require_once $kronolith_dir . '/lib/base.php';
+require_once KRONOLITH_BASE . '/lib/base.php';
 
 // Process common request variables.
 $cacheid = Util::getPost('cacheid');
diff --git a/kronolith/attend.php b/kronolith/attend.php
index 79b4bfb9f..4cc5d7dc6 100644
--- a/kronolith/attend.php
+++ b/kronolith/attend.php
@@ -10,8 +10,7 @@
  */
 
 @define('AUTH_HANDLER', true);
-@define('KRONOLITH_BASE', dirname(__FILE__));
-require_once KRONOLITH_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 
 $cal = Util::getFormData('c');
 $id = Util::getFormData('e');
diff --git a/kronolith/attendees.php b/kronolith/attendees.php
index 9b8e36be9..23fcb40d1 100644
--- a/kronolith/attendees.php
+++ b/kronolith/attendees.php
@@ -7,8 +7,7 @@
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
  */
 
-@define('KRONOLITH_BASE', dirname(__FILE__));
-require_once KRONOLITH_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 require_once 'Horde/Identity.php';
 require_once 'Horde/Variables.php';
 
diff --git a/kronolith/contacts.php b/kronolith/contacts.php
index 49dd14051..78e5c6c4c 100644
--- a/kronolith/contacts.php
+++ b/kronolith/contacts.php
@@ -6,8 +6,7 @@
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
  */
 
-@define('KRONOLITH_BASE', dirname(__FILE__));
-require_once KRONOLITH_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 
 if (!Auth::getAuth()) {
     Util::closeWindowJS();
diff --git a/kronolith/data.php b/kronolith/data.php
index 187bdd428..46cd9d8cf 100644
--- a/kronolith/data.php
+++ b/kronolith/data.php
@@ -16,8 +16,7 @@ function _cleanup()
     return Horde_Data::IMPORT_FILE;
 }
 
-@define('KRONOLITH_BASE', dirname(__FILE__));
-require_once KRONOLITH_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 
 if (!$conf['menu']['import_export']) {
     require KRONOLITH_BASE . '/index.php';
diff --git a/kronolith/delete.php b/kronolith/delete.php
index 140475113..753353fce 100644
--- a/kronolith/delete.php
+++ b/kronolith/delete.php
@@ -9,8 +9,7 @@
  * @package Kronolith
  */
 
-@define('KRONOLITH_BASE', dirname(__FILE__));
-require_once KRONOLITH_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 
 $kronolith_driver = Kronolith::getDriver(null, Util::getFormData('calendar'));
 if ($eventID = Util::getFormData('eventID')) {
diff --git a/kronolith/edit.php b/kronolith/edit.php
index 6868f035e..2c156083c 100644
--- a/kronolith/edit.php
+++ b/kronolith/edit.php
@@ -35,8 +35,7 @@ function _check_max()
     return true;
 }
 
-@define('KRONOLITH_BASE', dirname(__FILE__));
-require_once KRONOLITH_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 
 $url = Util::getFormData('url');
 $kronolith_driver = Kronolith::getDriver();
diff --git a/kronolith/event.php b/kronolith/event.php
index 87601ea55..577498436 100644
--- a/kronolith/event.php
+++ b/kronolith/event.php
@@ -9,8 +9,7 @@
  * @package Kronolith
  */
 
-@define('KRONOLITH_BASE', dirname(__FILE__));
-require_once KRONOLITH_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 
 $viewName = Util::getFormData('view', 'Event');
 $view = Kronolith::getView($viewName);
diff --git a/kronolith/fb.php b/kronolith/fb.php
index c8ac772a8..9b602c1b9 100644
--- a/kronolith/fb.php
+++ b/kronolith/fb.php
@@ -10,9 +10,8 @@
  */
 
 @define('AUTH_HANDLER', true);
-@define('KRONOLITH_BASE', dirname(__FILE__));
 $session_control = 'none';
-require_once KRONOLITH_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 
 // We want to always generate UTF-8 iCalendar data.
 NLS::setCharset('UTF-8');
diff --git a/kronolith/imple.php b/kronolith/imple.php
index c8bb186b8..b9e4ccbd6 100644
--- a/kronolith/imple.php
+++ b/kronolith/imple.php
@@ -10,8 +10,7 @@
  * @author Michael Slusarz <slusarz@horde.org>
  */
 
-@define('KRONOLITH_BASE', dirname(__FILE__));
-require_once KRONOLITH_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 
 $path = Util::getFormData('imple');
 if (!$path) {
diff --git a/kronolith/index.php b/kronolith/index.php
index a2f0efabe..e990d366b 100644
--- a/kronolith/index.php
+++ b/kronolith/index.php
@@ -6,12 +6,12 @@
  * not receive such a file, see also http://www.fsf.org/copyleft/gpl.html.
  */
 
-@define('KRONOLITH_BASE', dirname(__FILE__));
+require_once dirname(__FILE__) . '/lib/base.load.php';
 $kronolith_configured = (is_readable(KRONOLITH_BASE . '/config/conf.php') &&
                          is_readable(KRONOLITH_BASE . '/config/prefs.php'));
 
 if (!$kronolith_configured) {
-    require KRONOLITH_BASE . '/../lib/Test.php';
+    require HORDE_BASE . '/lib/Test.php';
     Horde_Test::configFilesMissing('Kronolith', KRONOLITH_BASE,
         array('conf.php', 'prefs.php'));
 }
diff --git a/kronolith/lib/base.load.php b/kronolith/lib/base.load.php
new file mode 100644
index 000000000..373081dfb
--- /dev/null
+++ b/kronolith/lib/base.load.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Script to determine the correct *_BASE values.
+ *
+ * Copyright 2009 The Horde Project (http://www.horde.org/)
+ *
+ * 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 Kronolith
+ */
+
+$curr_dir = 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';
+    } else {
+        define('HORDE_BASE', $curr_dir . '/../..');
+    }
+}
+
+if (!defined('KRONOLITH_BASE')) {
+    define('KRONOLITH_BASE', $curr_dir . '/..');
+}
diff --git a/kronolith/lib/base.php b/kronolith/lib/base.php
index 4050b6f36..d12a12802 100644
--- a/kronolith/lib/base.php
+++ b/kronolith/lib/base.php
@@ -14,19 +14,10 @@
  * @package Kronolith
  */
 
+// Determine BASE directories.
 $kronolith_dir = dirname(__FILE__);
+require_once $kronolith_dir . '/base.load.php';
 
-// 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($kronolith_dir . '/base.local.php')) {
-        include $kronolith_dir . '/base.local.php';
-    } else {
-        define('HORDE_BASE', $kronolith_dir . '/../..');
-    }
-}
 /* Load the Horde Framework core, and set up inclusion paths. */
 require_once HORDE_BASE . '/lib/core.php';
 Horde_Autoloader::addClassPath($kronolith_dir);
@@ -51,11 +42,6 @@ if (is_a(($pushed = $registry->pushApp('kronolith', !defined('AUTH_HANDLER'))),
 $conf = &$GLOBALS['conf'];
 define('KRONOLITH_TEMPLATES', $registry->get('templates'));
 
-/* Find the base file path of Kronolith. */
-if (!defined('KRONOLITH_BASE')) {
-    define('KRONOLITH_BASE', $kronolith_dir . '/..');
-}
-
 /* Horde framework libraries. */
 require_once 'Horde/Help.php';
 
diff --git a/kronolith/new.php b/kronolith/new.php
index 45b6b8d5c..935a6c8d4 100644
--- a/kronolith/new.php
+++ b/kronolith/new.php
@@ -8,8 +8,7 @@
  * @author Chuck Hagenbuch <chuck@horde.org>
  */
 
-@define('KRONOLITH_BASE', dirname(__FILE__));
-require KRONOLITH_BASE . '/lib/base.php';
+require dirname(__FILE__) . '/lib/base.php';
 
 /* Check permissions. */
 if (Kronolith::hasPermission('max_events') !== true &&
diff --git a/kronolith/perms.php b/kronolith/perms.php
index 364d70f5e..2956ed92d 100644
--- a/kronolith/perms.php
+++ b/kronolith/perms.php
@@ -9,8 +9,7 @@
  * @author Jan Schneider <jan@horde.org>
  */
 
-@define('KRONOLITH_BASE', dirname(__FILE__));
-require_once KRONOLITH_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 require_once 'Horde/Group.php';
 
 $shares = &Horde_Share::singleton('kronolith');
diff --git a/kronolith/pref_api.php b/kronolith/pref_api.php
index a7a925400..3daae1ceb 100644
--- a/kronolith/pref_api.php
+++ b/kronolith/pref_api.php
@@ -8,7 +8,7 @@
  * @author Chuck Hagenbuch <chuck@horde.org>
  */
 
-@define('HORDE_BASE', dirname(dirname(__FILE__)));
+require_once dirname(__FILE__) . '/lib/base.load.php';
 require_once HORDE_BASE . '/lib/core.php';
 
 $registry = &Registry::singleton();
diff --git a/kronolith/search.php b/kronolith/search.php
index 9d6987371..9727a80f2 100644
--- a/kronolith/search.php
+++ b/kronolith/search.php
@@ -8,8 +8,7 @@
  * @author Meilof Veeningen <meilof@gmail.com>
  */
 
-@define('KRONOLITH_BASE', dirname(__FILE__));
-require_once KRONOLITH_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 
 /* Get search parameters. */
 $search_mode = Util::getFormData('search_mode', 'basic');
diff --git a/kronolith/test.php b/kronolith/test.php
index 62c79b882..de0ccf1aa 100644
--- a/kronolith/test.php
+++ b/kronolith/test.php
@@ -1,11 +1,6 @@
 <?php
 /* Include Horde's core.php file. */
-$filedir = dirname(__FILE__);
-if (file_exists($filedir . '/lib/base.local.php')) {
-    include_once $filedir . '/lib/base.local.php';
-} elseif (!defined('HORDE_BASE')) {
-    define('HORDE_BASE', $filedir . '/..');
-}
+require_once dirname(__FILE__) . '/lib/base.load.php';
 include_once HORDE_BASE . '/lib/core.php';
 
 /* We should have loaded the String class, from the Horde_Util package, in
@@ -25,7 +20,7 @@ require_once HORDE_BASE . '/lib/Test.php';
 $horde_test = new Horde_Test;
 
 $module = 'Kronolith';
-require_once $filedir . '/lib/version.php';
+require_once KRONOLITH_DIR . '/lib/version.php';
 $module_version = KRONOLITH_VERSION;
 
 require TEST_TEMPLATES . 'header.inc';
-- 
2.11.0