[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] CVS: squirrelmail/functions page_header.php,1.151,1.152
From:       Thijs Kinkhorst <kink () users ! sourceforge ! net>
Date:       2003-06-30 19:36:18
[Download RAW message or body]

Update of /cvsroot/squirrelmail/squirrelmail/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv24344/functions

Modified Files:
	page_header.php 
Log Message:
JS for sendmdn was not output when comp_in_new was disabled.


Index: page_header.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/page_header.php,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -w -r1.151 -r1.152
--- page_header.php	9 Jun 2003 14:39:15 -0000	1.151
+++ page_header.php	30 Jun 2003 19:36:16 -0000	1.152
@@ -86,7 +86,7 @@
     global $hide_sm_attributions, $PHP_SELF, $frame_top,
            $compose_new_win, $compose_width, $compose_height,
            $attachemessages, $provider_name, $provider_uri,
-           $javascript_on;
+           $javascript_on, $default_use_mdn, $mdn_user_support;
 
     sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION );
     sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION );
@@ -110,6 +110,8 @@
       switch ( $module ) {
         case 'src/read_body.php':
                 $js ='';
+
+                // compose in new window code
                 if ($compose_new_win == '1') {
                     if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) {
                         $compose_width = '640';
@@ -117,8 +119,6 @@
                     if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
                         $compose_height = '550';
                     }
-                    $js .= "\n".'<script language="JavaScript" type="text/javascript">' .
-                        "\n<!--\n";
                     $js .= "function comp_in_new(comp_uri) {\n".
     		     "       if (!comp_uri) {\n".
     		     '           comp_uri = "'.$compose_uri."\";\n".
@@ -128,17 +128,22 @@
                          '"width='.$compose_width. ',height='.$compose_height.
                          ',scrollbars=yes,resizable=yes");'."\n".
                          "}\n\n";
+                }
 
-
+                // 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');".
     	               "\n}\n\n";
+                }
 
-                    $js .= "// -->\n".
-            	       "</script>\n";
-	     
+                // if any of the above passes, add the JS tags too.
+                if($js) {
+                    $js = "\n".'<script language="JavaScript" type="text/javascript">' .
+                        "\n<!--\n" . $js . "// -->\n</script>\n";
                  }
+
                  displayHtmlHeader ('SquirrelMail', $js);
                  $onload = $xtra;
             break;



-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01
--
squirrelmail-cvs mailing list
List Address: squirrelmail-cvs@lists.sourceforge.net
List Info: https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
http://squirrelmail.org/cvs
[prev in list] [next in list] [prev in thread] [next in thread]