X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fpage_header.php;h=7ea711d077d104ddff771755a0e8eeb39ea8e5f2;hb=b44ee3f0f2ffca2217c29803f3c411e562ad937a;hp=e248728fcdbe3f4b658ec8cd8dc2cce23008bcb5;hpb=80e86e941526449e2b21bc532abb870072e5e083;p=squirrelmail.git

diff --git a/functions/page_header.php b/functions/page_header.php
index e248728f..7ea711d0 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -12,8 +12,10 @@
  */
 
 require_once('../functions/strings.php');
-
-// Always set up the language before calling these functions
+//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 ) {
 
     global $theme_css, $custom_css, $base_uri;
@@ -23,101 +25,196 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
 
     if ( !isset( $custom_css ) || $custom_css == 'none' ) {
         if ($theme_css != '') {
-            echo "<LINK REL=\"stylesheet\" TYPE=\"text/css\" HREF=\"$theme_css\">\n";
+            echo "<LINK REL=\"stylesheet\" TYPE=\"text/css\" HREF=\"$theme_css\">";
         }
     } else {
         echo '<LINK REL="stylesheet" TYPE="text/css" HREF="' .
-             $base_uri . "themes/css/$custom_css\">\n";
+             $base_uri . 'themes/css/'.$custom_css.'">';
     }
     
-    if( $do_hook ) {
-        do_hook ("generic_header");
+    if ($do_hook) {
+       do_hook("generic_header");
     }
     
-    echo "<title>$title</title>$xtra</head>\n\n";
+    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>';
 }
 
-function displayPageHeader($color, $mailbox) {
-
-    global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF, $frame_top;
+function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
 
-    displayHtmlHeader ();
+    global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF, $frame_top,
+           $compose_new_win, $username, $datadir, $compose_width, $compose_height,
+           $attachemessages, $session;
 
     $module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 );
+    if ($qmark = strpos($module, '?')) {
+        $module = substr($module, 0, $qmark);
+    }
+    if (!isset($frame_top)) {
+        $frame_top = '_top';
+    }
 
-    /*
-        Locate the first displayable form element
-    */
+    if ($session != false) {
+	$compose_uri = $base_uri.'src/compose.php?mailbox='. urlencode($mailbox).'&attachedmessages=true&session='."$session";
+    } else {
+        $compose_uri = $base_uri.'src/compose.php?newmessage=1';
+	$session = 0;
+    }
+   
     switch ( $module ) {
-    case 'src/search.php':
-        $pos = getPref($data_dir, $username, 'search_pos', 0 ) - 1;
-        $onload = "onLoad=\"document.forms[$pos].elements[2].focus();\"";
+    case 'src/read_body.php':
+            $js ='';
+            if ($compose_new_win == '1') {
+                if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) {
+                    $compose_width = '640';
+                }
+                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".
+		     '       }'. "\n".
+                     '    var newwin = window.open(comp_uri' .
+                     ', "_blank",'.
+                     '"width='.$compose_width. ',height='.$compose_height.
+                     ',scrollbars=yes,resizable=yes");'."\n".
+                     "}\n\n";
+
+
+                $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">' .
+             "\n<!--\n" .
+             "function checkForm() {\n".
+                "var f = document.forms.length;\n".
+                "var i = 0;\n".
+                "var pos = -1;\n".
+                "while( pos == -1 && i < f ) {\n".
+                    "var e = document.forms[i].elements.length;\n".
+                    "var j = 0;\n".
+                    "while( pos == -1 && j < e ) {\n".
+                        "if ( document.forms[i].elements[j].type == 'text' ) {\n".
+                            "pos = j;\n".
+                        "}\n".
+                        "j++;\n".
+                    "}\n".
+                "i++;\n".
+                "}\n".
+                "if( pos >= 0 ) {\n".
+                    "document.forms[i-1].elements[pos].focus();\n".
+                "}\n".
+            "}\n";
+	    
+        $js .= "// -->\n".
+        	 "</script>\n";
+        $onload = "onLoad=\"checkForm();\"";
+        displayHtmlHeader ('Squirrelmail', $js);
+        break;   
+
     default:
-        echo '
-<script language="JavaScript">
-<!--
-function checkForm() {
-
-    var f = document.forms.length;
-    var i = 0;
-    var pos = -1;
-    while( pos == -1 && i < f ) {
-        var e = document.forms[i].elements.length;
-        var j = 0;
-        while( pos == -1 && j < e ) {
-            if ( document.forms[i].elements[j].type == \'text\' ) {
-                pos = j;
+        $js = '<script language="JavaScript" type="text/javascript">' .
+             "\n<!--\n" .
+             "function checkForm() {\n".
+                "var f = document.forms.length;\n".
+                "var i = 0;\n".
+                "var pos = -1;\n".
+                "while( pos == -1 && i < f ) {\n".
+                    "var e = document.forms[i].elements.length;\n".
+                    "var j = 0;\n".
+                    "while( pos == -1 && j < e ) {\n".
+                        "if ( document.forms[i].elements[j].type == 'text' ) {\n".
+                            "pos = j;\n".
+                        "}\n".
+                        "j++;\n".
+                    "}\n".
+                "i++;\n".
+                "}\n".
+                "if( pos >= 0 ) {\n".
+                    "document.forms[i-1].elements[pos].focus();\n".
+                "}\n".
+		"$xtra\n".
+            "}\n";
+	    
+            if ($compose_new_win == '1') {
+                if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) {
+                    $compose_width = '640';
+                }
+                if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
+                    $compose_height = '550';
+                }
+                $js .= "function comp_in_new(comp_uri) {\n".
+		     "       if (!comp_uri) {\n".
+		     '           comp_uri = "'.$compose_uri."\";\n".
+		     '       }'. "\n".
+                     '    var newwin = window.open(comp_uri' .
+                     ', "_blank",'.
+                     '"width='.$compose_width. ',height='.$compose_height.
+                     ',scrollbars=yes,resizable=yes");'."\n".
+                     "}\n\n";
+
             }
-            j++;
-        }
-        i++;
-    }
-    if( pos >= 0 ) {
-        document.forms[i-1].elements[pos].focus();
-    }
-    
-}
-// -->
-</script>
-        ';
+        $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 = readShortMailboxName($mailbox, $delimiter);
-    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";
+    $shortBoxName = imap_utf7_decode_local(
+		      readShortMailboxName($mailbox, $delimiter));
+    if ( $shortBoxName == 'INBOX' ) {
+        $shortBoxName = _("INBOX");
+    }
+    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>\n";
+    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);
-    displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), 'right');
+    if ($compose_new_win == '1') {
+        echo "<a href=\"javascript:void(0)\" onclick=\"comp_in_new()\">". _("Compose"). '</a>';
+    }
+    else {
+        displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), 'right');
+    } 
     echo "&nbsp;&nbsp;\n";
     displayInternalLink ("src/addressbook.php", _("Addresses"), 'right');
     echo "&nbsp;&nbsp;\n";
