require_once('../functions/date.php');
require_once('../functions/url_parser.php');
require_once('../functions/smtp.php');
+require_once('../functions/html.php');
/**
* Given an IMAP message id number, this will look it up in the cached
if (!$pf_subtle_link) {
/* The link is large, on the bottom of the header panel. */
- $result = '<tr bgcolor="' . $color[0] . '">' .
- '<td class="medText" align="right" valign="top">' .
- ' ' .
- '</td><td class="medText" valign="top" colspan="2">'."\n";
+ $result = html_tag( 'tr', '', '', $color[0] ) .
+ html_tag( 'td', ' ', 'right', '', 'class="medText" valign="top"' ) .
+ html_tag( 'td', '', 'left', '', 'class="medText" valign="top" colspan="2"' ) . "\n";
} else {
/* The link is subtle, below "view full header". */
- $result = "<BR>\n";
+ $result = "<br>\n";
}
/* Output the link. */
" }\n" .
"// -->\n" .
"</script>\n" .
- "<A HREF=\"javascript:printFormat();\">$print_text</A>\n";
+ "<a href=\"javascript:printFormat();\">$print_text</a>\n";
} else {
- $result .= '<A TARGET="_blank" HREF="../src/printer_friendly_bottom.php' .
- "$params\">$print_text</A>\n";
+ $result .= '<A target="_blank" HREF="../src/printer_friendly_bottom.php' .
+ "$params\">$print_text</a>\n";
}
if (!$pf_subtle_link) {
function ToggleMDNflag ( $set ) {
global $imapConnection, $passed_id, $mailbox;
sqimap_mailbox_select($imapConnection, $mailbox);
-
$sg = $set?'+':'-';
$cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)';
$read = sqimap_run_command ($imapConnection, $cmd, true, $response,
$rem_attachments = array();
foreach ($attachments as $info) {
- if ($info->session == -1) {
+ if ($info['session'] == -1) {
$attached_file = "$hashed_attachment_dir/$info[localfilename]";
if (file_exists($attached_file)) {
unlink($attached_file);
if ($show_more == false) {
if ($i == 1) {
/* From a search... */
- $string .= ' (<A HREF="' . $base_uri .
+ $string .= ' (<a href="' . $base_uri .
"src/read_body.php?mailbox=$urlMailbox&".
"passed_id=$passed_id&";
if (isset($where) && isset($what)) {
$string .= 'what=' . urlencode($what).
"&where=".urlencode($where).
- "$show\">$echo_more</A>)";
+ "$show\">$echo_more</a>)";
} else {
$string .= "sort=$sort&startMessage=".
- "$startMessage"."$show\">$echo_more</A>)";
+ "$startMessage"."$show\">$echo_more</a>)";
}
$i = count($ary);
}
} else if ($i == 1) {
/* From a search... */
- $string .= ' (<A HREF="' . $base_uri .
+ $string .= ' (<a href="' . $base_uri .
"src/read_body.php?mailbox=$urlMailbox&".
"passed_id=$passed_id&";
if (isset($where) && isset($what)) {
$string .= 'what=' . urlencode($what).
"&where=".urlencode($where).
- "$show_n\">$echo_less</A>)";
+ "$show_n\">$echo_less</a>)";
} else {
$string .= "sort=$sort&startMessage=$startMessage".
- "$show_n\">$echo_less</A>)";
+ "$show_n\">$echo_less</a>)";
}
}
}
$read=sqimap_run_command ($imapConnection, "FETCH $passed_id BODY[HEADER]",
true, $a, $b);
- echo '<BR>' .
- '<TABLE WIDTH="100%" CELLPADDING="2" CELLSPACING="0" BORDER="0"'.
- ' ALIGN="CENTER">' . "\n" .
- " <TR><TD BGCOLOR=\"$color[9]\" WIDTH=\"100%\" ALIGN=\"CENTER\"><B>".
- _("Viewing Full Header") . '</B> - '.
+ echo '<br>' .
+ html_tag( 'table', '', 'center', '', 'width="100%" cellpadding="2" cellspacing="0" border="0"' ) . "\n" .
+ html_tag( 'tr' ) .
+ html_tag( 'td', '', 'center', $color[9], 'width="100%"' ) .
+ '<b>' . _("Viewing Full Header") . '</b> - '.
'<a href="' . $base_uri . 'src/read_body.php?mailbox='.
urlencode($mailbox);
if (isset($where) && isset($what)) {
"&show_more=$show_more\">";
}
echo _("View message") . "</a></b></td></tr></table>\n".
- "<table width='99%' cellpadding='2' cellspacing='0' border='0'".
- "align=center>\n".
- '<tr><td>';
+ html_tag( 'table', '', 'center', '', 'width="99%" cellpadding="2" cellspacing="0" border="0"' ) . "\n" .
+ html_tag( 'tr' ) .
+ html_tag( 'td' ) .
$cnum = 0;
for ($i=1; $i < count($read); $i++) {
$s .= ' ' . nl2br($second[$j]);
$j++;
}
- parseEmail($s);
+ if(strtolower($f) != 'message-id:') {
+ parseEmail($s); /* Find and linkify emailaddresses except msgid */
+ }
if (isset($f)) {
echo "<nobr><tt><b>$f</b>$s</tt></nobr>";
}
$dateString = getLongDateString($message->header->date);
-/**
- * What do we reply to -- text only, if possible
- */
-$ent_num = findDisplayEntity($message);
-
/** TEXT STRINGS DEFINITIONS **/
$echo_more = _("more");
$echo_less = _("less");
}
do_hook('read_body_top');
-echo '<BR>' .
- '<TABLE CELLSPACING="0" WIDTH="100%" BORDER="0" ALIGN="CENTER" CELLPADDING="0">' .
- '<TR><TD BGCOLOR="' . $color[9] . '" WIDTH="100%">' .
- '<TABLE WIDTH="100%" CELLSPACING="0" BORDER="0" CELLPADDING="3">' .
- '<TR>' .
- '<TD ALIGN="LEFT" WIDTH="33%">' .
- '<SMALL>' .
- '<A HREF="' . $base_uri . 'src/';
+/**
+ * What do we reply to -- text only, if possible
+ */
+
+$body = '';
+
+/* experimental */
+/*
+if ($message->header->type0 == 'multipart' && $message->header->type1 == 'digest') {
+ listEntities($message);
+ for ($i = 0; $i < count($message->entities); $i++) {
+
+ $msg = $message->entities[$i];
+ $body .= $msg->header->type0 .'/'.$msg->header->type1 .'<BR>';
+
+ $msg->header->type0 = 'message';
+ $msg->header->type1 = 'rfc822';
+ $ent_ar = findDisplayEntity($msg, false);
+ for ($i = 0; $i < count($ent_ar); $i++) {
+ $body .= formatBody($imapConnection, $msg, $color, $wrap_at, $ent_ar[$i]);
+ }
+ $i++;
+ }
+} else {
+*/
+ $ent_ar = findDisplayEntity($message, false);
+ $i = 0;
+ for ($i = 0; $i < count($ent_ar); $i++) {
+ $body .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i]);
+ }
+/*
+}
+*/
+
+/* first step in displaying multiple entities */
+$ent_ar = findDisplayEntity($message,true);
+
+$ent_num = $ent_ar[0];
+for ($i = 1 ; $i < count($ent_ar); $i++) {
+ $ent_num .= '_'.$ent_ar[$i];
+}
+echo '<br>' .
+ html_tag( 'table', '', 'center', '', 'width="100%" cellpadding="0" cellspacing="0" border="0"' ) . "\n" .
+ html_tag( 'tr' ) .
+ html_tag( 'td', '', 'left', $color[9], 'width="100%"' ) .
+ html_tag( 'table', '', '', '', 'width="100%" cellpadding="3" cellspacing="0" border="0"' ) . "\n" .
+ html_tag( 'tr' ) .
+ html_tag( 'td', '', 'left', '', 'width="33%"' ) .
+ '<small>' .
+ '<a href="' . $base_uri . 'src/';
if ($where && $what) {
if ($pos == '') {
echo "right_main.php?sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\">";
}
echo _("Message List") .
- '</A> | ' .
- '<A HREF="' . $base_uri . "src/delete_message.php?mailbox=$urlMailbox&message=$passed_id&";
+ '</a> | ' .
+ '<a href="' . $base_uri . "src/delete_message.php?mailbox=$urlMailbox&message=$passed_id&";
if ($where && $what) {
echo 'where=' . urlencode($where) . '&what=' . urlencode($what) . '">';
} else {
echo "sort=$sort&startMessage=$startMessage\">";
}
-echo _("Delete") . '</A> ';
+echo _("Delete") . '</a> ';
if (($mailbox == $draft_folder) && ($save_as_draft)) {
$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";
-
+ "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";
+
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 '| <a href="' . $comp_uri .'"';
}
echo '>'.
_("Resume Draft") . '</a>';
if ($mailbox == $sent_folder) {
$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";
+ "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 "<a href=\"javascript:void(0)\" onclick=\"comp_in_new(false,'$comp_uri')\"";
} else {
- echo '| <A HREF="' . $comp_uri .'"';
+ echo '| <a href="' . $comp_uri .'"';
}
echo '>'.
_("Edit Message as New") . '</a>';
}
echo ' ' .
- '</SMALL>' .
- '</TD>' .
- '<TD WIDTH="33%" ALIGN="CENTER">' .
- '<SMALL>';
+ '</small>' .
+ '</td>' .
+ html_tag( 'td', '', 'center', '', 'width="33%"' ) .
+ '<small>';
if ( !($where && $what) ) {
if ($currentArrayIndex == -1) {
$next = findNextMessage();
if ($prev != -1) {
- echo '<a href="' . $base_uri . "src/read_body.php?passed_id=$prev&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0\">" . _("Previous") . "</A> | ";
+ echo '<a href="' . $base_uri . "src/read_body.php?passed_id=$prev&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0\">" . _("Previous") . "</a> | ";
} else {
echo _("Previous") . ' | ';
}
if ($next != -1) {
- echo '<a href="' . $base_uri . "src/read_body.php?passed_id=$next&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0\">" . _("Next") . "</A>";
+ echo '<a href="' . $base_uri . "src/read_body.php?passed_id=$next&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0\">" . _("Next") . "</a>";
} else {
echo _("Next");
}
}
}
-echo '</SMALL>' .
- '</TD><TD WIDTH="33%" ALIGN="RIGHT">' .
- '<SMALL>' ;
-
+echo '</small>' .
+ '</td>' .
+ html_tag( 'td', '', 'right', '', 'width="33%"' ) .
+ '<small>' ;
$comp_uri = $base_uri . "src/compose.php?forward_id=$passed_id&".
"forward_subj=$url_subj&".
- ($default_use_priority?"mailprio=$priority_level&":'').
+ ($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 '| <a href="' . $comp_uri .'"';
}
echo '>'.
_("Forward") .
- '</A> | ';
+ '</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 '| <a href="' . $comp_uri .'"';
}
echo '>'.
_("Reply") .
- '</A> | ';
+ '</a> | ';
$comp_uri = $base_uri . "src/compose.php?send_to=$url_replytoall&".
"send_to_cc=$url_replytoallcc&reply_subj=$url_subj&".
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 '| <a href="' . $comp_uri .'"';
}
echo '>'.
_("Reply All") .
- '</A> ' .
- '</SMALL>' .
- '</TD>' .
- '</TR>' .
- '</TABLE>' .
- '</TD></TR>' .
- '<TR><TD WIDTH="100%">' .
- '<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="3">' . "\n" .
- '<TR>' . "\n";
+ '</a> ' .
+ '</small>' .
+ '</td>' .
+ '</tr>' .
+ '</table>' .
+ '</td></tr>' .
+ html_tag( 'tr' ) .
+ html_tag( 'td', '', 'left', '', 'width="100%"' ) .
+ html_tag( 'table', '', '', '', 'width="100%" border="0" cellspacing="0" cellpadding="3"' ) .
+ html_tag( 'tr' ) . "\n";
/** subject **/
-echo "<TD BGCOLOR=\"$color[0]\" WIDTH=\"10%\" ALIGN=\"right\" VALIGN=\"top\">\n" .
- _("Subject:") .
- "</TD><TD BGCOLOR=\"$color[0]\" WIDTH=\"80%\" VALIGN=\"top\">\n" .
- "<B>$subject</B> \n" .
- "</TD>\n" .
- '<TD ROWSPAN="4" width="10%" BGCOLOR="' . $color[0] .
- '" ALIGN=right VALIGN=top NOWRAP><small>'.
- '<A HREF="' . $base_uri . "src/read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&";
+echo html_tag( 'td', _("Subject:"), 'right', $color[0], 'width="10%" valign="top"' ) .
+ html_tag( 'td', '<b>' . $subject . '</b> ' . "\n", 'left', $color[0], 'width="80%" valign="top"' ) .
+ html_tag( 'td', '', 'right', $color[0], 'rowspan="4" width="10%" valign="top" nowrap' ) .
+ '<a href="' . $base_uri . "src/read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&";
/* From a search... */
if ($where && $what) {
echo 'where=' . urlencode($where) . '&what=' . urlencode($what) .
- "&view_hdr=1\">" . _("View Full Header") . "</A>\n";
+ "&view_hdr=1\">" . _("View Full Header") . "</a>\n";
} else {
echo "startMessage=$startMessage&show_more=$show_more&view_hdr=1\">" .
- _("View Full Header") . "</A>\n";
+ _("View Full Header") . "</a>\n";
}
/* Output the printer friendly link if we are in subtle mode. */
}
do_hook("read_body_header_right");
-echo '</small></TD>' .
- ' </TR>';
+echo '</small></td>' .
+ ' </tr>';
/** from **/
-echo '<TR>' .
- '<TD BGCOLOR="' . $color[0] . '" ALIGN="RIGHT">' .
- _("From:") .
- '</TD><TD BGCOLOR="' . $color[0] . '">' .
- "<B>$from_name</B> \n" .
- '</TD>' .
- '</TR>';
+echo html_tag( 'tr', "\n" .
+ html_tag( 'td', _("From:"), 'right', $color[0], 'valign="top"' ) .
+ html_tag( 'td',
+ '<b>' . $from_name . '</b> ' . "\n" ,
+ 'left', $color[0] )
+ ) . "\n";
+ do_hook("read_body_after_from");
/** date **/
-echo '<TR>' . "\n" .
- '<TD BGCOLOR="' . $color[0] . '" ALIGN="RIGHT">' . "\n" .
- _("Date:") .
- "</TD><TD BGCOLOR=\"$color[0]\">\n" .
- "<B>$dateString</B> \n" .
- '</TD>' . "\n" .
- '</TR>' . "\n";
-
+echo html_tag( 'tr', "\n" .
+ html_tag( 'td', _("Date:"), 'right', $color[0], 'valign="top"' ) .
+ html_tag( 'td',
+ '<b>' . $dateString . '</b> ' . "\n" ,
+ 'left', $color[0] )
+ ) . "\n";
/** to **/
-echo "<TR>\n" .
- "<TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>\n" .
- _("To:") .
- '</TD><TD BGCOLOR="' . $color[0] . '" VALIGN="TOP">' . "\n" .
- "<B>$to_string</B> \n" .
- '</TD>' . "\n" .
- '</TR>' . "\n";
+echo html_tag( 'tr', "\n" .
+ html_tag( 'td', _("To:"), 'right', $color[0], 'valign="top"' ) .
+ html_tag( 'td',
+ '<b>' . $to_string . '</b> ' . "\n" ,
+ 'left', $color[0] )
+ ) . "\n";
/** cc **/
if (isset($cc_string) && $cc_string <> '') {
- echo '<TR>' .
- "<TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>" .
- 'Cc:' .
- "</TD><TD BGCOLOR=\"$color[0]\" VALIGN=TOP colspan=2>" .
- "<B>$cc_string</B> " .
- '</TD>' .
- '</TR>' . "\n";
+ echo html_tag( 'tr', "\n" .
+ html_tag( 'td', _("Cc:"), 'right', $color[0], 'valign="top"' ) .
+ html_tag( 'td',
+ '<b>' . $cc_string . '</b> ' . "\n" ,
+ 'left', $color[0], 'colspan="2" valign="top"' )
+ ) . "\n";
}
/** bcc **/
if (isset($bcc_string) && $bcc_string <> '') {
- echo '<TR>'.
- "<TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>" .
- 'Bcc:' .
- "</TD><TD BGCOLOR=\"$color[0]\" VALIGN=TOP colspan=2>" .
- "<B>$bcc_string</B> " .
- '</TD>' .
- '</TR>' . "\n";
+ echo html_tag( 'tr', "\n" .
+ html_tag( 'td', _("Bcc:"), 'right', $color[0], 'valign="top"' ) .
+ html_tag( 'td',
+ '<b>' . $bcc_string . '</b> ' . "\n" ,
+ 'left', $color[0], 'colspan="2" valign="top"' )
+ ) . "\n";
}
if ($default_use_priority && isset($priority_string) && $priority_string <> '' ) {
- echo '<TR>' .
- "<TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>" .
- _("Priority") . ': '.
- "</TD><TD BGCOLOR=\"$color[0]\" VALIGN=TOP colspan=2>" .
- "<B>$priority_string</B> " .
- '</TD>' .
- "</TR>" . "\n";
+ echo html_tag( 'tr', "\n" .
+ html_tag( 'td', _("Priority") . ':', 'right', $color[0], 'valign="top"' ) .
+ html_tag( 'td',
+ '<b>' . $priority_string . '</b> ' . "\n" ,
+ 'left', $color[0], 'colspan="2" valign="top"' )
+ ) . "\n";
}
if ($show_xmailer_default) {
$response, $readmessage);
$mailer = substr($read[1], strpos($read[1], " "));
if (trim($mailer)) {
- echo '<TR>' .
- "<TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>" .
- _("Mailer") . ': '.
- "</TD><TD BGCOLOR=\"$color[0]\" VALIGN=TOP colspan=2>" .
- "<B>$mailer</B> " .
- '</TD>' .
- "</TR>" . "\n";
+ echo html_tag( 'tr', "\n" .
+ html_tag( 'td', _("Mailer") . ':', 'right', $color[0], 'valign="top"' ) .
+ html_tag( 'td',
+ '<b>' . $mailer . '</b> ' ,
+ 'left', $color[0], 'colspan="2" valign="top"' )
+ ) . "\n";
}
}
$read = sqimap_run_command ($imapConnection, "FETCH $passed_id FLAGS", true,
$response, $readmessage);
-
$MDN_flag_present = preg_match( '/.*\$MDNSent/i', $read[0]);
if (trim($MDN_to) &&
$sendreceipt='';
/*
if ($MDNDebug ) {
- echo '<TR>' .
- "<TD BGCOLOR=\"$color[9]\" ALIGN=RIGHT VALIGN=TOP>" .
- _("Read receipt") . ': ' .
- "</TD><TD BGCOLOR=\"$color[9]\" VALIGN=TOP colspan=2>" .
- '<B>' .
- _("send") .
- "</B> <a href=$url>[" . _("Remove MDN flag") . '] </a>' .
- '</TD>' .
- '</TR>' . "\n";
+ echo html_tag( 'tr', "\n" .
+ html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) .
+ html_tag( 'td',
+ '<b>' . _("send") . '</b> <a href="' . $url . '">[' . _("Remove MDN flag") . '] </a> ' ,
+ 'left', $color[9], 'colspan="2" valign="top"' )
+ ) . "\n";
} else {
*/
- echo '<TR>' .
- "<TD BGCOLOR=\"$color[9]\" ALIGN=RIGHT VALIGN=TOP>" .
- _("Read receipt") . ': ' .
- "</TD><TD BGCOLOR=\"$color[9]\" VALIGN=TOP colspan=2>" .
- '<B>'._("send").'</B>'.
- '</TD>' .
- '</TR>' . "\n";
+ echo html_tag( 'tr', "\n" .
+ html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) .
+ html_tag( 'td',
+ '<b>' . _("send") . '</b> ' ,
+ 'left', $color[9], 'colspan="2" valign="top"' )
+ ) . "\n";
/*
}
*/
} // when deleted or draft flag is set don't offer to send a MDN response
else if ( ereg('\\Draft',$read[0] || ereg('\\Deleted',$read[0])) ) {
- echo '<TR>' .
- "<TD BGCOLOR=\"$color[9]\" ALIGN=RIGHT VALIGN=TOP>" .
- _("Read receipt") . ': '.
- "</TD><TD BGCOLOR=\"$color[9]\" VALIGN=TOP colspan=2>" .
- '<B>' . _("requested") . "</B>" .
- '</TD>' .
- '</TR>' . "\n";
+ echo html_tag( 'tr', "\n" .
+ html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) .
+ html_tag( 'td',
+ '<b>' . _("requested") . '</b> ' ,
+ 'left', $color[9], 'colspan="2" valign="top"' )
+ ) . "\n";
}
// if no MDNsupport don't use the annoying popup messages
else if ( !$FirstTimeSee ) {
$sendreceipt = 'send';
$url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\"";
- echo '<TR>' .
- "<TD BGCOLOR=\"$color[9]\" ALIGN=RIGHT VALIGN=TOP>" .
- _("Read receipt") . ': ' .
- "</TD><TD BGCOLOR=\"$color[9]\" VALIGN=TOP colspan=2>" .
- '<B>' . _("requested") .
- "</B> <a href=$url>[" . _("Send read receipt now") . "]</a>" .
- '</TD>' .
- '</TR>' . "\n";
+ echo html_tag( 'tr', "\n" .
+ html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) .
+ html_tag( 'td',
+ '<b>' . _("requested") . '</b> <a href="' . $url . '">[' . _("Send read receipt now") . ']</a>',
+ 'left', $color[9], 'colspan="2" valign="top"' )
+ ) . "\n";
$sendreceipt='';
}
else {
" if (window.confirm(\"" .
_("The message sender has requested a response to indicate that you have read this message. Would you like to send a receipt?") .
"\")) { \n" .
- " window.location=($url); \n" .
- ' window.location.reload()' . "\n" .
+ ' window.open('.$url.',"right");' . "\n" .
' }' . "\n" .
'// -->' . "\n" .
'</script>' . "\n";
}
- echo '<TR>' .
- "<TD BGCOLOR=\"$color[9]\" ALIGN=RIGHT VALIGN=TOP>" .
- _("Read receipt") . ': ' .
- "</TD><TD BGCOLOR=\"$color[9]\" VALIGN=TOP colspan=2>" .
- '<B>' . _("requested") . "  </B><a href=$url>" . '[' .
- _("Send read receipt now") . '] </a>' ." \n" .
- '</TD>' .
- '</TR>' . "\n";
+ echo html_tag( 'tr', "\n" .
+ html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) .
+ html_tag( 'td',
+ '<b>' . _("requested") . '</b>  <a href="' . $url . '">[' . _("Send read receipt now") . ']</a>',
+ 'left', $color[9], 'colspan="2" valign="top"' )
+ ) . "\n";
$sendreceipt = '';
}
}
if ( SendMDN( $MDN_to, $final_recipient ) > 0 && $supportMDN ) {
ToggleMDNflag( true);
}
+ ClearAttachments();
}
$sendreceipt = 'removeMDN';
$url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\"";
$sendreceipt='';
/*
if ($MDNDebug && $supportMDN) {
- echo " <TR>\n" .
- " <TD BGCOLOR=\"$color[9]\" ALIGN=RIGHT VALIGN=TOP>\n" .
- " "._("Read receipt").": \n".
- " </TD><TD BGCOLOR=\"$color[9]\" VALIGN=TOP colspan=2>\n" .
- ' <B>'._("send").'</B>'." <a href=$url>" . '[' . _("Remove MDN flag") . '] </a>' . "\n" .
- ' </TD>' . "\n" .
- ' </TR>' . "\n";
+ echo html_tag( 'tr', "\n" .
+ html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) .
+ html_tag( 'td',
+ '<b>' . _("send") . '</b>  <a href="' . $url . '">[' . _("Remove MDN flag") . ']</a>',
+ 'left', $color[9], 'colspan="2" valign="top"' )
+ ) . "\n";
} else {
*/
- echo " <TR>\n" .
- " <TD BGCOLOR=\"$color[9]\" ALIGN=RIGHT VALIGN=TOP>\n" .
- " "._("Read receipt").": \n".
- " </TD><TD BGCOLOR=\"$color[9]\" VALIGN=TOP colspan=2>\n" .
- ' <B>'._("send").'</B>'. "\n" .
- ' </TD>' . "\n" .
- ' </TR>' . "\n";
+ echo html_tag( 'tr', "\n" .
+ html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) .
+ html_tag( 'td',
+ '<b>' . _("send") . '</b> ',
+ 'left', $color[9], 'colspan="2" valign="top"' )
+ ) . "\n";
/*
}
*/
$sendreceipt = 'send';
$url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\"";
- echo '<TR>'.
- "<TD BGCOLOR=\"$color[9]\" ALIGN=RIGHT VALIGN=TOP>" .
- _("Read receipt") . ': ' .
- "</TD><TD BGCOLOR=\"$color[9]\" VALIGN=TOP colspan=2>" .
- '<B>' . _("requested") .
- "</B> <a href=$url>[" . _("Send read receipt now") . "]</a>" .
- '</TD>' .
- '</TR>' . "\n";
+ echo html_tag( 'tr', "\n" .
+ html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) .
+ html_tag( 'td',
+ '<b>' . _("requested") . '</b> <a href="' . $url . '">[' . _("Send read receipt now") . ']</a>',
+ 'left', $color[9], 'colspan="2" valign="top"' )
+ ) . "\n";
$sendreceipt = '';
}
do_hook('read_body_header');
-echo '</TABLE>' .
- ' </TD></TR>' .
- '</TABLE>';
+echo '</table>' .
+ ' </td></tr>' .
+ '</table>';
flush();
-
-echo "<TABLE CELLSPACING=0 WIDTH=\"97%\" BORDER=0 ALIGN=CENTER CELLPADDING=0>\n" .
- " <TR><TD BGCOLOR=\"$color[4]\" WIDTH=\"100%\">\n" .
- '<BR>'.
- formatBody($imapConnection, $message, $color, $wrap_at).
- '</TD></TR></TABLE>' .
- '<TABLE CELLSPACING="0" WIDTH="100%" BORDER="0" ALIGN="CENTER" CELLPADDING="0">' . "\n" .
- " <TR><TD BGCOLOR=\"$color[9]\"> </TD></TR>" .
- '</TABLE>' . "\n";
+echo html_tag( 'table', "\n" .
+ html_tag( 'tr', "\n" .
+ html_tag( 'td', '<br>' . "\n" . $body . "\n", 'left', $color[4]
+ )
+ ) ,
+ 'center', '', 'cellspacing=0 width="97%" border="0" cellpadding="0"') .
+
+ html_tag( 'table', "\n" .
+ html_tag( 'tr', "\n" .
+ html_tag( 'td', ' ', 'left', $color[9]
+ )
+ ) ,
+ 'center', '', 'cellspacing=0 width="100%" border="0" cellpadding="0"');
/* show attached images inline -- if pref'fed so */
if (($attachment_common_show_images) &&
'&passed_ent_id=' . urlencode($img['ent_id']) .
'&absolute_dl=true';
- echo "<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>\n" .
- '<TR>' .
- '<TD>' .
- "<img src=\"$imgurl\">\n" .
- "</TD>\n" .
- "</TR>\n" .
- "</TABLE>\n";
-
+ echo html_tag( 'table', "\n" .
+ html_tag( 'tr', "\n" .
+ html_tag( 'td', '<img src="' . $imgurl . '">' ."\n", 'left'
+ )
+ ) ,
+ 'center', '', 'cellspacing=0 border="0" cellpadding="2"');
}
}
projects / squirrelmail.git / blobdiff