Unneeded IMP_BASE definitions.

diff --git a/imp/attachment.php b/imp/attachment.php
index a24f0e3..06db768 100644 (file)
--- a/imp/attachment.php
+++ b/imp/attachment.php
@@ -18,7 +18,6 @@
 if (!defined('HORDE_BASE')) {
     @define('HORDE_BASE', dirname(__FILE__) . '/..');
 }
-@define('IMP_BASE', dirname(__FILE__));
 require_once HORDE_BASE . '/lib/core.php';
 require_once 'VFS.php';
 
@@ -90,7 +89,7 @@ if ($conf['compose']['link_attachments_notify']) {
                 $mail_address_full = $mail_identity->getDefaultFromAddress(true);
                 NLS::setTimeZone();
                 NLS::setLanguageEnvironment();
-                NLS::setTextdomain('imp', IMP_BASE . '/locale', NLS::getCharset());
+                NLS::setTextdomain('imp', dirname(__FILE__) . '/locale', NLS::getCharset());
                 String::setDefaultCharset(NLS::getCharset());
 
                 /* Set up the mail headers and read the log file. */

diff --git a/imp/contacts.php b/imp/contacts.php
index b336a65..26f025d 100644 (file)
--- a/imp/contacts.php
+++ b/imp/contacts.php
@@ -8,9 +8,8 @@
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
  */
 
-@define('IMP_BASE', dirname(__FILE__));
 $authentication = 'horde';
-require_once IMP_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 
 /* Get the lists of address books through the API. */
 $source_list = $registry->call('contacts/sources');

diff --git a/imp/fetchmail.php b/imp/fetchmail.php
index 9713656..5f0f0d1 100644 (file)
--- a/imp/fetchmail.php
+++ b/imp/fetchmail.php
@@ -9,8 +9,7 @@
  * @author Michael Slusarz <slusarz@horde.org>
  */
 
-@define('IMP_BASE', dirname(__FILE__));
-require_once IMP_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 require_once 'Horde/Prefs/UI.php';
 
 /* No fetchmail for POP3 accounts. */

diff --git a/imp/fetchmailprefs.php b/imp/fetchmailprefs.php
index e13937e..9b81821 100644 (file)
--- a/imp/fetchmailprefs.php
+++ b/imp/fetchmailprefs.php
@@ -9,8 +9,7 @@
  * @author Michael Slusarz <slusarz@horde.org>
  */
 
-@define('IMP_BASE', dirname(__FILE__));
-require_once IMP_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 
 /* Initialize Fetchmail libraries. */
 $fm_account = new IMP_Fetchmail_Account();

diff --git a/imp/filterprefs.php b/imp/filterprefs.php
index 0dec2c2..49420e7 100644 (file)
--- a/imp/filterprefs.php
+++ b/imp/filterprefs.php
@@ -8,8 +8,7 @@
  * @author Michael Slusarz <slusarz@horde.org>
  */
 
-@define('IMP_BASE', dirname(__FILE__));
-require_once IMP_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 require_once 'Horde/Help.php';
 require_once 'Horde/Prefs/UI.php';
 $result = Horde::loadConfiguration('prefs.php', array('prefGroups', '_prefs'), 'imp');

diff --git a/imp/rss.php b/imp/rss.php
index 171878b..917b85e 100644 (file)
--- a/imp/rss.php
+++ b/imp/rss.php
@@ -10,8 +10,7 @@
 
 $authentication = 'none';
 @define('AUTH_HANDLER', true);
-@define('IMP_BASE', dirname(__FILE__));
-require_once IMP_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 
 $auth = &Auth::singleton($conf['auth']['driver']);
 if ((!Auth::getAuth() || !IMP::checkAuthentication(true)) &&

diff --git a/imp/saveimage.php b/imp/saveimage.php
index b394c71..3685374 100644 (file)
--- a/imp/saveimage.php
+++ b/imp/saveimage.php
@@ -8,8 +8,7 @@
  * @author Michael Slusarz <slusarz@horde.org>
  */
 
-@define('IMP_BASE', dirname(__FILE__));
-require_once IMP_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 
 $id = Util::getFormData('id');
 $index = Util::getFormData('index');

diff --git a/imp/search.php b/imp/search.php
index 32b5c21..c7717a6 100644 (file)
--- a/imp/search.php
+++ b/imp/search.php
@@ -15,8 +15,7 @@
  * @author Michael Slusarz <slusarz@horde.org>
  */
 
-@define('IMP_BASE', dirname(__FILE__));
-require_once IMP_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 require_once 'Horde/Help.php';
 
 $actionID = Util::getFormData('actionID');

diff --git a/imp/smime.php b/imp/smime.php
index 38d14df..83fc3e5 100644 (file)
--- a/imp/smime.php
+++ b/imp/smime.php
@@ -74,8 +74,7 @@ function _printKeyInfo($cert)
 }
 
 
-@define('IMP_BASE', dirname(__FILE__));
-require_once IMP_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 
 $imp_smime = &Horde_Crypt::singleton(array('imp', 'smime'));
 $secure_check = $imp_smime->requireSecureConnection();

diff --git a/imp/stationery.php b/imp/stationery.php
index 3c4cbf0..fac2c3f 100644 (file)
--- a/imp/stationery.php
+++ b/imp/stationery.php
@@ -8,9 +8,8 @@
  * @author Jan Schneider <jan@horde.org>
  */
 
-@define('IMP_BASE', dirname(__FILE__));
 $authentication = 'horde';
-require_once IMP_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 require_once 'Horde/Prefs/UI.php';
 
 $compose_url = Util::addParameter(Horde::url($registry->get('webroot', 'horde') . '/services/prefs.php', true), 'app', 'imp', false);

diff --git a/imp/thread.php b/imp/thread.php
index ab26626..187e333 100644 (file)
--- a/imp/thread.php
+++ b/imp/thread.php
@@ -8,8 +8,7 @@
  * @author Michael Slusarz <slusarz@horde.org>
  */
 
-@define('IMP_BASE', dirname(__FILE__));
-require_once IMP_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 
 /* What mode are we in?
  * DEFAULT/'thread' - Thread mode

diff --git a/imp/view.php b/imp/view.php
index 9165815..9e3db88 100644 (file)
--- a/imp/view.php
+++ b/imp/view.php
@@ -45,8 +45,7 @@ if ((isset($_GET['actionID']) && ($_GET['actionID'] == 'download_all')) ||
 }
 
 $session_control = 'readonly';
-@define('IMP_BASE', dirname(__FILE__));
-require_once IMP_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/base.php';
 
 $actionID = Util::getFormData('actionID');
 $ctype = Util::getFormData('ctype');