[SM-CVS] CVS: squirrelmail/functions page_header.php,1.148.2.19,1.148.2.20

[Thijs K. <ki...@us...>]

Update of /cvsroot/squirrelmail/squirrelmail/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25149/functions

Modified Files:
      Tag: SM-1_4-STABLE
	page_header.php 
Log Message:
Correct slightly inconsistent behaviour when reading a message with MDN
(#928954).


Index: page_header.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/page_header.php,v
retrieving revision 1.148.2.19
retrieving revision 1.148.2.20
diff -u -w -r1.148.2.19 -r1.148.2.20
--- page_header.php	20 May 2005 18:43:39 -0000	1.148.2.19
+++ page_header.php	27 May 2005 08:50:05 -0000	1.148.2.20
@@ -137,9 +137,13 @@
 
             // javascript for sending read receipts
             if($default_use_mdn && $mdn_user_support) {
-                $js .= 'function sendMDN() {'."\n".
-                       "    mdnuri=window.location+'&sendreceipt=1'; ".
-                       "var newwin = window.open(mdnuri,'right');".
+                $js .= "function sendMDN() {\n".
+                         "    mdnuri=window.location+'&sendreceipt=1';\n" .
+                         "    if (window.top != window.self) {\n" .
+                         "      var newwin = window.open(mdnuri,'right');\n" .
+                         "    } else {\n " .
+                         "      var newwin = window.location = mdnuri;\n" .
+                         "    }\n" .
                        "\n}\n\n";
             }