*/
require_once('../functions/strings.php');
+require_once('../functions/imap_utf7_decode_local.php');
/* Always set up the language before calling these functions */
function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE ) {
echo '<a href="'.$base_uri.$path.'"'.$target.'>'.$text.'</a>';
}
-function displayPageHeader($color, $mailbox, $xtra='') {
+function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF, $frame_top,
- $compose_new_win, $username, $datadir, $compose_width, $compose_height;
+ $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, '?')) {
/*
Locate the first displayable form element
*/
+
+ if ($session != false) {
+ $compose_uri = 'src/compose.php?mailbox='. urlencode($mailbox).'&attachedmessages=true&session='."$session";
+ } else {
+ $compose_uri = 'src/compose.php?newmessage=1';
+ $session = 0;
+ }
+
switch ( $module ) {
+ case 'src/read_body.php':
+ 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(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".
+ ' }'. "\n".
+ ' }'. "\n".
+ ' var newwin = window.open(comp_uri' .
+ ', "_blank",
+ "width='.$compose_width.",height=$compose_height".
+ ",scrollbars=yes,resizable=yes\");\n".
+ "}\n";
+
+ $js .= "// -->\n".
+ "</script>\n";
+ displayHtmlHeader ('Squirrelmail', $js);
+ }
+ displayHtmlHeader();
+ $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:
$js = '<script language="JavaScript" type="text/javascript">' .
"\n<!--\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() {\n".
- " var newwin = window.open(\"".$base_uri."src/compose.php\"".
- ", \"compose_window\",
- \"width=".$compose_width.",height=$compose_height".
+ $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".
+ ' }'. "\n".
+ ' }'. "\n".
+ ' var newwin = window.open(comp_uri' .
+ ', "_blank",
+ "width='.$compose_width.",height=$compose_height".
",scrollbars=yes,resizable=yes\");\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);
+ $shortBoxName = imap_utf7_decode_local(
+ readShortMailboxName($mailbox, $delimiter));
if ( $shortBoxName == 'INBOX' ) {
$shortBoxName = _("INBOX");
}
. " <TD ALIGN=left>\n";
$urlMailbox = urlencode($mailbox);
if ($compose_new_win == '1') {
- echo "<a href=$base_uri". "src/compose.php?mailbox=$urlMailbox target=".
- '"compose_window" onClick="comp_in_new()">'. _("Compose"). '</a>';
+ echo "<a href=\"javascript:void(0)\" onclick=\"comp_in_new(true,'')\">". _("Compose"). '</a>';
}
else {
displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), 'right');
$onload = "onLoad=\"document.forms[$pos].elements[2].focus();\"";
displayHtmlHeader (_("Compose"));
break;
- case 'src/read_body.php':
- displayHtmlHeader();
- break;
default:
$js = '<script language="JavaScript" type="text/javascript">' .
"\n<!--\n" .