Today Cyrus 2.2.2-BETA with SASL Initial Client response was released so it

[squirrelmail.git] / src / webmail.php

diff --git a/src/webmail.php b/src/webmail.php
index ac2bac75bfdb7bbd1b254aa600707496bc9c9391..565c5c079e9db88c9f2d8f50755fcbb5ffc4a2c0 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -31,7 +31,7 @@ if (!function_exists('sqm_baseuri')){
 }
 $base_uri = sqm_baseuri();
 
-session_start();
+sqsession_is_active();
 
 sqgetGlobalVar('username', $username, SQ_SESSION);
 sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
@@ -131,13 +131,16 @@ if ($right_frame == 'right_main.php') {
     $right_frame_url =  $right_frame;
 }
 
+$left_frame  = '<frame src="left_main.php" name="left" frameborder="1" title="'.
+               _("Folder List") ."\" />\n";
+$right_frame = '<frame src="'.$right_frame_url.'" name="right" frameborder="1" title="'.
+               _("Message List") ."\" />\n";
+
 if ($location_of_bar == 'right') {
-    echo "<frame src=\"$right_frame_url\" name=\"right\" frameborder=\"1\" />\n" .
-         "<frame src=\"left_main.php\" name=\"left\" frameborder=\"1\" />\n";
+    echo $right_frame . $left_frame;
 }
 else {
-    echo "<frame src=\"left_main.php\" name=\"left\" frameborder=\"1\" />\n".
-         "<frame src=\"$right_frame_url\" name=\"right\" frameborder=\"1\" />\n";
+    echo $left_frame . $right_frame;
 }
 do_hook('webmail_bottom');
 ?>