Well, apparently base_uri gets destroyed with the session.

[squirrelmail.git] / src / webmail.php

diff --git a/src/webmail.php b/src/webmail.php
index 5504a343ada596b76847cecf67660d9e862cd477..72f0c0783d789e002632f9c48f4f7b2ae50674ec 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -21,8 +21,7 @@ require_once('../functions/plugin.php');
 require_once('../functions/i18n.php');
 require_once('../functions/auth.php');
 
-ereg( '(^.*/)[^/]+/[^/]+$', $PHP_SELF, $regs);
-$base_uri = $regs[1];
+$base_uri = dirname(dirname($PHP_SELF)) . "/";
 
 session_start();
 is_logged_in();
@@ -90,7 +89,6 @@ if ($right_frame == 'right_main.php') {
 } elseif ($right_frame == 'folders.php') {
     $right_frame_url = 'folders.php';
 } elseif ($right_frame == 'compose.php') {
-    $rcptaddress = urlencode($rcptaddress);
     $right_frame_url = "compose.php?send_to=$rcptaddress";
 } else {
     $right_frame_url = 'right_main.php';
@@ -104,7 +102,7 @@ else {
     echo '<FRAME SRC="left_main.php" NORESIZE NAME="left">'.
          "<FRAME SRC=\"$right_frame_url\" NORESIZE NAME=\"right\">";
 }
-
+do_hook('webmail_bottom');
 ?>
 </FRAMESET>
 </HEAD></HTML>