modification to get the text entity in case we are dealing with alternative

[squirrelmail.git] / src / webmail.php

diff --git a/src/webmail.php b/src/webmail.php
index 16e4b247d12043a040cd639e1a70e16325341ab7..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>";
 }
 
 /*
@@ -84,7 +86,7 @@ if (!isset($right_frame)) {
 if ($right_frame == 'right_main.php') {
     $urlMailbox = urlencode($mailbox);
     $right_frame_url =
-        "right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage";
+        "right_main.php?mailbox=$urlMailbox&amp;sort=$sort&amp;startMessage=$startMessage";
 } elseif ($right_frame == 'options.php') {
     $right_frame_url = 'options.php';
 } elseif ($right_frame == 'folders.php') {
@@ -103,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>
\ No newline at end of file
+</HEAD></HTML>