OK, so it wants a trailing slash...

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

diff --git a/functions/auth.php b/functions/auth.php
index 0f22c8a0aa367e89939ef8c646ea8f8986868e2c..83affbe6ea4568e484a21f3857ea0851ed3e2f5c 100644 (file)
--- a/functions/auth.php
+++ b/functions/auth.php
@@ -16,7 +16,7 @@
  */
 
 if (!isset($base_uri)) {
-    $base_uri = dirname(dirname($PHP_SELF));
+    $base_uri = dirname(dirname($PHP_SELF)) . "/";
 }
 
 function is_logged_in() {

diff --git a/src/login.php b/src/login.php
index 57a47e93f3f225470d7fe66542a9af08d11a1120..93aa3e37d9036a36b99f4fe6d371f9592d0dfb7b 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -69,7 +69,7 @@ set_up_language($squirrelmail_language, TRUE);
 /**
  * Find out the base URI to set cookies.
  */
-$base_uri = dirname(dirname($PHP_SELF));
+$base_uri = dirname(dirname($PHP_SELF)) . "/";
 @session_destroy();
 
 /*

diff --git a/src/redirect.php b/src/redirect.php
index 9b82bee7aa8ff0e2770da716443a2bd30744749d..34e8a568bc2545a9cec7022e6040756d8e06c354 100644 (file)
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -36,7 +36,7 @@ if (get_magic_quotes_gpc()) {
 
 /* Before starting the session, the base URI must be known. Assuming */
 /* that this file is in the src/ subdirectory (or something).        */
-$base_uri = dirname(dirname($PHP_SELF));
+$base_uri = dirname(dirname($PHP_SELF)) . "/";
 
 header('Pragma: no-cache');
 $location = get_location();

diff --git a/src/signout.php b/src/signout.php
index 01aa236be52f2b7691122696502561de5ce64af0..d8b15ec495c040a402082d0d01816947d886c1a1 100644 (file)
--- a/src/signout.php
+++ b/src/signout.php
@@ -35,7 +35,7 @@ if (!isset($frame_top)) {
 /* If a user hits reload on the last page, $base_uri isn't set
  * because it was deleted with the session. */
 if (!isset($base_uri)) {
-    $base_uri = dirname(dirname($PHP_SELF));
+    $base_uri = dirname(dirname($PHP_SELF)) . "/";
 }
 
 do_hook('logout');

diff --git a/src/webmail.php b/src/webmail.php
index c2768dc8bee885374c626812ec1035a675cc9f51..72f0c0783d789e002632f9c48f4f7b2ae50674ec 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -21,7 +21,7 @@ require_once('../functions/plugin.php');
 require_once('../functions/i18n.php');
 require_once('../functions/auth.php');
 
-$base_uri = dirname(dirname($PHP_SELF));
+$base_uri = dirname(dirname($PHP_SELF)) . "/";
 
 session_start();
 is_logged_in();