@@ -132,12 +229,65 @@ function checkForm() {
 
     do_hook("menuline");
 
-    echo "      </TD><TD ALIGN=right>\n";
+    echo "      </td>\n"
+        . html_tag( 'td', '', 'right' ) ."\n";
     echo ($hide_sm_attributions ? '&nbsp;' :
-            "<A HREF=\"http://www.squirrelmail.org/\" TARGET=\"_blank\">SquirrelMail</A>\n");
-    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 */
+function compose_Header($color, $mailbox) {
+
+    global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF, $frame_top, $compose_new_win;
+
+
+    $module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 );
+    if (!isset($frame_top)) {
+        $frame_top = '_top';
+    }
+
+    /*
+        Locate the first displayable form element
+    */
+    switch ( $module ) {
+    case 'src/search.php':
+        $pos = getPref($data_dir, $username, 'search_pos', 0 ) - 1;
+        $onload = "onLoad=\"document.forms[$pos].elements[2].focus();\"";
+        displayHtmlHeader (_("Compose"));
+        break;
+    default:
+        $js = '<script language="JavaScript" type="text/javascript">' .
+             "\n<!--\n" .
+             "function checkForm() {\n".
+                "var f = document.forms.length;\n".
+                "var i = 0;\n".
+                "var pos = -1;\n".
+                "while( pos == -1 && i < f ) {\n".
+                    "var e = document.forms[i].elements.length;\n".
+                    "var j = 0;\n".
+                    "while( pos == -1 && j < e ) {\n".
+                        "if ( document.forms[i].elements[j].type == 'text' ) {\n".
+                            "pos = j;\n".
+                        "}\n".
+                        "j++;\n".
+                    "}\n".
+                "i++;\n".
+                "}\n".
+                "if( pos >= 0 ) {\n".
+                    "document.forms[i-1].elements[pos].focus();\n".
+                "}\n".
+            "}\n";
+        $js .= "// -->\n".
+        	 "</script>\n";
+        $onload = "onLoad=\"checkForm();\"";
+        displayHtmlHeader (_("Compose"), $js);
+        break;   
+
+    }
+
+    echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\" $onload>\n\n";
+}
 ?>