Use realpath() so we only need to resolve true path once

There are reports that at least one opcode cacher can get a bit confused when working with relative paths.
horde · Jan 28, 2014 · 794bd7b · 794bd7b
1 parent f557c80
commit 794bd7b
Show file tree

Hide file tree

Showing 25 changed files with 49 additions and 49 deletions.
diff --git a/agora/lib/Application.php b/agora/lib/Application.php
@@ -17,7 +17,7 @@
 
 /* Determine the base directories. */
 if (!defined('AGORA_BASE')) {
-    define('AGORA_BASE', __DIR__ . '/..');
+    define('AGORA_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
@@ -26,7 +26,7 @@
     if (file_exists(AGORA_BASE . '/config/horde.local.php')) {
         include AGORA_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', AGORA_BASE . '/..');
+        define('HORDE_BASE', realpath(AGORA_BASE . '/..'));
     }
 }
 

diff --git a/ansel/lib/Application.php b/ansel/lib/Application.php
@@ -17,14 +17,14 @@
  */
 
 if (!defined('ANSEL_BASE')) {
-    define('ANSEL_BASE', __DIR__ . '/..');
+    define('ANSEL_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
     if (file_exists(ANSEL_BASE . '/config/horde.local.php')) {
         include ANSEL_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', ANSEL_BASE . '/..');
+        define('HORDE_BASE', realpath(ANSEL_BASE . '/..'));
     }
 }
 require_once HORDE_BASE . '/lib/core.php';

diff --git a/chora/lib/Application.php b/chora/lib/Application.php
@@ -14,7 +14,7 @@
  */
 
 if (!defined('CHORA_BASE')) {
-    define('CHORA_BASE', __DIR__ . '/..');
+    define('CHORA_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
@@ -23,7 +23,7 @@
     if (file_exists(CHORA_BASE . '/config/horde.local.php')) {
         include CHORA_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', CHORA_BASE . '/..');
+        define('HORDE_BASE', realpath(CHORA_BASE . '/..'));
     }
 }
 

diff --git a/content/lib/Application.php b/content/lib/Application.php
@@ -13,7 +13,7 @@
 
 /* Determine the base directories. */
 if (!defined('CONTENT_BASE')) {
-    define('CONTENT_BASE', __DIR__ . '/..');
+    define('CONTENT_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
@@ -22,7 +22,7 @@
     if (file_exists(CONTENT_BASE . '/config/horde.local.php')) {
         include CONTENT_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', CONTENT_BASE . '/..');
+        define('HORDE_BASE', realpath(CONTENT_BASE . '/..'));
     }
 }
 

diff --git a/gollem/lib/Application.php b/gollem/lib/Application.php
@@ -21,7 +21,7 @@
 
 /* Determine the base directories. */
 if (!defined('GOLLEM_BASE')) {
-    define('GOLLEM_BASE', __DIR__ . '/..');
+    define('GOLLEM_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
@@ -30,7 +30,7 @@
     if (file_exists(GOLLEM_BASE . '/config/horde.local.php')) {
         include GOLLEM_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', GOLLEM_BASE . '/..');
+        define('HORDE_BASE', realpath(GOLLEM_BASE . '/..'));
     }
 }
 

diff --git a/imp/config/mime_drivers.php b/imp/config/mime_drivers.php
@@ -34,7 +34,7 @@
         /* Scans the text for inline PGP data. If true, will strip this data
          * out of the output (and, if PGP is active, will display the
          * results of the PGP action). */
-        'pgp_inline' => false,
+        'pgp_inline' => true,
 
         /* If you want to scan ALL incoming text/plain messages for UUencoded
          * data, set the following to true. This is very performance intensive

diff --git a/imp/lib/Application.php b/imp/lib/Application.php
@@ -13,7 +13,7 @@
 
 /* Determine the base directories. */
 if (!defined('IMP_BASE')) {
-    define('IMP_BASE', __DIR__ . '/..');
+    define('IMP_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
@@ -22,7 +22,7 @@
     if (file_exists(IMP_BASE . '/config/horde.local.php')) {
         include IMP_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', IMP_BASE . '/..');
+        define('HORDE_BASE', realpath(IMP_BASE . '/..'));
     }
 }
 

diff --git a/ingo/lib/Application.php b/ingo/lib/Application.php
@@ -12,7 +12,7 @@
 
 /* Determine the base directories. */
 if (!defined('INGO_BASE')) {
-    define('INGO_BASE', __DIR__ . '/..');
+    define('INGO_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
@@ -21,7 +21,7 @@
     if (file_exists(INGO_BASE . '/config/horde.local.php')) {
         include INGO_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', INGO_BASE . '/..');
+        define('HORDE_BASE', realpath(INGO_BASE . '/..'));
     }
 }
 

diff --git a/klutz/lib/Application.php b/klutz/lib/Application.php
@@ -13,7 +13,7 @@
 
 /* Determine the base directories. */
 if (!defined('KLUTZ_BASE')) {
-    define('KLUTZ_BASE', __DIR__ . '/..');
+    define('KLUTZ_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
@@ -22,7 +22,7 @@
     if (file_exists(KLUTZ_BASE . '/config/horde.local.php')) {
         include KLUTZ_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', KLUTZ_BASE . '/..');
+        define('HORDE_BASE', realpath(KLUTZ_BASE . '/..'));
     }
 }
 

diff --git a/kolab/lib/Application.php b/kolab/lib/Application.php
@@ -15,7 +15,7 @@
 
 /* Determine the base directories. */
 if (!defined('KOLAB_BASE')) {
-    define('KOLAB_BASE', __DIR__ . '/..');
+    define('KOLAB_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
@@ -24,7 +24,7 @@
     if (file_exists(KOLAB_BASE . '/config/horde.local.php')) {
         include KOLAB_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', KOLAB_BASE . '/..');
+        define('HORDE_BASE', realpath(KOLAB_BASE . '/..'));
     }
 }
 

diff --git a/kronolith/lib/Application.php b/kronolith/lib/Application.php
@@ -15,7 +15,7 @@
 
 /* Determine the base directories. */
 if (!defined('KRONOLITH_BASE')) {
-    define('KRONOLITH_BASE', __DIR__ . '/..');
+    define('KRONOLITH_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
@@ -24,7 +24,7 @@
     if (file_exists(KRONOLITH_BASE . '/config/horde.local.php')) {
         include KRONOLITH_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', KRONOLITH_BASE . '/..');
+        define('HORDE_BASE', realpath(KRONOLITH_BASE . '/..'));
     }
 }
 

diff --git a/luxor/lib/Application.php b/luxor/lib/Application.php
@@ -12,7 +12,7 @@
 
 /* Determine the base directories. */
 if (!defined('LUXOR_BASE')) {
-    define('LUXOR_BASE', __DIR__ . '/..');
+    define('LUXOR_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
@@ -21,7 +21,7 @@
     if (file_exists(LUXOR_BASE . '/config/horde.local.php')) {
         include LUXOR_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', LUXOR_BASE . '/..');
+        define('HORDE_BASE', realpath(LUXOR_BASE . '/..'));
     }
 }
 

diff --git a/mnemo/lib/Application.php b/mnemo/lib/Application.php
@@ -15,7 +15,7 @@
 
 /* Determine the base directories. */
 if (!defined('MNEMO_BASE')) {
-    define('MNEMO_BASE', __DIR__ . '/..');
+    define('MNEMO_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
@@ -24,7 +24,7 @@
     if (file_exists(MNEMO_BASE . '/config/horde.local.php')) {
         include MNEMO_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', MNEMO_BASE . '/..');
+        define('HORDE_BASE', realpath(MNEMO_BASE . '/..'));
     }
 }
 

diff --git a/nag/lib/Application.php b/nag/lib/Application.php
@@ -13,7 +13,7 @@
 
 /* Determine the base directories. */
 if (!defined('NAG_BASE')) {
-    define('NAG_BASE', __DIR__ . '/..');
+    define('NAG_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
@@ -22,7 +22,7 @@
     if (file_exists(NAG_BASE . '/config/horde.local.php')) {
         include NAG_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', NAG_BASE . '/..');
+        define('HORDE_BASE', realpath(NAG_BASE . '/..'));
     }
 }
 

diff --git a/pastie/lib/Application.php b/pastie/lib/Application.php
@@ -15,7 +15,7 @@
 
 /* Determine the base directories. */
 if (!defined('PASTIE_BASE')) {
-    define('PASTIE_BASE', __DIR__ . '/..');
+    define('PASTIE_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
@@ -24,7 +24,7 @@
     if (file_exists(PASTIE_BASE . '/config/horde.local.php')) {
         include PASTIE_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', PASTIE_BASE . '/..');
+        define('HORDE_BASE', realpath(PASTIE_BASE . '/..'));
     }
 }
 

diff --git a/sam/lib/Application.php b/sam/lib/Application.php
@@ -15,7 +15,7 @@
 
 /* Determine the base directories. */
 if (!defined('SAM_BASE')) {
-    define('SAM_BASE', __DIR__ . '/..');
+    define('SAM_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
@@ -24,7 +24,7 @@
     if (file_exists(SAM_BASE . '/config/horde.local.php')) {
         include SAM_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', SAM_BASE . '/..');
+        define('HORDE_BASE', realpath(SAM_BASE . '/..'));
     }
 }
 

diff --git a/sesha/lib/Application.php b/sesha/lib/Application.php
@@ -15,7 +15,7 @@
 
 /* Determine the base directories. */
 if (!defined('SESHA_BASE')) {
-    define('SESHA_BASE', __DIR__ . '/..');
+    define('SESHA_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
@@ -24,7 +24,7 @@
     if (file_exists(SESHA_BASE . '/config/horde.local.php')) {
         include SESHA_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', SESHA_BASE . '/..');
+        define('HORDE_BASE', realpath(SESHA_BASE . '/..'));
     }
 }
 

diff --git a/skeleton/lib/Application.php b/skeleton/lib/Application.php
@@ -13,7 +13,7 @@
 
 /* Determine the base directories. */
 if (!defined('SKELETON_BASE')) {
-    define('SKELETON_BASE', __DIR__ . '/..');
+    define('SKELETON_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
@@ -22,7 +22,7 @@
     if (file_exists(SKELETON_BASE . '/config/horde.local.php')) {
         include SKELETON_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', SKELETON_BASE . '/..');
+        define('HORDE_BASE', realpath(SKELETON_BASE . '/..'));
     }
 }
 

diff --git a/timeobjects/lib/Application.php b/timeobjects/lib/Application.php
@@ -10,7 +10,7 @@
  */
 /* Determine the base directories. */
 if (!defined('TIMEOBJECTS_BASE')) {
-    define('TIMEOBJECTS_BASE', __DIR__ . '/..');
+    define('TIMEOBJECTS_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
@@ -19,7 +19,7 @@
     if (file_exists(TIMEOBJECTS_BASE . '/config/horde.local.php')) {
         include TIMEOBJECTS_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', TIMEOBJECTS_BASE . '/..');
+        define('HORDE_BASE', realpath(TIMEOBJECTS_BASE . '/..'));
     }
 }
 

diff --git a/trean/lib/Application.php b/trean/lib/Application.php
@@ -12,7 +12,7 @@
 
 /* Determine the base directories. */
 if (!defined('TREAN_BASE')) {
-    define('TREAN_BASE', __DIR__ . '/..');
+    define('TREAN_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
@@ -21,7 +21,7 @@
     if (file_exists(TREAN_BASE . '/config/horde.local.php')) {
         include TREAN_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', TREAN_BASE . '/..');
+        define('HORDE_BASE', realpath(TREAN_BASE . '/..'));
     }
 }
 

diff --git a/turba/lib/Application.php b/turba/lib/Application.php
@@ -17,7 +17,7 @@
 
 /* Determine the base directories. */
 if (!defined('TURBA_BASE')) {
-    define('TURBA_BASE', __DIR__ . '/..');
+    define('TURBA_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
@@ -26,7 +26,7 @@
     if (file_exists(TURBA_BASE . '/config/horde.local.php')) {
         include TURBA_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', TURBA_BASE . '/..');
+        define('HORDE_BASE', realpath(TURBA_BASE . '/..'));
     }
 }
 

diff --git a/ulaform/lib/Application.php b/ulaform/lib/Application.php
@@ -15,7 +15,7 @@
 
 /* Determine the base directories. */
 if (!defined('ULAFORM_BASE')) {
-    define('ULAFORM_BASE', __DIR__ . '/..');
+    define('ULAFORM_BASE', realpath(__DIR__ . '/..'));
 }
 
 if (!defined('HORDE_BASE')) {
@@ -24,7 +24,7 @@
     if (file_exists(ULAFORM_BASE . '/config/horde.local.php')) {
         include ULAFORM_BASE . '/config/horde.local.php';
     } else {
-        define('HORDE_BASE', ULAFORM_BASE . '/..');
+        define('HORDE_BASE', realpath(ULAFORM_BASE . '/..'));
     }
 }