projects / squirrelmail.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix for opening compose windows twice in case of forward from the
[squirrelmail.git] / functions / page_header.php
diff --git a/functions/page_header.php b/functions/page_header.php
index 3cac7aeda9a42075c3d4995ff49d703e5487d62b..1a236400b7b7dbde0f9a6f697254c4ba9dcd1493 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -13,7 +13,8 @@
 
 require_once('../functions/strings.php');
 require_once('../functions/imap_utf7_decode_local.php');
-
+require_once('../functions/html.php');
+//require_once('../functions/imap_mailbox.php');
 /* Always set up the language before calling these functions */
 function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE ) {
 
@@ -31,16 +32,20 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
              $base_uri . 'themes/css/'.$custom_css.'">';
     }
     
+    if ($do_hook) {
+       do_hook("generic_header");
+    }
+    
     echo "\n<title>$title</title>$xtra</head>\n\n";
 }
 
+
 function displayInternalLink($path, $text, $target='') {
     global $base_uri;
 
     if ($target != '') {
         $target = " target=\"$target\"";
     }
-
     echo '<a href="'.$base_uri.$path.'"'.$target.'>'.$text.'</a>';
 }
 
@@ -58,19 +63,16 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
         $frame_top = '_top';
     }
 
-    /*
-        Locate the first displayable form element
-    */
-
     if ($session != false) {
-       $compose_uri = 'src/compose.php?mailbox='. urlencode($mailbox).'&attachedmessages=true&session='."$session";
+       $compose_uri = $base_uri.'src/compose.php?mailbox='. urlencode($mailbox).'&attachedmessages=true&session='."$session";
     } else {
-        $compose_uri = 'src/compose.php?newmessage=1';
+        $compose_uri = $base_uri.'src/compose.php?newmessage=1';
        $session = 0;
     }
    
     switch ( $module ) {
     case 'src/read_body.php':
+            $js ='';
             if ($compose_new_win == '1') {
                 if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) {
                     $compose_width = '640';
@@ -78,28 +80,30 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
                 if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
                     $compose_height = '550';
                 }
-                $js = "\n".'<script language="JavaScript" type="text/javascript">' .
+                $js .= "\n".'<script language="JavaScript" type="text/javascript">' .
                     "\n<!--\n";
-                $js .= "function comp_in_new(new_mes, comp_uri) {\n".
-                    '    if (new_mes) { '."\n".
-                    "       comp_uri = \"".$base_uri."src/compose.php?newmessage=1\";\n".
-                    '    } else { '."\n".
-                    "       if (comp_uri =='') {\n".
-                    '           comp_uri = "'.$base_uri.$compose_uri."\";\n".
+                $js .= "function comp_in_new(comp_uri) {\n".
+                    "       if (!comp_uri) {\n".
+                    '           comp_uri = "'.$compose_uri."\";\n".
                     '       }'. "\n".
-                    '    }'. "\n".
                      '    var newwin = window.open(comp_uri' .
-                     ', "_blank",
-                "width='.$compose_width.",height=$compose_height".
-                     ",scrollbars=yes,resizable=yes\");\n".
-                     "}\n";
+                     ', "_blank",'.
+                     '"width='.$compose_width. ',height='.$compose_height.
+                     '",scrollbars="yes",resizable="yes");'."\n".
+                     "}\n\n";
 
-        $js .= "// -->\n".
-                "</script>\n";
-        displayHtmlHeader ('Squirrelmail', $js);
-            }
-        displayHtmlHeader();
-        $onload = $xtra;
+
+                $js .= 'function sendMDN() {'."\n".
+                       "mdnuri=window.location+'&sendreceipt=1';".
+                       "var newwin = window.open(mdnuri,'right');".
+                      "\n}\n\n";
+
+                $js .= "// -->\n".
+                      "</script>\n";
+            
+             }
+             displayHtmlHeader ('Squirrelmail', $js);
+             $onload = $xtra;
         break;
     case 'src/compose.php':
         $js = '<script language="JavaScript" type="text/javascript">' .
@@ -161,54 +165,52 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
                 if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
                     $compose_height = '550';
                 }
