From 1d80c108a1d741b7dcb562ea1cf6d2214322b192 Mon Sep 17 00:00:00 2001
From: cigamit <cigamit@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 1 Dec 2003 18:51:07 +0000
Subject: [PATCH] Added support for using Squirrelmail without frames (With
 many thanks to Jason Wickers (jwickers at scs.wsu.edu)) ---- There are still
 a few minor things to iron out, but overall it works fairly well at this
 point.  Any plugin that calls DisplayPageHeader() will now have to replace
 their </body></html> with a simple call to noframes_bottom() to be
 compatible... (Possibly rename that function to DisplayPageFooter in the
 future)

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@6225 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 AUTHORS                                       |   1 +
 ChangeLog                                     |   1 +
 config/conf.pl                                |  57 +++++++-
 functions/global.php                          |   4 +-
 functions/mailbox_display.php                 |  21 ++-
 functions/page_header.php                     |  16 ++-
 include/validate.php                          |   1 +
 plugins/abook_take/take.php                   |   5 +-
 plugins/administrator/options.php             |   4 +-
 plugins/bug_report/bug_report.php             |   3 +-
 plugins/calendar/calendar.php                 |   2 +-
 plugins/calendar/day.php                      |   3 +-
 plugins/calendar/event_create.php             |   3 +-
 plugins/calendar/event_delete.php             |   3 +-
 plugins/calendar/event_edit.php               |   3 +-
 plugins/filters/options.php                   |   3 +-
 plugins/filters/spamoptions.php               |   5 +-
 plugins/info/options.php                      |   4 +-
 plugins/listcommands/mailout.php              |   6 +-
 plugins/mail_fetch/fetch.php                  |   5 +-
 plugins/mail_fetch/options.php                |   5 +-
 .../message_details/message_details_top.php   |   2 +-
 plugins/message_details/setup.php             |   2 +-
 plugins/newmail/newmail_opt.php               |   6 +-
 plugins/newmail/sounds/FanFair.wav            | Bin 5814 -> 595 bytes
 plugins/newmail/sounds/Friends.wav            | Bin 3190 -> 603 bytes
 plugins/newmail/sounds/MontyPython.wav        | Bin 6570 -> 233 bytes
 plugins/newmail/sounds/Notify.wav             | Bin 4522 -> 99 bytes
 plugins/spamcop/options.php                   |   4 +-
 plugins/spamcop/spamcop.php                   |   3 +-
 plugins/squirrelspell/sqspell_functions.php   |   2 +-
 plugins/translate/options.php                 |   4 +-
 src/addrbook_search_html.php                  |  12 +-
 src/addressbook.php                           |   7 +-
 src/compose.php                               |   3 +-
 src/empty_trash.php                           |   5 +-
 src/folders.php                               |  33 +++--
 src/help.php                                  |   5 +-
 src/image.php                                 |   4 +-
 src/left_main.php                             | 135 +++++++++++-------
 src/login.php                                 |  35 ++++-
 src/move_messages.php                         |   4 +-
 src/options.php                               |  13 +-
 src/options_highlight.php                     |   3 +-
 src/options_identities.php                    |   5 +-
 src/options_order.php                         |   2 +-
 src/read_body.php                             |   5 +-
 src/redirect.php                              |  22 +++
 src/right_main.php                            |   5 +-
 src/search.php                                |   4 +-
 src/vcard.php                                 |   6 +-
 src/view_header.php                           |   2 +-
 src/view_text.php                             |   6 +-
 src/webmail.php                               |  39 ++++-
 54 files changed, 376 insertions(+), 157 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 849a704e..4d54627a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,6 +17,7 @@ THE SQUIRRELMAIL TEAM
    Seth E. Randall	<sethr@missoulafcu.org>
    Thijs Kinkhorst	<kink@squirrelmail.org>
    Tomas Kuliavas	<tokul@users.sourceforge.net>	http://www.topolis.lt
+   Jimmy Conner		<jimmy@advcs.org>		http://sqmail.org
 
  Past Developers, now retired:
  -----------------------------
diff --git a/ChangeLog b/ChangeLog
index a1d2a08e..4c27bbe4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -110,6 +110,7 @@ Version 1.5.0 -- CVS
     accidentally disappeared in the past.
   - Disabled Quick-email-reporting feature in spamcop plugin. Bug.809452. Admin
     can enable it by setting variable in plugins/spamcop/setup.php
+  - Added support for using Squirrelmail without frames
 
 **************************************
 *** SquirrelMail Stable Series 1.4 ***
