Make sure base_uri is correct (submitted by James Lewis)

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

diff --git a/functions/auth.php b/functions/auth.php
index bebc7f87a1739de545b3c994428b94118c809ccb..6ce4e4a69f7c582e3d10ba496cda825a3ee7b645 100644 (file)
--- a/functions/auth.php
+++ b/functions/auth.php
@@ -13,6 +13,15 @@
 
 require_once( '../functions/page_header.php' );
 
+/* If a user opens a new session then comes back to this one,
+ * $base_uri isn't set because it the session is invalid.
+ */
+
+if (! isset($base_uri)) {
+    ereg ('(^.*/)[^/]+/[^/]+$', $PHP_SELF, $regs);
+    $base_uri = $regs[1];
+}
+
 function is_logged_in () {
     global $squirrelmail_language, $frame_top, $base_uri;