-                $js .= "function comp_in_new(new_mes, comp_uri) {\n".
-                    '    if (new_mes) { '."\n".
-                    "       comp_uri = \"".$base_uri."src/compose.php?newmessage=1\";\n".
-                    '    } else { '."\n".
-                    "       if (comp_uri =='') {\n".
-                    '           comp_uri = "'.$base_uri.$compose_uri."\";\n".
+                $js .= "function comp_in_new(comp_uri) {\n".
+                    "       if (!comp_uri) {\n".
+                    '           comp_uri = "'.$compose_uri."\";\n".
                     '       }'. "\n".
-                    '    }'. "\n".
                      '    var newwin = window.open(comp_uri' .
-                     ', "_blank",
-                "width='.$compose_width.",height=$compose_height".
-                     ",scrollbars=yes,resizable=yes\");\n".
-                     "}\n";
+                     ', "_blank",'.
+                     '"width='.$compose_width. ',height='.$compose_height.
+                     '",scrollbars="yes",resizable="yes");'."\n".
+                     "}\n\n";
+
             }
-        $js .= "// -->\n".
-                "</script>\n";
+        $js .= "// -->\n". "</script>\n";
+       
+
         $onload = "onLoad=\"checkForm();\"";
         displayHtmlHeader ('Squirrelmail', $js);
         break;   
 
     }
 
-    echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\" $onload>\n\n";
+    echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\" $onload>\n\n";
     /** Here is the header and wrapping table **/
     $shortBoxName = imap_utf7_decode_local(
                      readShortMailboxName($mailbox, $delimiter));
     if ( $shortBoxName == 'INBOX' ) {
         $shortBoxName = _("INBOX");
     }
-    echo "<A NAME=pagetop></A>\n"
-        . "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 WIDTH=\"100%\" CELLSPACING=0 CELLPADDING=2>\n"
-        . "   <TR BGCOLOR=\"$color[9]\" >\n"
-        . "      <TD ALIGN=left>\n";
+    echo "<a name=\"pagetop\"></a>\n"
+        . html_tag( 'table', '', '', $color[4], 'border="0" width="100%" cellspacing="0" cellpadding="2"' ) ."\n"
+        . html_tag( 'tr', '', '', $color[9] ) ."\n"
+        . html_tag( 'td', '', 'left' ) ."\n";
     if ( $shortBoxName <> '' && strtolower( $shortBoxName ) <> 'none' ) {
-        echo '         ' . _("Current Folder") . ": <B>$shortBoxName&nbsp;</B>\n";
+        echo '         ' . _("Current Folder") . ": <b>$shortBoxName&nbsp;</b>\n";
     } else {
         echo '&nbsp;';
     }
-    echo  "      </TD>\n"
-        . '      <TD ALIGN=right><b>';
+    echo  "      </td>\n"
+        . html_tag( 'td', '', 'right' ) ."<b>\n";
     displayInternalLink ('src/signout.php', _("Sign Out"), $frame_top);
-    echo "</b></TD>\n"
-        . "   </TR>\n"
-        . "   <TR BGCOLOR=\"$color[4]\">\n"
-        . "      <TD ALIGN=left>\n";
+    echo "</b></td>\n"
+        . "   </tr>\n"
+        . html_tag( 'tr', '', '', $color[4] ) ."\n"
+        . html_tag( 'td', '', 'left' ) ."\n";
     $urlMailbox = urlencode($mailbox);
     if ($compose_new_win == '1') {
-        echo "<a href=\"javascript:void(0)\" onclick=\"comp_in_new(true,'')\">". _("Compose"). '</a>';
+        echo "<a href=\"javascript:void(0)\" onclick=\"comp_in_new()\">". _("Compose"). '</a>';
     }
     else {
         displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), 'right');
@@ -227,12 +229,13 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
 
     do_hook("menuline");
 
-    echo "      </TD>\n      <TD ALIGN=\"right\">";
+    echo "      </td>\n"
+        . html_tag( 'td', '', 'right' ) ."\n";
     echo ($hide_sm_attributions ? '&nbsp;' :
-            '<A HREF="http://www.squirrelmail.org/" TARGET="_blank">SquirrelMail</A>');
-    echo "</TD>\n".
-        "   </TR>\n".
-        "</TABLE>\n\n";
+            '<a href="http://www.squirrelmail.org/" target="_blank">SquirrelMail</a>');
+    echo "</td>\n".
+        "   </tr>\n".
+        "</table>\n\n";
 }
 
 /* blatently copied/truncated/modified from the above function */
@@ -285,6 +288,6 @@ 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";
+    echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\" $onload>\n\n";
 }
 ?>
Unnamed repository; edit this file 'description' to name the repository.