Obsolete sqm_topdir(), thanks Jimmy Connor for the tip.

sqm_topdir breaks installs that have open_basedir set, and it was only
used in one place, functionality has been superseded by SM_PATH.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4429 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index 06b7f24011fa55272f9d5adec6654b8eaa5baccf..3e0eaa7c099ba13de7f8fb4e51673e5cf097bfef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,8 @@ Version 1.4.0 RC 2
   - Try better to get the filename of an attachment.
   - Deliver_SMTP class now uses HTTP_HOST in SMTP HELO.  Should fix DNS
     issues some people have reported. (Closes #560524)
+  - Obsolete sqm_topdir(), which caused login trouble with installs that
+    have open_basedir restrictions. Thanks Jimmy Connor.
        
 Version 1.4.0 RC 1
 ------------------

diff --git a/functions/display_messages.php b/functions/display_messages.php
index ce404da4a28bc1437e05c469e892d654ab5bc7f4..e021557dee3b8398da02075c5ba0c3d77f8cbaeb 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -34,27 +34,6 @@ function sqm_baseuri(){
     return $base_uri;
 }
 
-/**
- * Find out the top REAL path of the squirrelmail installation.
- *
- * @return  the real installation directory of squirrelmail.
- */
-
-function sqm_topdir(){
-    $topdir = '';
-    /**
-     * $levels is just to avoid a potential infinite loop in case
-     * things are REALLY broken. Shouldn't really ever happen.
-     */
-    $levels = 0;
-    while (!(is_dir("$topdir/functions") && is_dir("$topdir/src"))
-           && $levels < 10){
-        $topdir .= '../';
-        $levels++;
-    }
-    return $topdir;
-}
-
 function error_username_password_incorrect() {
     global $frame_top, $color;
     /* XXX: Should really not start the HTML before this, or close off more
@@ -96,11 +75,11 @@ function logout_error( $errString, $errTitle = '' ) {
            $hide_sm_attributions, $version, $squirrelmail_language;
 
     $base_uri = sqm_baseuri();
-    $topdir = sqm_topdir();
-    include_once( "$topdir/functions/page_header.php" );
+
+    include_once( SM_PATH . 'functions/page_header.php' );
     if ( !isset( $org_logo ) ) {
         // Don't know yet why, but in some accesses $org_logo is not set.
-        include( "$topdir/config/config.php" );
+        include( SM_PATH . 'config/config.php' );
     }
     /* Display width and height like good little people */
     $width_and_height = '';