diff --git a/config/conf.pl b/config/conf.pl
index f2cd4071..ed78e042 100755
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -354,6 +354,9 @@ if (!$session_name ) {
 if (!$show_alternative_names ) {
 	$show_alternative_names = 'false';
 }
+if ( !$allow_frames ) {
+    $allow_frames = 1;
+}
 
 if (!$available_languages ) {
 	$available_languages = 'all';
@@ -539,11 +542,25 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
         print "6.  Allow use of priority       : $WHT$default_use_priority$NRM\n";
         print "7.  Hide SM attributions        : $WHT$hide_sm_attributions$NRM\n";
         print "8.  Allow use of receipts       : $WHT$default_use_mdn$NRM\n";
-        print "9. Allow editing of identity   : $WHT$edit_identity$NRM/$WHT$edit_name$NRM\n";
+        print "9.  Allow editing of identity   : $WHT$edit_identity$NRM/$WHT$edit_name$NRM\n";
         print "10. Allow server thread sort    : $WHT$allow_thread_sort$NRM\n";
         print "11. Allow server-side sorting   : $WHT$allow_server_sort$NRM\n";
         print "12. Allow server charset search : $WHT$allow_charset_search$NRM\n";
 	print "13. PHP session name            : $WHT$session_name$NRM\n";
+	print "14. HTML Frame Settings         : $WHT";
+        if ( $allow_frames == 1) {
+	   print "Force Frames Only";
+        }
+        if ( $allow_frames == 2) {
+           print "Force No Frames Only";
+        }
+        if ( $allow_frames == 3) {
+           print "User Select, Default to Frames";
+        }
+        if ( $allow_frames == 4) {
+           print "User Select, Default to No Frames";
+        }
+        print "$NRM\n";
         print "\n";
         print "R   Return to Main Menu\n";
     } elsif ( $menu == 5 ) {
@@ -758,7 +775,8 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
             elsif ( $command == 10 ) { $allow_thread_sort        = command312(); }
             elsif ( $command == 11 ) { $allow_server_sort        = command313(); }
             elsif ( $command == 12 ) { $allow_charset_search     = command314(); }
-			elsif ( $command == 13 ) { $session_name             = command316(); }
+            elsif ( $command == 13 ) { $session_name             = command316(); }
+            elsif ( $command == 14 ) { $allow_frames             = command317(); }
         } elsif ( $menu == 5 ) {
             if ( $command == 1 ) { command41(); }
             elsif ( $command == 2 ) { $theme_css = command42(); }
@@ -2208,7 +2226,28 @@ sub command316 {
     return $new_session_name;
 }
 
-
+sub command317 {
+    print "This option allows you to select whether to allow or disallow frames\n";
+    print "or no frames usage, and what to default to on the login screen.\n";
+    print "Note: When a user selects to use Frames or No Frames, it is stored\n";
+    print "      in a cookie, which will override the site default when they\n";
+    print "      next visit the login page.\n";
+     if ($allow_frames == 1) { print "--> "; }else{print "    ";}
+    print "1.  Force Frames Only\n";
+    if ($allow_frames == 2) { print "--> "; }else{print "    ";}
+    print "2.  Force No Frames Only\n";
+    if ($allow_frames == 3) { print "--> "; }else{print "    ";}
+    print "3.  User Select, Default to Frames\n";
+    if ($allow_frames == 4) { print "--> "; }else{print "    ";}
+    print "4.  User Select, Default to No Frames\n";
+    print "(1-4): ";
+    $new_allow_frames = <STDIN>;
+    $new_allow_frames =~ tr/1-4//cd;  # only want digits!
+    if ( $new_allow_frames < 1 || $new_allow_frames > 4 ) {
+       $new_allow_frames = $allow_frames;
+    }
+    return $new_allow_frames;
+}
 
 sub command41 {
     print "\nDefine the themes that you wish to use.  If you have added ";
@@ -3096,12 +3135,16 @@ sub save_data {
 		print CF "\$smtp_auth_mech = '$smtp_auth_mech';\n";
 		print CF "\$imap_auth_mech = '$imap_auth_mech';\n";
 	# boolean
-	    print CF "\$use_imap_tls = $use_imap_tls;\n";
-		print CF "\$use_smtp_tls = $use_smtp_tls;\n";
+	print CF "\$use_imap_tls = $use_imap_tls;\n";
+	print CF "\$use_smtp_tls = $use_smtp_tls;\n";
+
+	print CF "\$session_name = '$session_name';\n";
 
-		print CF "\$session_name = '$session_name';\n";
+	print CF "\n";
+
+	print CF "\$allow_frames = $allow_frames;\n";
 
-	    print CF "\n";
+	print CF "\n";
 
 	# boolean
 	print CF "\$advanced_tree = $advanced_tree;\n";
diff --git a/functions/global.php b/functions/global.php
index 3b06a8e3..8ef497c8 100644
--- a/functions/global.php
+++ b/functions/global.php
@@ -155,7 +155,7 @@ function sqsession_register ($var, $name) {
     else {
         $_SESSION["$name"] = $var; 
     }
-    session_register("$name");
+    @session_register("$name");
 }
 
 /**
@@ -174,7 +174,7 @@ function sqsession_unregister ($name) {
     else {
         unset($_SESSION[$name]);
     }
-    session_unregister("$name");
+    @session_unregister("$name");
 }
 
 /**
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index aa15493b..e7b4c39c 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -1001,11 +1001,15 @@ function get_msgcnt_str($start_msg, $end_msg, $num_msgs) {
  * Generate a paginator link.
  */
 function get_paginator_link($box, $start_msg, $use, $text) {
-    global $PHP_SELF;
+    global $PHP_SELF, $use_frames;
+    if ($use_frames)
+        $target = 'right';
+    else
+        $target = '';
 
     $result = "<A HREF=\"right_main.php?use_mailbox_cache=$use"
             . "&amp;startMessage=$start_msg&amp;mailbox=$box\" "
-            . "TARGET=\"right\">$text</A>";
+            . "TARGET=\"$target\">$text</A>";
     return ($result);
 /*
     if (preg_match('/^(.+)\?.+$/',$PHP_SELF,$regs)) {
@@ -1016,7 +1020,7 @@ function get_paginator_link($box, $start_msg, $use, $text) {
 
     $result = '<A HREF="'. $source_url . "?use_mailbox_cache=$use"
             . "&amp;startMessage=$start_msg&amp;mailbox=$box\" "
-            . "TARGET=\"right\">$text</A>";
+            . "TARGET=\"$target\">$text</A>";
     return ($result);
 */
 }
@@ -1026,7 +1030,7 @@ function get_paginator_link($box, $start_msg, $use, $text) {
  */
 function get_paginator_str($box, $start_msg, $end_msg, $num_msgs,
                            $show_num, $sort) {
-    global $username, $data_dir, $use_mailbox_cache, $color, $PG_SHOWNUM;
+    global $username, $data_dir, $use_mailbox_cache, $color, $PG_SHOWNUM, $use_frames;
 
     /* Initialize paginator string chunks. */
     $prv_str = '';
@@ -1035,6 +1039,11 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs,
     $all_str = '';
     $tgl_str = '';
 
+    if ($use_frames)
+        $target = 'right';
+    else
+        $target = '';
+
     $box = urlencode($box);
 
     /* Create simple strings that will be creating the paginator. */
@@ -1188,14 +1197,14 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs,
     } else if ($PG_SHOWNUM == 999999) {
         $pg_str = "<A HREF=\"right_main.php?PG_SHOWALL=0"
                 . "&amp;use_mailbox_cache=$use&amp;startMessage=1&amp;mailbox=$box\" "
-                . "TARGET=\"right\">" ._("Paginate") . '</A>' . $spc;
+                . "TARGET=\"$target\">" ._("Paginate") . '</A>' . $spc;
     }
 
     /* If necessary, compute the 'show all' string. */
     if (($prv_str != '') || ($nxt_str != '')) {
         $all_str = "<A HREF=\"right_main.php?PG_SHOWALL=1"
                  . "&amp;use_mailbox_cache=$use&amp;startMessage=1&amp;mailbox=$box\" "
-                 . "TARGET=\"right\">" . _("Show All") . '</A>';
+                 . "TARGET=\"$target\">" . _("Show All") . '</A>';
     }
 
     /* Last but not least, get the value for the toggle all link. */
diff --git a/functions/page_header.php b/functions/page_header.php
index 5aca335a..9999df71 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -87,10 +87,14 @@ ECHO;
  * @param string target the target frame for this link
  */
 function makeInternalLink($path, $text, $target='') {
+    global $use_frames;
     sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
-    if ($target != '') {
-        $target = " target=\"$target\"";
-    }
+    if (isset($use_frames) && $use_frames) {
+        if ($target != '')
+            $target = " target=\"$target\"";
+    } else 
+       $target='';
+
     $hooktext = do_hook_function('internal_link',$text);
     if ($hooktext != '')
         $text = $hooktext;
@@ -275,6 +279,8 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
     }
 
     echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\" $onload>\n\n";
+    noframes_top();
+
     /** Here is the header and wrapping table **/
     $shortBoxName = imap_utf7_decode_local(
 		      readShortMailboxName($mailbox, $delimiter));
@@ -398,6 +404,8 @@ function compose_Header($color, $mailbox) {
     }
 
     echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\" $onload>\n\n";
+
+
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/include/validate.php b/include/validate.php
index 8738cc35..00fbb9cd 100644
--- a/include/validate.php
+++ b/include/validate.php
@@ -43,6 +43,7 @@ require_once(SM_PATH . 'class/mime.class.php');
 require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'config/config.php');
+require_once(SM_PATH . 'functions/noframes.php');
 
 /* set the name of the session cookie */
 if(isset($session_name) && $session_name) {
diff --git a/plugins/abook_take/take.php b/plugins/abook_take/take.php
index 8e5e5a88..ed18e8f6 100644
--- a/plugins/abook_take/take.php
+++ b/plugins/abook_take/take.php
@@ -113,5 +113,6 @@ echo '<form action="../../src/addressbook.php" name="f_add" method="post">' ."\n
     '</table>';
     }
 ?>
-</form></body>
-</html>
+</form>
+<?php noframes_bottom(); ?>
+
diff --git a/plugins/administrator/options.php b/plugins/administrator/options.php
index 7f95e5b6..f5ba00d1 100644
--- a/plugins/administrator/options.php
+++ b/plugins/administrator/options.php
@@ -606,4 +606,6 @@ if( $fp = @fopen( $cfgfile, 'w' ) ) {
          _("Config file can't be opened. Please check config.php.").
          '</font>';
 }
-?>
+noframes_bottom();
+
+?>
\ No newline at end of file
diff --git a/plugins/bug_report/bug_report.php b/plugins/bug_report/bug_report.php
index ad8fb3bb..344b093b 100644
--- a/plugins/bug_report/bug_report.php
+++ b/plugins/bug_report/bug_report.php
@@ -196,4 +196,5 @@ $body = htmlspecialchars($body_top . $body);
    </tr>
    </table>
    </form>
-</body></html>
+<?php noframes_bottom(); ?>
+
diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 8091cf9e..659738c3 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -176,5 +176,5 @@ startcalendar();
 drawmonthview();
 endcalendar();
 
+noframes_bottom();
 ?>
-</body></html>
diff --git a/plugins/calendar/day.php b/plugins/calendar/day.php
index 3eff1df7..e3a9a732 100644
--- a/plugins/calendar/day.php
+++ b/plugins/calendar/day.php
@@ -179,4 +179,5 @@ initialize_events();
 display_events();
 ?>
 </table></td></tr></table>
-</body></html>
+<?php noframes_bottom(); ?>
+
diff --git a/plugins/calendar/event_create.php b/plugins/calendar/event_create.php
index c10aaed7..a439ffc1 100644
--- a/plugins/calendar/event_create.php
+++ b/plugins/calendar/event_create.php
@@ -208,4 +208,5 @@ if(!isset($event_text)){
 
 ?>
 </table></td></tr></table>
-</body></html>
+<? php noframes_bottom(); ?>
+
diff --git a/plugins/calendar/event_delete.php b/plugins/calendar/event_delete.php
index eee5ab0f..b45863e9 100644
--- a/plugins/calendar/event_delete.php
+++ b/plugins/calendar/event_delete.php
@@ -177,4 +177,5 @@ if (isset($dyear) && isset($dmonth) && isset($dday) && isset($dhour) && isset($d
 
 ?>
 </table></td></tr></table>
-</body></html>
+<?php noframes_bottom(); ?>
+
diff --git a/plugins/calendar/event_edit.php b/plugins/calendar/event_edit.php
index 9331262c..a5e6be16 100644
--- a/plugins/calendar/event_edit.php
+++ b/plugins/calendar/event_edit.php
@@ -327,4 +327,5 @@ if (!isset($updated)){
 
 ?>
 </table></td></tr></table>
-</body></html>
+<?php noframes_bottom(); ?>
+
diff --git a/plugins/filters/options.php b/plugins/filters/options.php
index 3d2f60ae..74eb85f5 100644
--- a/plugins/filters/options.php
+++ b/plugins/filters/options.php
@@ -239,5 +239,6 @@ sqgetGlobalVar('action', $action, SQ_GET);
                 html_tag( 'td', '&nbsp;', 'left' )
             ) ,
         'center', '', 'width="80%" border="0" cellpadding="2" cellspacing="0"' );
-    echo '</body></html>';
+    noframes_bottom();
+
 ?>
\ No newline at end of file
diff --git a/plugins/filters/spamoptions.php b/plugins/filters/spamoptions.php
index 7f6491c7..52c255bc 100644
--- a/plugins/filters/spamoptions.php
+++ b/plugins/filters/spamoptions.php
@@ -178,7 +178,8 @@ if (isset($action) && $action == 'spam') {
         '</table>'.
         '</center>'.
         '</form>';
-    echo '</body></html>';
+        noframes_bottom();
+
 }
 
 if (! isset($_GET['action']) || $_GET['action'] != 'spam') {
@@ -221,7 +222,7 @@ if (! isset($_GET['action']) || $_GET['action'] != 'spam') {
         echo "</td></tr>\n";
     }
     echo '</table>';
-    echo '</body></html>';
+    noframes_bottom();
 }
 
 ?>
\ No newline at end of file
diff --git a/plugins/info/options.php b/plugins/info/options.php
index 9eb2ce69..c5f2a352 100644
--- a/plugins/info/options.php
+++ b/plugins/info/options.php
@@ -157,7 +157,9 @@ if ($submit == 'submit') {
         print "</TD><TR></TABLE></CENTER><BR>\n";
     }
 }
-    print "</TD></TR></TABLE></CENTER></BODY></HTML>";
+    print "</TD></TR></TABLE></CENTER>";
+    noframes_bottom();
+
     sqimap_logout($imap_stream);
     do_hook('info_bottom');
 ?>
diff --git a/plugins/listcommands/mailout.php b/plugins/listcommands/mailout.php
index 5d08b20b..4af179fb 100644
--- a/plugins/listcommands/mailout.php
+++ b/plugins/listcommands/mailout.php
@@ -76,5 +76,7 @@ echo '<br />'
 . '<input type="hidden" name="body" value="' . htmlspecialchars($body) . '">'
 . '<input type="hidden" name="mailbox" value="' . htmlspecialchars($mailbox) . '">'
 . '<input type="submit" name="send" value="' . _("Send Mail") . '"><br /><br /></center>'
-. '</form></td></tr></table></p></body></html>';
-?>
+. '</form></td></tr></table></p>';
+noframes_bottom();
+
+?>
\ No newline at end of file
diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php
index 26260ed5..0a7c73ba 100644
--- a/plugins/mail_fetch/fetch.php
+++ b/plugins/mail_fetch/fetch.php
@@ -127,7 +127,7 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
         echo '<p>' . _("No POP3 servers configured yet.") . '</p>';
         displayInternalLink('plugins/mail_fetch/options.php',
             _("Click here to go to the options page.") );
-        echo '</body></html>';
+        noframes_bottom();
         exit();
     }
 
@@ -321,5 +321,4 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
 
 ?>
 </center>
-</body>
-</html>
+<?php noframes_bottom(); ?>
diff --git a/plugins/mail_fetch/options.php b/plugins/mail_fetch/options.php
index 5ac6ae26..58e036c8 100644
--- a/plugins/mail_fetch/options.php
+++ b/plugins/mail_fetch/options.php
@@ -384,6 +384,5 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
             ) ,
         'center', '', 'width="70%"' );
     }
-
-    ?>
-</body></html>
+    noframes_bottom();
+?>
\ No newline at end of file
diff --git a/plugins/message_details/message_details_top.php b/plugins/message_details/message_details_top.php
index e2808f0e..a9e4b2c1 100644
--- a/plugins/message_details/message_details_top.php
+++ b/plugins/message_details/message_details_top.php
@@ -47,4 +47,4 @@ echo "<body text=\"$color[8]\" bgcolor=\"$color[3]\" link=\"$color[7]\" vlink=\"
      '</b>'.
      '</body>'.
      "</html>\n";
-?>
+?>
\ No newline at end of file
diff --git a/plugins/message_details/setup.php b/plugins/message_details/setup.php
index 7977da8c..d0999e23 100644
--- a/plugins/message_details/setup.php
+++ b/plugins/message_details/setup.php
@@ -52,4 +52,4 @@ function show_message_details() {
     echo $result;
 }
  
-?>
+?>
\ No newline at end of file
diff --git a/plugins/newmail/newmail_opt.php b/plugins/newmail/newmail_opt.php
index edf59b1e..01197b4f 100644
--- a/plugins/newmail/newmail_opt.php
+++ b/plugins/newmail/newmail_opt.php
@@ -158,7 +158,7 @@ if ($allowsound == "true") {
                  ) . "\n" .
       '</table>'. "\n" .
    '</form>'. "\n" .
-   '</td></tr></table>'. "\n" .
-'</body></html>';
+   '</td></tr></table>'. "\n";
+   noframes_bottom();
 
-?>
+?>
\ No newline at end of file
diff --git a/plugins/newmail/sounds/FanFair.wav b/plugins/newmail/sounds/FanFair.wav
index 697371e21732d80ecf6dba0a813e1e9bb78bb724..c178c9663f183ab933ab9ceca8c7b10116d01c4e 100644
GIT binary patch
delta 7
Ocmdm{dzocJFcSa__5#2F

delta 5268
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
QhNBAu_ZwdBL7uRG0RX#FmH+?%

diff --git a/plugins/newmail/sounds/Friends.wav b/plugins/newmail/sounds/Friends.wav
index b9397de08956c56a515ffd02f1f766f5a219ff11..b1d9bd21f8f3803b3fc24ac9c3c7848aecbc4c9d 100644
GIT binary patch
delta 7
Ocmew+ahqjBG!p<0a02@P

delta 2615
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

diff --git a/plugins/newmail/sounds/MontyPython.wav b/plugins/newmail/sounds/MontyPython.wav
index 0dc3655808e91801cf27cfd97a96eaf116e5cbe8..b2a2b6d85fa6cef2861296e0ef802fa2defd9061 100644
GIT binary patch
delta 6
NcmZ2w{E~6PO8^S713>@)

literal 6570
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

diff --git a/plugins/newmail/sounds/Notify.wav b/plugins/newmail/sounds/Notify.wav
index 658bc7f03420e02c8a780d520249a57e0584a8a2..cb922c250c84a43c4eb18bd57c6bf67870d2c9de 100644
GIT binary patch
delta 5
McmZ3boID{J00xf&Bme*a

literal 4522
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
Qtg`YANf`x6nHvD`ACos}dH?_b

diff --git a/plugins/spamcop/options.php b/plugins/spamcop/options.php
index 8c4c1e0e..5d3ef5b3 100755
--- a/plugins/spamcop/options.php
+++ b/plugins/spamcop/options.php
@@ -172,5 +172,5 @@ echo "</p>\n";
 echo "<p>";
 echo _("<b>For more information</b> about SpamCop, it's services, spam in general, and many related topics, try reading through SpamCop's <a href=\"http://spamcop.net/help.shtml\">Help and Feedback</a> section.");
 echo "</p>\n";
-?>
-</body></html>
+noframes_bottom();
+?>
\ No newline at end of file
diff --git a/plugins/spamcop/spamcop.php b/plugins/spamcop/spamcop.php
index c7b1397c..0fb65efa 100644
--- a/plugins/spamcop/spamcop.php
+++ b/plugins/spamcop/spamcop.php
@@ -189,5 +189,4 @@ echo "</p>";
 </td>
 </tr>
 </table>
-  </body>
-</html>
+<?php noframes_bottom(); ?>
diff --git a/plugins/squirrelspell/sqspell_functions.php b/plugins/squirrelspell/sqspell_functions.php
index 43a03133..ffda1b3d 100644
--- a/plugins/squirrelspell/sqspell_functions.php
+++ b/plugins/squirrelspell/sqspell_functions.php
@@ -76,7 +76,7 @@ function sqspell_makePage($title, $scriptsrc, $body){
     . html_tag( 'tr',
           html_tag( 'td', 'SquirrelSpell ' . $SQSPELL_VERSION, 'center', $color[9] )
       ) . "\n</table>\n";
-  echo '</body></html>';
+  noframes_bottom();
 }
 
 /**
diff --git a/plugins/translate/options.php b/plugins/translate/options.php
index ed6170b7..1636bfb3 100644
--- a/plugins/translate/options.php
+++ b/plugins/translate/options.php
@@ -185,7 +185,7 @@ require_once(SM_PATH . 'include/load_prefs.php');
         '<input type="submit" value="' . _("Submit") . '" name="submit_translate">'.
         '</td></tr>'.
    '</table>'.
-   '</form>'.
-"</body></html>\n";
+   '</form>';
+   noframes_bottom();
 
 ?>
diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 887c9370..e9702ac5 100644
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -276,14 +276,14 @@ else {
             echo html_tag( 'p', '<b><br>' .
                              _("Your search failed with the following error(s)") .
                             ':<br>' . $abook->error . "</b>\n" ,
-                   'center' ) .
-            "\n</BODY></HTML>\n";
+                   'center' );
+            noframes_bottom();
         } else {
             if (sizeof($res) == 0) {
                 echo html_tag( 'p', '<br><b>' .
                                  _("No persons matching your search was found") . "</b>\n" ,
-                       'center' ) .
-                "\n</BODY></HTML>\n";
+                       'center' );
+                noframes_bottom();
             } else {
                 addr_display_result($res);
             }
@@ -299,5 +299,5 @@ if ($addrquery == '' || sizeof($res) == 0) {
          '</form></center></nobr>';
 }
 
-?>
-</body></html>
+noframes_bottom();
+?>
\ No newline at end of file
diff --git a/src/addressbook.php b/src/addressbook.php
index a01466db..d8d53bf1 100644
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -282,7 +282,7 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P
 
     // Some times we end output before forms are printed
     if($abortform) {
-       echo "</BODY></HTML>\n";
+       noframes_bottom();
        exit();
     }
 }
@@ -436,6 +436,5 @@ echo '</FORM>';
 
 /* Add hook for anything that wants on the bottom */
 do_hook('addressbook_bottom');
-?>
-
-</BODY></HTML>
+noframes_bottom();
+?>
\ No newline at end of file
diff --git a/src/compose.php b/src/compose.php
index 2bdacca4..36a1fb86 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -1166,7 +1166,8 @@ function showInputForm ($session, $values=false) {
     }
 
     do_hook('compose_bottom');
-    echo '</BODY></HTML>' . "\n";
+    if ($compose_new_win != '1')
+       noframes_bottom();
 }
 
 
diff --git a/src/empty_trash.php b/src/empty_trash.php
index b34af88c..8f2c322f 100644
--- a/src/empty_trash.php
+++ b/src/empty_trash.php
@@ -67,7 +67,10 @@ for ($i = 0; $i < $numboxes; $i++) {
 walkTreeInPreOrderEmptyTrash(0, $imap_stream, $foldersTree);
 
 $location = get_location();
-header ("Location: $location/left_main.php");
+if (isset($use_frames) && !$use_frames)
+    header ("Location: $location/right_main.php");
+else
+    header ("Location: $location/left_main.php");
 
 sqimap_logout($imap_stream);
 ?>
diff --git a/src/folders.php b/src/folders.php
index 7e4966ee..866f9d42 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -72,15 +72,25 @@ if ( isset($success) && $success ) {
 
     $td_str .= '</b><br>';        
 
-
-    echo html_tag( 'table',
-                html_tag( 'tr',
-                     html_tag( 'td', $td_str .
-                               '<a href="../src/left_main.php" target=left>' .
-                               _("refresh folder list") . '</a>' ,
-                     'center' )
-                ) ,
-            'center', '', 'width="100%" cellpadding="4" cellspacing="0" border="0"' );
+    if (isset($use_frames) && $use_frames) {
+        echo html_tag( 'table',
+                    html_tag( 'tr',
+                         html_tag( 'td', $td_str .
+                                   '<a href="' . SM_PATH . 'src/left_main.php" target=left>' .
+                                   _("refresh folder list") . '</a>' ,
+                         'center' )
+                    ) ,
+                'center', '', 'width="100%" cellpadding="4" cellspacing="0" border="0"' );
+    } else { 
+        echo html_tag( 'table',
+                    html_tag( 'tr',
+                         html_tag( 'td', $td_str .
+                                   '<a href="' . SM_PATH . 'src/folders.php">' .
+                                   _("refresh folder list") . '</a>' ,
+                         'center' )
+                    ) ,
+                'center', '', 'width="100%" cellpadding="4" cellspacing="0" border="0"' );
+    }
 }
 
 echo "\n<br>";
@@ -336,6 +346,5 @@ do_hook('folders_bottom');
 
 <?php
    sqimap_logout($imapConnection);
-?>
-
-</body></html>
+   noframes_bottom();
+?>
\ No newline at end of file
diff --git a/src/help.php b/src/help.php
index 3d9fec9c..d37b1704 100644
--- a/src/help.php
+++ b/src/help.php
@@ -208,5 +208,6 @@ do_hook('help_bottom');
 echo html_tag( 'tr',
             html_tag( 'td', '&nbsp;', 'left', $color[0] )
         ).
-       '</table></body></html>';
-?>
+       '</table>';
+       noframes_bottom();
+?>
\ No newline at end of file
diff --git a/src/image.php b/src/image.php
index a91f96a4..11d26624 100644
--- a/src/image.php
+++ b/src/image.php
@@ -61,6 +61,6 @@ echo '</b></td></tr>' . "\n" .
     '<img src="' . $DownloadLink . '">' .
 
     '</TD></TR></TABLE>' . "\n";
-    '</body></html>' . "\n";
+    noframes_bottom();
 
-?>
+?>
\ No newline at end of file
diff --git a/src/left_main.php b/src/left_main.php
index 4282f5d8..5a11258f 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -14,7 +14,9 @@
  */
 
 /** Path for SquirrelMail required files. */
-define('SM_PATH','../');
+if (!defined('SM_PATH'))
+   define('SM_PATH','../');
+
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
@@ -36,11 +38,14 @@ function formatMailboxName($imapConnection, $box_array) {
            $color, $move_to_sent, $move_to_trash,
            $unseen_notify, $unseen_type, $collapse_folders,
            $draft_folder, $save_as_draft,
-           $use_special_folder_color;
+           $use_special_folder_color, $use_frames;
     $real_box = $box_array['unformatted'];
     $mailbox = str_replace('&nbsp;','',$box_array['formatted']);
     $mailboxURL = urlencode($real_box);
-
+    if ($use_frames)
+       $target = 'right';
+    else
+       $target = '';
     /* Strip down the mailbox name. */
     if (ereg("^( *)([^ ]*)$", $mailbox, $regs)) {
         $mailbox = $regs[2];
@@ -65,8 +70,8 @@ function formatMailboxName($imapConnection, $box_array) {
 
     /* Create the link for this folder. */
     if ($status !== false) {
-    $line .= '<a href="right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox='.
-                $mailboxURL.'" TARGET="right" STYLE="text-decoration:none">';
+    $line .= '<a href="' . SM_PATH . 'src/right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox='.
+                $mailboxURL.'" TARGET="' . $target . '" STYLE="text-decoration:none">';
     }
     if ($special_color) {
         $line .= "<font color=\"$color[11]\">";
@@ -99,7 +104,7 @@ function formatMailboxName($imapConnection, $box_array) {
         if (($numMessages > 0) or ($box_array['parent'] == 1)) {
             $urlMailbox = urlencode($real_box);
             $line .= "\n<small>\n" .
-                    "&nbsp;&nbsp;(<A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A>)" .
+                    "&nbsp;&nbsp;(<A HREF=\"" . SM_PATH . "src/empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A>)" .
                     "</small>";
         } else {
 	   $line .= concat_hook_function('left_main_after_each_folder',
@@ -170,9 +175,12 @@ function create_collapse_link($boxnum) {
     global $boxes, $imapConnection, $unseen_notify, $color;
     $mailbox = urlencode($boxes[$boxnum]['unformatted']);
 
+
     /* Create the link for this collapse link. */
+
     $link = '<a target="left" style="text-decoration:none" ' .
-            'href="left_main.php?';
+        'href="' . SM_PATH . 'src/left_main.php?';
+
     if ($boxes[$boxnum]['collapse'] == SM_BOX_COLLAPSED) {
         $link .= "unfold=$mailbox\">+";
     } else {
@@ -287,7 +295,7 @@ function is_parent_box($curbox_name, $parbox_name) {
 
 function ListBoxes ($boxes, $j=0 ) {
     global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
-           $move_to_trash, $trash_folder, $collapse_folders, $imapConnection;
+           $move_to_trash, $trash_folder, $collapse_folders, $imapConnection, $use_frames;
 
     $pre = '<nobr>';
     $end = '';
@@ -343,8 +351,10 @@ function ListBoxes ($boxes, $j=0 ) {
         if (isset($boxes->mbxs[0]) && $collapse_folders) {
             $collapse = getPref($data_dir, $username, 'collapse_folder_' . $mailbox);
             $collapse = ($collapse == '' ? SM_BOX_UNCOLLAPSED : $collapse);
-
-            $link = '<a target="left" style="text-decoration:none" ' .'href="left_main.php?';
+            if ($use_frames)
+                $link = '<a target="left" style="text-decoration:none" ' .'href="' . SM_PATH . 'src/left_main.php?';
+            else
+                $link = '<a style="text-decoration:none" ' .'href="' . SM_PATH . 'src/right_main.php?';
             if ($collapse) {
                 $link .= "unfold=$mailboxURL\">$leader+&nbsp;</tt>";
             } else {
@@ -356,6 +366,11 @@ function ListBoxes ($boxes, $j=0 ) {
             $pre.= $leader . '&nbsp;&nbsp;</tt>';
         }
 
+        if ($use_frames)
+            $target = 'right';
+        else
+            $target = '';
+
         /* If there are unseen message, bold the line. */
         if (($move_to_trash) && ($mailbox == $trash_folder)) {
             if (! isset($boxes->total)) {
@@ -364,7 +379,7 @@ function ListBoxes ($boxes, $j=0 ) {
             if ($unseen > 0) {
                 $pre .= '<b>';
             }
-            $pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;sort=0;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
+            $pre .= "<a href=\"" . SM_PATH . "src/right_main.php?PG_SHOWALL=0&amp;sort=0;startMessage=1&amp;mailbox=$mailboxURL\" target=\"$target\" style=\"text-decoration:none\">";
             if ($unseen > 0) {
                 $end .= '</b>';
             }
@@ -373,7 +388,7 @@ function ListBoxes ($boxes, $j=0 ) {
                 if ($unseen > 0) {
                     $pre .= '<b>';
                 }
-                $pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;sort=0;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
+                $pre .= "<a href=\"" . SM_PATH . "src/right_main.php?PG_SHOWALL=0&amp;sort=0;startMessage=1&amp;mailbox=$mailboxURL\" target=\"$target\" style=\"text-decoration:none\">";
                 if ($unseen > 0) {
                     $end .= '</b>';
                 }
@@ -382,7 +397,7 @@ function ListBoxes ($boxes, $j=0 ) {
                     $end .= "&nbsp;<small>$unseen_string</small>";
                 }
                 $end .= "\n<small>\n" .
-                        "&nbsp;&nbsp;(<a href=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</a>)" .
+                        "&nbsp;&nbsp;(<a href=\"" . SM_PATH . "src/empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</a>)" .
                         "</small>";
             }
         } else {
@@ -390,7 +405,7 @@ function ListBoxes ($boxes, $j=0 ) {
                 if ($unseen > 0) {
                     $pre .= '<b>';
                 }
-                $pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
+                $pre .= "<a href=\"" . SM_PATH . "src/right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"$target\" style=\"text-decoration:none\">";
                 if ($unseen > 0) {
                     $end .= '</b>';
                 }
@@ -426,11 +441,16 @@ function ListBoxes ($boxes, $j=0 ) {
 
 function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
     global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
-           $move_to_trash, $trash_folder, $collapse_folders;
+           $move_to_trash, $trash_folder, $collapse_folders, $use_frames;
 
     if (!$boxes)
     	return;
 
+    if ($use_frames)
+        $target = 'right';
+    else
+        $target = '';
+
     /* use_folder_images only works if the images exist in ../images */
     $use_folder_images = true;
 
@@ -497,17 +517,17 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
         if (! isset($numMessages)) {
             $numMessages = $boxes->total;
         }
-        $pre = "<a class=\"mbx_link\" href=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\">" . $pre;
+        $pre = "<a class=\"mbx_link\" href=\"" . SM_PATH . "src/right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"$target\">" . $pre;
         $end .= '</a>';
         if ($numMessages > 0) {
             $urlMailbox = urlencode($mailbox);
             $end .= "\n<small>\n" .
-                    "&nbsp;&nbsp;(<a class=\"mbx_link\" href=\"empty_trash.php\">"._("purge")."</a>)" .
+                    "&nbsp;&nbsp;(<a class=\"mbx_link\" href=\"" . SM_PATH . "src/empty_trash.php\">"._("purge")."</a>)" .
                     "</small>";
         }
     } else {
         if (!$boxes->is_noselect) { /* \Noselect boxes can't be selected */
-            $pre = "<a class=\"mbx_link\" href=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\">" . $pre;
+            $pre = "<a class=\"mbx_link\" href=\"" . SM_PATH . "src/right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"$target\">" . $pre;
             $end .= '</a>';
         }
     }
@@ -587,6 +607,9 @@ sqgetGlobalVar('unfold', $unfold, SQ_GET);
 /* end globals */
 
 // open a connection on the imap port (143)
+
+
+if (!$imapConnection)
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); // the 10 is to hide the output
 
 /**
@@ -596,7 +619,7 @@ if (isset($left_refresh) && ($left_refresh != '') &&
     !stristr($left_refresh, 'none')){
     $xtra =  "\n<meta http-equiv=\"Expires\" content=\"Thu, 01 Dec 1994 16:00:00 GMT\" />\n" .
              "<meta http-equiv=\"Pragma\" content=\"no-cache\" />\n".
-             "<meta http-equiv=\"REFRESH\" content=\"$left_refresh;URL=left_main.php\" />\n";
+             "<meta http-equiv=\"REFRESH\" content=\"$left_refresh;URL=" . SM_PATH . "src/left_main.php\" />\n";
 } else {
     $xtra = '';
 }
@@ -892,10 +915,10 @@ ECHO;
 }
 
 
-
-
+if ($use_frames)
 displayHtmlHeader( 'SquirrelMail', $xtra );
 
+
 /* If requested and not yet complete, attempt to autocreate folders. */
 if ($auto_create_special && !isset($auto_create_done)) {
     $autocreate = array($sent_folder, $trash_folder, $draft_folder);
@@ -913,29 +936,30 @@ if ($auto_create_special && !isset($auto_create_done)) {
     $auto_create_done = TRUE;
     sqsession_register($auto_create_done, 'auto_create_done');
 }
-
-if ($advanced_tree)
-  echo "\n<body" .
+if ($use_frames) {
+   if ($advanced_tree)
+     echo "\n<body" .
 	' onload="preload(\'../images/minus.png\',\'../images/plus.png\')"' .
-  " bgcolor=\"$color[3]\" text=\"$color[6]\" link=\"$color[6]\" vlink=\"$color[6]\" alink=\"$color[6]\">\n";
-else
-  echo "\n<body bgcolor=\"$color[3]\" text=\"$color[6]\" link=\"$color[6]\" vlink=\"$color[6]\" alink=\"$color[6]\">\n";
-
-do_hook('left_main_before');
-if ($advanced_tree) {
-   /* nice future feature, needs layout !! volunteers?   */
-   $right_pos = $left_size - 20;
-/*   echo '<div style="position:absolute;top:0;border=solid;border-width:0.1em;border-color:blue;"><div ID="hidef" style="width=20;font-size:12"><A HREF="javascript:hideframe(true)"><b><<</b></a></div>';
-   echo '<div ID="showf" style="width=20;font-size:12;display:none;"><a href="javascript:hideframe(false)"><b>>></b></a></div>';
-   echo '<div ID="incrf" style="width=20;font-size:12"><a href="javascript:resizeframe(true)"><b>></b></a></div>';
-   echo '<div ID="decrf" style="width=20;font-size:12"><a href="javascript:resizeframe(false)"><b><</b></a></div></div>';
-   echo '<div ID="leftframe"><br /><br />';*/
+     " bgcolor=\"$color[3]\" text=\"$color[6]\" link=\"$color[6]\" vlink=\"$color[6]\" alink=\"$color[6]\">\n";
+   else
+     echo "\n<body bgcolor=\"$color[3]\" text=\"$color[6]\" link=\"$color[6]\" vlink=\"$color[6]\" alink=\"$color[6]\">\n";
+
+    do_hook('left_main_before');
+    if ($advanced_tree) {
+        /* nice future feature, needs layout !! volunteers?   */
+        $right_pos = $left_size - 20;
+     /*   echo '<div style="position:absolute;top:0;border=solid;border-width:0.1em;border-color:blue;"><div ID="hidef" style="width=20;font-size:12"><A HREF="javascript:hideframe(true)"><b><<</b></a></div>';
+        echo '<div ID="showf" style="width=20;font-size:12;display:none;"><a href="javascript:hideframe(false)"><b>>></b></a></div>';
+        echo '<div ID="incrf" style="width=20;font-size:12"><a href="javascript:resizeframe(true)"><b>></b></a></div>';
+        echo '<div ID="decrf" style="width=20;font-size:12"><a href="javascript:resizeframe(false)"><b><</b></a></div></div>';
+        echo '<div ID="leftframe"><br /><br />';*/
+    }
 }
-
 echo "\n\n" . html_tag( 'table', '', 'left', '', 'border="0" cellspacing="0" cellpadding="0" width="99%"' ) .
     html_tag( 'tr' ) .
-    html_tag( 'td', '', 'left' ) .
-    '<center><font size="4"><b>'. _("Folders") . "</b><br /></font>\n\n";
+    html_tag( 'td', '', 'left' );
+    if ($use_frames != 1)
+       '<center><font size="4"><b>'. _("Folders") . "</b><br /></font>\n\n";
 
 if ($date_format != 6) {
     /* First, display the clock. */
@@ -973,9 +997,17 @@ if ($date_format != 6) {
 }
 
 /* Next, display the refresh button. */
-echo '<small>(<a href="../src/left_main.php" target="left">'.
-     _("refresh folder list") . '</a>)</small></center><br />';
+if ($use_frames) {
+    echo '<small>(<a href="' . SM_PATH . 'src/left_main.php" target="left">'.
+        _("refresh folder list") . '</a>)</small></center><br />';
+} else {
+//    echo '<small>(<a href="' . SM_PATH . 'src/left_main.php">'.
+//        _("refresh folder list") . '</a>)</small></center><br />';
+    echo '</center><br />';
+    $collapse_folders = 0;
+}
 
+global $data_dir;
 /* Lastly, display the folder list. */
 if ( $collapse_folders ) {
     /* If directed, collapse or uncollapse a folder. */
@@ -1065,7 +1097,7 @@ for ($i = 0; $i < count($boxes); $i++) {
 } else {  /* expiremental code */
     $boxes = sqimap_mailbox_tree($imapConnection);
     if (isset($advanced_tree) && $advanced_tree) {
-        echo '<form name="collapse" action="left_main.php" method="post" ' .
+        echo '<form name="collapse" action="' . SM_PATH . 'src/left_main.php" method="post" ' .
              'enctype="multipart/form-data"'."\n";
         echo '<small>';
         echo '<button type="submit" class="button" onmouseover="buttonover(this,true)" onmouseout="buttonover(this,false)" onmousedown="buttonclick(this,true)" onmouseup="buttonclick(this,false)">'. _("Save folder tree") .'</button><br /><br />';
@@ -1081,10 +1113,15 @@ for ($i = 0; $i < count($boxes); $i++) {
         ListBoxes($boxes);
     }
 } /* if ($oldway) else ... */
-do_hook('left_main_after');
-sqimap_logout($imapConnection);
-
-echo '</td></tr></table>' . "\n".
-    "</div></body></html>\n";
+if ($use_frames)
+    do_hook('left_main_after');
+if ($location_of_bar == right && !$use_frames)
+    sqimap_logout($imapConnection);
+
+echo '<br></td></tr></table>' . "\n";
+if ($use_frames)
+    echo "</div></body></html>\n";
+else
+    echo "</div>\n";
 
-?>
+?>
\ No newline at end of file
diff --git a/src/login.php b/src/login.php
index 10584e20..fd41eafe 100644
--- a/src/login.php
+++ b/src/login.php
@@ -175,10 +175,43 @@ echo html_tag( 'table',
         'center' )
     ) ,
 '', $color[4], 'border="0" cellspacing="0" cellpadding="0" width="100%"' );
+
+switch ($allow_frames) {
+   case 4:    // if $use_frames unset, fall through to case 2
+      if (isset($_COOKIE['set_use_frames'])) {
+         $use_frames = $_COOKIE['set_use_frames'];
+         break;
+      }
+   case 2:    // Do not use frames
+      $use_frames = 0;
+      break;
+   case 3:    // if $use_frames unset, fall through to case 1
+      if (isset($_COOKIE['set_use_frames'])) {
+         $use_frames = $_COOKIE['set_use_frames'];
+         break;
+      }
+   default:   // default is also to use frames
+   case 1:    // use frames
+      $use_frames = 1;
+      break;
+}
+
+if ($allow_frames > 2) {
+   echo "<center><table border=0><tr><td>\n";
+   echo "<small><input type=radio name=set_use_frames value=1";
+   if ($use_frames) echo " checked=true";
+   echo '> ' . _("Frames") . "\n";
+   echo "</small></td><td nowrap>\n";
+   echo "<small><input type=radio name=set_use_frames value=0";
+   if (!$use_frames) echo " checked=true";
+   echo '> ' . _("No Frames") . "\n";
+   echo "</td></tr></table></center>\n";
+}
+
 do_hook('login_form');
 echo '</form>' . "\n";
 
 do_hook('login_bottom');
 echo "</body>\n".
      "</html>\n";
-?>
+?>
\ No newline at end of file
diff --git a/src/move_messages.php b/src/move_messages.php
index 7a2ba7e1..2cd0f307 100644
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -238,5 +238,5 @@ if ($exception) {
     header("Location: $location");
     exit;
 }
-?>
-</BODY></HTML>
+noframes_bottom();
+?>
\ No newline at end of file
diff --git a/src/options.php b/src/options.php
index 1bf50510..9d9c45a1 100644
--- a/src/options.php
+++ b/src/options.php
@@ -291,7 +291,10 @@ if ($optpage == SMOPT_PAGE_MAIN) {
         /* If $max_refresh != SMOPT_REFRESH_NONE, provide a refresh link. */
         if ( !isset( $max_refresh ) ) {
         } else if ($max_refresh == SMOPT_REFRESH_FOLDERLIST) {
-            echo '<a href="../src/left_main.php" target="left">' . _("Refresh Folder List") . '</a><br>';
+            if ($use_frames)
+                echo '<a href="../src/left_main.php" target="left">' . _("Refresh Folder List") . '</a><br>';
+            else
+                echo '<a href="../src/options.php">' . _("Refresh Folder List") . '</a><br>';
         } else if ($max_refresh) {
             echo '<a href="../src/webmail.php?right_frame=options.php" target="' . $frame_top . '">' . _("Refresh Page") . '</a><br>';
         }
@@ -451,7 +454,9 @@ if ($optpage == SMOPT_PAGE_MAIN) {
 echo        '</td></tr>' .
         '</table>'.
         '</td></tr>'.
-     '</table>' .
-     '</body></html>';
+     '</table>';
 
-?>
+noframes_bottom();
+
+
+?>
\ No newline at end of file
diff --git a/src/options_highlight.php b/src/options_highlight.php
index 79e2d2ae..37d9b28e 100644
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -469,4 +469,5 @@ if ($action == 'edit' || $action == 'add') {
 }
 do_hook('options_highlight_bottom');
 ?>
-</table></body></html>
+</table>
+<?php noframes_bottom(); ?>
diff --git a/src/options_identities.php b/src/options_identities.php
index 91744c79..bad3b3af 100644
--- a/src/options_identities.php
+++ b/src/options_identities.php
@@ -88,9 +88,8 @@ if (!empty($_POST)) {
                '', '', 'width="100%" border="0" cellpadding="1" cellspacing="1"' ) ,
            'center', $color[0] )
        ) ,
-   'center', '', 'width="95%" border="0" cellpadding="2" cellspacing="0"' ) .
-
-   '</body></html>';
+   'center', '', 'width="95%" border="0" cellpadding="2" cellspacing="0"' );
+   noframes_bottom();
 
     function SaveUpdateFunction() {
         global $username, $data_dir, $full_name, $email_address, $reply_to, $signature;
diff --git a/src/options_order.php b/src/options_order.php
index 20805e3d..32198397 100644
--- a/src/options_order.php
+++ b/src/options_order.php
@@ -149,4 +149,4 @@ displayPageHeader($color, 'None');
 
 </td></tr>
 </table>
-</body></html>
+<?php noframes_bottom(); ?>
diff --git a/src/read_body.php b/src/read_body.php
index bc267c6b..84144d6b 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -846,6 +846,5 @@ sqimap_logout($imapConnection);
    them at the end so we avoid double session_register calls */
 sqsession_register($messages,'messages');
 
-?>
-</body>
-</html>
+noframes_bottom();
+?>
\ No newline at end of file
diff --git a/src/redirect.php b/src/redirect.php
index 4ffa1bae..93d61fc6 100644
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -94,6 +94,28 @@ if (!sqsession_is_registered('user_is_logged_in')) {
     $username = $login_username;
     sqsession_register ($username, 'username');
     setcookie('key', $key, 0, $base_uri);
+
+    switch ($allow_frames) {
+        case 4:    // if $use_frames unset, fall through to case 2
+            if (isset($_POST['set_use_frames'])) {
+                $use_frames = $_POST['set_use_frames'];
+                break;
+            }
+        case 2:    // Do not use frames
+            $use_frames = 0;
+            break;
+        case 3:    // if $use_frames unset, fall through to case 1
+            if (isset($_POST['set_use_frames'])) {
+                $use_frames = $_POST['set_use_frames'];
+                break;
+            }
+        default:   // default is also to use frames
+        case 1:    // use frames
+            $use_frames = 1;
+            break;
+    }
+
+    setcookie('use_frames', $use_frames, time()+2592000, $base_uri);
     do_hook ('login_verified');
 
 }
diff --git a/src/right_main.php b/src/right_main.php
index 1d3ef5e5..9558cdba 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -237,7 +237,6 @@ if ($use_mailbox_cache && sqsession_is_registered('msgs')) {
 }
 do_hook('right_main_bottom');
 sqimap_logout ($imapConnection);
+noframes_bottom();
 
-echo '</body></html>';
-
-?>
+?>
\ No newline at end of file
diff --git a/src/search.php b/src/search.php
index 11538d92..e3805a32 100644
--- a/src/search.php
+++ b/src/search.php
@@ -1082,6 +1082,6 @@ if ($submit == $search_button_text) {
 
 do_hook('search_bottom');
 sqimap_logout($imapConnection);
-echo '</body></html>';
+noframes_bottom();
 
-?>
+?>
\ No newline at end of file
diff --git a/src/vcard.php b/src/vcard.php
index c6f3d112..1d669d10 100644
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -218,7 +218,7 @@ echo '</select>' .
 
         '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>' .
         '<TR><TD BGCOLOR="' . $color[4] . '">' .
-        '</TD></TR></TABLE>' .
-        '</body></html>';
+        '</TD></TR></TABLE>';
+        noframes_bottom();
 
-?>
+?>
\ No newline at end of file
diff --git a/src/view_header.php b/src/view_header.php
index 4f86662d..29055934 100644
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -103,7 +103,7 @@ function view_header($header, $mailbox, $color) {
            '</tt></nobr>',
            '</td></tr></table>'."\n" 
          ) );
-    echo '</body></html>';
+    noframes_bottom();
 }
 
 /* get global vars */
diff --git a/src/view_text.php b/src/view_text.php
index 88210f1c..e15000ad 100644
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -86,6 +86,6 @@ echo '<BR><TABLE WIDTH="100%" BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>
      '</TD></TR></TABLE>' .
      '<TABLE WIDTH="98%" BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR="' . $color[0] . '">' .
      '<TR><TD BGCOLOR="' . $color[4] . '"><TT>' .
-     $body . '</TT></TD></TR></TABLE>' .
-     '</body></html>';
-?>
+     $body . '</TT></TD></TR></TABLE>';
+     noframes_bottom();
+?>
\ No newline at end of file
diff --git a/src/webmail.php b/src/webmail.php
index 9825da3d..c4ef5b8c 100644
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -37,12 +37,30 @@ sqsession_is_active();
 sqgetGlobalVar('username', $username, SQ_SESSION);
 sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
 sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
-
+sqgetGlobalVar('use_frames', $use_frames, SQ_COOKIE);
 sqgetGlobalVar('right_frame', $right_frame, SQ_GET);
 
 if ( isset($_SESSION['session_expired_post']) ) {
     sqsession_unregister('session_expired_post');
 }
+global $plugins;
+
+switch ($allow_frames) {
+   case 4:    // if $use_frames unset, fall through to case 2
+      if (isset($use_frames))
+         break;
+   case 2:    // Do not use frames
+      $use_frames = 0;
+      break;
+   case 3:    // if $use_frames unset, fall through to case 1
+      if (isset($use_frames))
+         break;
+   default:   // default is also to use frames
+   case 1:    // use frames
+      $use_frames = 1;
+      break;
+}
+
 if(!sqgetGlobalVar('mailto', $mailto)) {
     $mailto = '';
 }
@@ -65,6 +83,25 @@ if ($my_language != $squirrelmail_language) {
 
 set_up_language(getPref($data_dir, $username, 'language'));
 
+if (isset($use_frames) && !$use_frames) {
+    if (!isset($right_frame))
+        $right_frame = '';
+    if ($right_frame == 'right_main.php') {
+        $urlMailbox = urlencode($mailbox);
+        $right_frame_url = "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') {
+        $right_frame_url = 'folders.php';
+    } else if ($right_frame == '') {
+        $right_frame_url = 'right_main.php';
+    } else {
+        $right_frame_url =  $right_frame;
+    }
+    header("Location: $right_frame_url");
+}
+
+
 echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\">\n".
      "<html><head>\n" .
      "<title>$org_title</title>\n".
-- 
2.25.1