if ($session !== false) {
$compose_uri = 'src/compose.php?mailbox='. urlencode($mailbox).'&attachedmessages=true&session='."$session";
} else {
- $compose_uri = 'src/compose.php';
+ $compose_uri = 'src/compose.php?newmessage=1';
+ $session = 0;
}
switch ( $module ) {
}
$js = "\n".'<script language="JavaScript" type="text/javascript">' .
"\n<!--\n";
- $js .= "function comp_in_new() {\n".
- " var newwin = window.open(\"".$base_uri.$compose_uri. '"'.
- ", \"compose_window\",
- \"width=".$compose_width.",height=$compose_height".
+ $js .= "function comp_in_new(new_mes, comp_uri) {\n".
+ ' if (new_mes) { '."\n".
+ " comp_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" .
if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
$compose_height = '550';
}
- $js .= "function comp_in_new() {\n".
- ' var newwin = window.open("'.$base_uri.$compose_uri . '"' .
- ', "compose_window",
+ $js .= "function comp_in_new(new_mes, comp_uri) {\n".
+ ' if (new_mes) { '."\n".
+ " comp_uri = \"../src/compose.php?newmessage=1\";\n".
+ ' } else { '."\n".
+ " if (comp_uri =='') {\n".
+ ' comp_uri = "'.$base_uri.$compose_uri."\";\n".
+ ' }'. "\n".
+ ' }'. "\n".
+ ' window.alert(comp_uri);'.
+ ' var newwin = window.open(comp_uri' .
+ ', "_blank",
"width='.$compose_width.",height=$compose_height".
",scrollbars=yes,resizable=yes\");\n".
"}\n";
. " <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');
session_register('composesession');
}
-if (!isset($session)) {
+if (!isset($session) || (isset($newmessage) && $newmessage)) {
$session = "$composesession" +1;
$composesession = $session;
-}
+}
if (!isset($mailbox) || $mailbox == '' || ($mailbox == 'None')) {
$mailbox = 'INBOX';
exit();
}
if ($compose_new_win == '1') {
- Header("Location: compose.php?mail_sent=yes&session=$composesession");
+ Header("Location: compose.php?mail_sent=yes");
}
else {
Header("Location: right_main.php?mailbox=$urlMailbox&sort=$sort".
getAttachments(0, $session);
}
+ if (isset($passed_id) && $passed_id && isset($ent_num) && $ent_num) {
+ getAttachments(0, $session);
+ }
+
newMail($session);
showInputForm($session);
sqimap_logout($imapConnection);
function getAttachments($message, $session) {
global $mailbox, $attachments, $attachment_dir, $imapConnection,
- $ent_num, $forward_id, $draft_id, $username;
+ $ent_num, $forward_id, $draft_id, $username, $passed_id;
if (isset($draft_id)) {
$id = $draft_id;
- } else {
+ } else if (isset($forward_id)) {
$id = $forward_id;
+ } else {
+ $id = $passed_id;
}
if (!$message) {
}
echo _("Delete") . '</A> ';
if (($mailbox == $draft_folder) && ($save_as_draft)) {
- echo '| <A HREF="' . $base_uri .
- "src/compose.php?mailbox=$mailbox&identity=$identity&send_to=$url_to_string&send_to_cc=$url_cc_string&send_to_bcc=$url_bcc_string&subject=$url_subj&mailprio=$priority_level&draft_id=$passed_id&ent_num=$ent_num" . '"';
+ $comp_uri = $base_uri . "src/compose.php?mailbox=$mailbox&".
+ "identity=$identity&send_to=$url_to_string&".
+ "send_to_cc=$url_cc_string&send_to_bcc=$url_bcc_string&".
+ "subject=$url_subj&mailprio=$priority_level&".
+ "draft_id=$passed_id&ent_num=$ent_num&passed_id=$passed_id";
+
if ($compose_new_win == '1') {
- echo ' TARGET="compose_window" onClick="comp_in_new()"';
+ echo "<a href=\"javascript:void(0)\" onclick=\"comp_in_new(false,'$comp_uri')\"";
+ } else {
+ echo '| <A HREF="' . $comp_uri .'"';
}
echo '>'.
_("Resume Draft") . '</a>';
}
if ($mailbox == $sent_folder) {
- echo '| <A HREF="' . $base_uri .
- "src/compose.php?mailbox=$mailbox&identity=$identity&send_to=$url_to_string&send_to_cc=$url_cc_string&send_to_bcc=$url_bcc_string&subject=$url_subj&mailprio=$priority_level&draft_id=$passed_id&edit_as_new=1&ent_num=$ent_num" . '"';
+ $comp_uri = $base_uri . "src/compose.php?mailbox=$mailbox&".
+ "identity=$identity&send_to=$url_to_string&".
+ "send_to_cc=$url_cc_string&send_to_bcc=$url_bcc_string&".
+ "subject=$url_subj&mailprio=$priority_level&".
+ "ent_num=$ent_num&passed_id=$passed_id&edit_as_new=1";
+
if ($compose_new_win == '1') {
- echo ' TARGET="compose_window" onClick="comp_in_new()"';
+ echo "<a href=\"javascript:void(0)\" onclick=\"comp_in_new(false,'$comp_uri')\"";
+ } else {
+ echo '| <A HREF="' . $comp_uri .'"';
}
echo '>'.
_("Edit Message as New") . '</a>';
echo '</SMALL>' .
'</TD><TD WIDTH="33%" ALIGN="RIGHT">' .
- '<SMALL>' .
- '<A HREF="' . $base_uri . "src/compose.php?forward_id=$passed_id&forward_subj=$url_subj&".
- ($default_use_priority?"mailprio=$priority_level&":'')
- ."mailbox=$urlMailbox&ent_num=$ent_num\"";
- if ($compose_new_win == '1') {
- echo 'TARGET="compose_window" onClick="comp_in_new()"';
- }
+ '<SMALL>' ;
+
+$comp_uri = $base_uri . "src/compose.php?forward_id=$passed_id&".
+ "forward_subj=$url_subj&".
+ ($default_use_priority?"mailprio=$priority_level&":'').
+ "mailbox=$urlMailbox&ent_num=$ent_num";
+
+if ($compose_new_win == '1') {
+ echo "<a href=\"javascript:void(0)\" onclick=\"comp_in_new(false,'$comp_uri')\"";
+} else {
+ echo '| <A HREF="' . $comp_uri .'"';
+}
+
echo '>'.
_("Forward") .
- '</A> | ' .
- '<A HREF="' . $base_uri . "src/compose.php?send_to=$url_replyto&reply_subj=$url_subj&".
- ($default_use_priority?"mailprio=$priority_level&":'').
- "reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num\"";
- if ($compose_new_win == '1') {
- echo 'TARGET="compose_window" onClick="comp_in_new()"';
- }
+ '</A> | ';
+
+$comp_uri = $base_uri . "src/compose.php?send_to=$url_replyto&".
+ "reply_subj=$url_subj&".
+ ($default_use_priority?"mailprio=$priority_level&":'').
+ "reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num";
+
+if ($compose_new_win == '1') {
+ echo "<a href=\"javascript:void(0)\" onclick=\"comp_in_new(false,'$comp_uri')\"";
+} else {
+ echo '| <A HREF="' . $comp_uri .'"';
+}
+
echo '>'.
_("Reply") .
- '</A> | ' .
- '<A HREF="' . $base_uri . "src/compose.php?send_to=$url_replytoall&send_to_cc=$url_replytoallcc&reply_subj=$url_subj&".
- ($default_use_priority?"mailprio=$priority_level&":'').
- "reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num\"";
- if ($compose_new_win == '1') {
- echo 'TARGET="compose_window" onClick="comp_in_new()"';
- }
+ '</A> | ';
+
+$comp_uri = $base_uri . "src/compose.php?send_to=$url_replytoall&".
+ "send_to_cc=$url_replytoallcc&reply_subj=$url_subj&".
+ ($default_use_priority?"mailprio=$priority_level&":'').
+ "reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num";
+
+if ($compose_new_win == '1') {
+ echo "<a href=\"javascript:void(0)\" onclick=\"comp_in_new(false,'$comp_uri')\"";
+} else {
+ echo '| <A HREF="' . $comp_uri .'"';
+}
+
echo '>'.
_("Reply All") .
'</A> ' .
sqimap_mailbox_select($imapConnection, $mailbox);
if (isset($composenew) && $composenew) {
- displayPageHeader($color, $mailbox, 'comp_in_new();', $session);
+ $comp_uri = "../src/compose.php?mailbox=". urlencode($mailbox).
+ "&session=$composesession&attachedmessages=true&";
+
+ displayPageHeader($color, $mailbox, "comp_in_new(false,'$comp_uri');", false);
} else {
displayPageHeader($color, $mailbox);
}
}
if (isset($composenew) && $composenew) {
- displayPageHeader($color, $mailbox, 'comp_in_new('.$session.',true);');
+ $comp_uri = "../src/compose.php?mailbox=". urlencode($mailbox).
+ "&session=$composesession&attachedmessages=true&";
+ displayPageHeader($color, $mailbox, "comp_in_new(false,'$comp_uri');", false);
} else {
displayPageHeader($color, $mailbox);
}