parsing $message to magicHTML for better handling message/rfc822 attachments

[squirrelmail.git] / src / webmail.php

diff --git a/src/webmail.php b/src/webmail.php
index 5504a343ada596b76847cecf67660d9e862cd477..0220d843a86f9004a4679dec33b5606c128aa62f 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -21,8 +21,10 @@ require_once('../functions/plugin.php');
 require_once('../functions/i18n.php');
 require_once('../functions/auth.php');
 
-ereg( '(^.*/)[^/]+/[^/]+$', $PHP_SELF, $regs);
-$base_uri = $regs[1];
+if (!function_exists('sqm_baseuri')){
+    require_once('../functions/display_messages.php');
+}
+$base_uri = sqm_baseuri();
 
 session_start();
 is_logged_in();
@@ -59,10 +61,10 @@ if ($left_size == "") {
 }
 
 if ($location_of_bar == 'right') {
-    echo "<FRAMESET COLS=\"*, $left_size\" BORDER=0>";
+    echo "<FRAMESET COLS=\"*, $left_size\" BORDER=0 ID=fs1>";
 }
 else {
-    echo "<FRAMESET COLS=\"$left_size, *\" BORDER=0>";
+    echo "<FRAMESET COLS=\"$left_size, *\" BORDER=0 ID=fs1>";
 }
 
 /*
@@ -90,7 +92,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 +105,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>