require_once('../functions/date.php');
require_once('../functions/url_parser.php');
require_once('../functions/smtp.php');
+require_once('../functions/html.php');
+require_once('../src/view_header.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;
+ global $imapConnection, $passed_id, $mailbox, $uid;
sqimap_mailbox_select($imapConnection, $mailbox);
$sg = $set?'+':'-';
$cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)';
$read = sqimap_run_command ($imapConnection, $cmd, true, $response,
- $readmessage);
+ $readmessage, $uid);
}
function ClearAttachments() {
function formatRecipientString($recipients, $item ) {
global $base_uri, $passed_id, $urlMailbox, $startMessage, $show_more_cc,
- $echo_more, $echo_less, $show_more, $show_more_bcc, $sort;
+ $echo_more, $echo_less, $show_more, $show_more_bcc, $sort, $passed_ent_id,
+ $PHP_SELF;
$i = 0;
- $url_string = '';
-
- if (isset ($recipients[0]) && trim($recipients[0])) {
+ $url_string = '';
+ if ((is_array($recipients)) && (isset($recipients[0]))) {
$string = '';
$ary = $recipients;
+ $show = false;
+
+ if ($item == 'to') {
+ if ($show_more) {
+ $show = true;
+ $url = set_url_var($PHP_SELF, 'show_more',0);
+ } else {
+ $url = set_url_var($PHP_SELF, 'show_more',1);
+ }
+ } else if ($item == 'cc') {
+ if ($show_more_cc) {
+ $url = set_url_var($PHP_SELF, 'show_more_cc',0);
+ $show = true;
+ } else {
+ $url = set_url_var($PHP_SELF, 'show_more_cc',1);
+ }
+ } else if ($item == 'bcc') {
+ if ($show_more_bcc) {
+ $url = set_url_var($PHP_SELF, 'show_more_bcc',0);
+ $show = true;
+ } else {
+ $url = set_url_var($PHP_SELF, 'show_more_bcc',1);
+ }
+ }
- switch ($item) {
- case 'to':
- $show = "&show_more=1&show_more_cc=$show_more_cc&".
- "show_more_bcc=$show_more_bcc";
- $show_n = "&show_more=0&show_more_cc=$show_more_cc&".
- "show_more_bcc=$show_more_bcc";
- break;
- case 'cc':
- $show = "&show_more=$show_more&show_more_cc=1&".
- "show_more_bcc=$show_more_bcc";
- $show_n = "&show_more=$show_more&show_more_cc=0&".
- "show_more_bcc=$show_more_bcc";
- $show_more = $show_more_cc;
- break;
- case 'bcc':
- $show = "&show_more=$show_more&show_more_cc=$show_more_cc".
- "&show_more_bcc=1";
- $show_n = "&show_more=$show_more&show_more_cc=".
- "$show_more_cc&show_more_bcc=0";
- $show_more = $show_more_bcc;
- break;
- default:
- $break;
- }
-
- while ($i < count($ary)) {
+ $cnt = count($ary);
+ while ($i < $cnt) {
+ $addr_o = $ary[$i];
+ $ary[$i] = $addr_o->getAddress();
$ary[$i] = decodeHeader(htmlspecialchars($ary[$i]));
$url_string .= $ary[$i];
if ($string) {
- $string = "$string<BR>$ary[$i]";
+ $string .= '<BR>'.$ary[$i];
} else {
- $string = "$ary[$i]";
+ $string = $ary[$i];
+ if ($cnt>1) {
+ $string .= ' (<A HREF="'.$url;
+ if ($show) {
+ $string .= '">'.$echo_less.'</A>)';
+ } else {
+ $string .= '">'.$echo_more.'</A>)';
+ break;
+ }
+ }
}
-
$i++;
- if (count($ary) > 1) {
- if ($show_more == false) {
- if ($i == 1) {
- /* From a search... */
- $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>)";
- } else {
- $string .= "sort=$sort&startMessage=".
- "$startMessage"."$show\">$echo_more</A>)";
- }
- $i = count($ary);
- }
- } else if ($i == 1) {
- /* From a search... */
- $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>)";
- } else {
- $string .= "sort=$sort&startMessage=$startMessage".
- "$show_n\">$echo_less</A>)";
- }
- }
- }
}
}
else {
$passed_id
*/
+global $uid_support, $sqimap_capabilities;
+
if (isset($mailbox)){
$mailbox = urldecode( $mailbox );
}
+
$imapConnection = sqimap_login($username, $key, $imapServerAddress,
$imapPort, 0);
-$read = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
+
+$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
+
+if (!isset($messages)) {
+ $messages = array();
+ session_register('messages');
+}
+
+/**
+ * $message contains all information about the message
+ * including header and body
+ */
+
+$uidvalidity = $mbx_response['UIDVALIDITY'];
+
+if (!isset($messages[$uidvalidity])) {
+ $messages[$uidvalidity] = array();
+}
+if (!isset($messages[$uidvalidity][$passed_id])) {
+ $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
+ $messages[$uidvalidity][$passed_id] = $message;
+ $header = $message->header;
+} else {
+ $message = $messages[$uidvalidity][$passed_id];
+// $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
+ if (isset($passed_ent_id)) {
+ $message = $message->getEntity($passed_ent_id);
+ $message->id = $passed_id;
+ $message->mailbox = $mailbox;
+ }
+ $header = $message->header;
+}
do_hook('html_top');
if($default_use_mdn &&
($mdn_user_support = getPref($data_dir, $username, 'mdn_user_support',
$default_use_mdn))) {
-
- $supportMDN = ServerMDNSupport($read["PERMANENTFLAGS"]);
- $flags = sqimap_get_flags ($imapConnection, $passed_id);
- $FirstTimeSee = !(in_array( 'Seen', $flags ));
+ $supportMDN = ServerMDNSupport($mbx_response["PERMANENTFLAGS"]);
+ $FirstTimeSee = !$message->is_seen;
}
displayPageHeader($color, $mailbox);
-
/*
* The following code shows the header of the message and then exit
*/
if (isset($view_hdr)) {
- $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> - '.
- '<a href="' . $base_uri . 'src/read_body.php?mailbox='.
- urlencode($mailbox);
- if (isset($where) && isset($what)) {
- // Got here from a search
- echo "&passed_id=$passed_id&where=".urlencode($where).
- "&what=".urlencode($what).'">';
- } else {
- echo "&passed_id=$passed_id&startMessage=$startMessage".
- "&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>';
-
- $cnum = 0;
- for ($i=1; $i < count($read); $i++) {
- $line = htmlspecialchars($read[$i]);
- if (eregi("^>", $line)) {
- $second[$i] = $line;
- $first[$i] = ' ';
- $cnum++;
- } else if (eregi("^[ |\t]", $line)) {
- $second[$i] = $line;
- $first[$i] = '';
- } else if (eregi("^([^:]+):(.+)", $line, $regs)) {
- $first[$i] = $regs[1] . ':';
- $second[$i] = $regs[2];
- $cnum++;
- } else {
- $second[$i] = trim($line);
- $first[$i] = '';
- }
- }
- for ($i=0; $i < count($second); $i = $j) {
- if (isset($first[$i])) {
- $f = $first[$i];
- }
- if (isset($second[$i])) {
- $s = nl2br($second[$i]);
- }
- $j = $i + 1;
- while (($first[$j] == '') && ($j < count($first))) {
- $s .= ' ' . nl2br($second[$j]);
- $j++;
- }
- 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>";
- }
- }
- echo "</td></tr></table>\n" .
- '</body></html>';
- sqimap_logout($imapConnection);
- exit;
+ $template_vars = array();
+ parse_viewheader($imapConnection,$passed_id,&$template_vars);
+ $template_vars['return_address'] = set_url_var($PHP_SELF, 'view_hdr');
+ view_header($template_vars, '', '</body></html>');
+ exit;
}
if (isset($msgs)) {
} else {
$currentArrayIndex = -1;
}
+$msgs[$passed_id]['FLAG_SEEN'] = true;
-for ($i = 0; $i < count($msgs); $i++) {
- if ($msgs[$i]['ID'] == $passed_id) {
- $msgs[$i]['FLAG_SEEN'] = true;
- }
+
+/*
+ * The following code sets necesarry stuff for the MDN thing
+ */
+if($default_use_mdn &&
+ ($mdn_user_support = getPref($data_dir, $username, 'mdn_user_support',
+ $default_use_mdn))) {
+ $supportMDN = ServerMDNSupport($mbx_response["PERMANENTFLAGS"]);
+ $FirstTimeSee = !$message->is_seen;
}
-/**
- * $message contains all information about the message
- * including header and body
+/*
+ * The following code shows the header of the message and then exit
*/
-$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
+if (isset($view_hdr)) {
+ $template_vars = array();
+ parse_viewheader($imapConnection,$passed_id,&$template_vars);
+ $template_vars['return_address'] = set_url_var($PHP_SELF, 'view_hdr');
+ view_header($template_vars, '', '</body></html>');
+ exit;
+}
+
+if (isset($msgs)) {
+ $currentArrayIndex = $passed_id;
+} else {
+ $currentArrayIndex = -1;
+}
+$msgs[$passed_id]['FLAG_SEEN'] = true;
/** translate the subject and mailbox into url-able text **/
-$url_subj = urlencode(trim($message->header->subject));
+$url_subj = urlencode(trim($header->subject));
$urlMailbox = urlencode($mailbox);
$url_replyto = '';
-if (isset($message->header->replyto)) {
- $url_replyto = urlencode($message->header->replyto);
+if (isset($header->replyto)) {
+ $addr_o = $header->replyto;
+ $addr_s = $addr_o->getAddress();
+ $url_replyto = urlencode($addr_s);
}
$url_replytoall = $url_replyto;
/**
* If we are replying to all, then find all other addresses and
* add them to the list. Remove duplicates.
- * This is somewhat messy, so I'll explain:
- * 1) Take all addresses (from, to, cc) (avoid nasty join errors here)
- */
-$url_replytoall_extra_addrs = array_merge(
- array($message->header->from),
- $message->header->to,
- $message->header->cc
- );
-
-/**
- * 2) Make one big string out of them
- */
-$url_replytoall_extra_addrs = join(';', $url_replytoall_extra_addrs);
-
-/**
- * 3) Parse that into an array of addresses
*/
-$url_replytoall_extra_addrs = parseAddrs($url_replytoall_extra_addrs);
-/**
- * 4) Make them unique -- weed out duplicates
- * (Coded for PHP 4.0.0)
- */
-$url_replytoall_extra_addrs =
- array_keys(array_flip($url_replytoall_extra_addrs));
+$excl_arr = array();
/**
- * 5) Remove the addresses we'll be sending the message 'to'
+ * 1) Remove the addresses we'll be sending the message 'to'
*/
$url_replytoall_avoid_addrs = '';
-if (isset($message->header->replyto)) {
- $url_replytoall_avoid_addrs = $message->header->replyto;
+if (isset($header->replyto)) {
+ $excl_ar = $header->getAddr_a('replyto');
}
-$url_replytoall_avoid_addrs = parseAddrs($url_replytoall_avoid_addrs);
-foreach ($url_replytoall_avoid_addrs as $addr) {
- RemoveAddress($url_replytoall_extra_addrs, $addr);
-}
/**
- * 6) Remove our identities from the CC list (they still can be in the
+ * 2) Remove our identities from the CC list (they still can be in the
* TO list) only if $include_self_reply_all is turned off
*/
if (!$include_self_reply_all) {
- RemoveAddress($url_replytoall_extra_addrs,
- getPref($data_dir, $username, 'email_address'));
+ $email_address = trim(getPref($data_dir, $username, 'email_address'));
+ $excl_ar[$email_address] = '';
+
$idents = getPref($data_dir, $username, 'identities');
if ($idents != '' && $idents > 1) {
for ($i = 1; $i < $idents; $i ++) {
$cur_email_address = getPref($data_dir, $username,
'email_address' . $i);
- RemoveAddress($url_replytoall_extra_addrs, $cur_email_address);
+ $cur_email_address = strtolower($cur_email_address);
+ $excl_ar[$cur_email_address] = '';
}
}
}
-/**
- * 7) Smoosh back into one nice line
+/**
+ * 3) get the addresses.
*/
-$url_replytoallcc = getLineOfAddrs($url_replytoall_extra_addrs);
+$url_replytoall_ar = $header->getAddr_a(array('from','to','cc'), $excl_ar);
+
+/**
+ * 4) generate the string.
+ */
+$url_replytoallcc = '';
+foreach( $url_replytoall_ar as $email => $personal) {
+ if ($personal) {
+ $url_replytoallcc .= ", \"$personal\" <$email>";
+ } else {
+ $url_replytoallcc .= ', '. $email;
+ }
+}
+$url_replytoallcc = substr($url_replytoallcc,2);
/**
- * 8) urlencode() it
+ * 5) urlencode() it
*/
$url_replytoallcc = urlencode($url_replytoallcc);
-$dateString = getLongDateString($message->header->date);
+$dateString = getLongDateString($header->date);
/**
* What do we reply to -- text only, if possible
*/
$body = '';
+
+/* first step in displaying multiple entities */
-/* 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];
/** FORMAT THE CC STRING **/
-$cc = formatRecipientString($message->header->cc, "cc");
+$cc = formatRecipientString($header->cc, "cc");
$cc_string = $cc['str'];
$url_cc_string = $cc['url_str'];
/** FORMAT THE BCC STRING **/
-$bcc = formatRecipientString($message->header->bcc, "bcc");
+$bcc = formatRecipientString($header->bcc, "bcc");
$bcc_string = $bcc['str'];
$url_bcc_string = $bcc['url_str'];
if ($default_use_priority) {
- $priority_level = substr($message->header->priority,0,1);
+ $priority_level = substr($header->priority,0,1);
switch($priority_level) {
/* check for a higher then normal priority. */
}
/** make sure everything will display in HTML format **/
-$from_name = decodeHeader(htmlspecialchars($message->header->from));
+
+$from_o = $header->from;
+if (is_object($from_o)) {
+ $from_name = $from_o->getAddress();
+} else {
+ $from_name = _("Unknown sender");
+}
+$from_name = decodeHeader(htmlspecialchars($from_name));
$subject = decodeHeader(htmlspecialchars($message->header->subject));
$identity = '';
$idents = getPref($data_dir, $username, 'identities');
}
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/';
+
+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) {
echo 'Previous | Next';
} else {
- $prev = findPreviousMessage();
+ $prev = findPreviousMessage($mbx_response['EXISTS']);
$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";
- do_hook("read_body_after_from");
-echo '</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) {
- $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY.PEEK[HEADER.FIELDS (X-Mailer User-Agent)]", true,
- $response, $readmessage);
- $mailer = substr($read[1], strpos($read[1], " "));
+ $mailer = $header->xmailer;
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";
}
}
// debug gives you the capability to remove mdn-flags
// $MDNDebug = false;
- $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY.PEEK[HEADER.FIELDS (Disposition-Notification-To)]", true,
- $response, $readmessage);
- $MDN_to = substr($read[1], strpos($read[1], ' '));
- $MDN_flag_present = false;
- $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) &&
- (!isset( $sendreceipt ) || $sendreceipt == '' ) ) {
+ if ($header->dnt) {
+ $MDN_to_o = $header->dnt;
+ $MDN_to = $MDN_to_o->getAddress();
+ } else {
+ $MDN_to = '';
+ }
- if ( $MDN_flag_present && $supportMDN) {
+ if ($MDN_to && (!isset( $sendreceipt ) || $sendreceipt == '' ) ) {
+ if ( $message->is_mdnsent && $supportMDN) {
$sendreceipt = 'removeMDN';
+
$url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\"";
$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";
+ else if ( $message->is_draft || $message->is_deleted) {
+ 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 {
'// -->' . "\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 = '';
}
}
$final_recipient = getPref($data_dir, $username, 'email_address', '' );
}
+
$final_recipient = trim($final_recipient);
if ($final_recipient == '' ) {
$final_recipient = getPref($data_dir, $username, 'email_address', '' );
}
- if ( SendMDN( $MDN_to, $final_recipient ) > 0 && $supportMDN ) {
+ if ( SendMDN( $MDN_to, $final_recipient, $message ) > 0 && $supportMDN ) {
ToggleMDNflag( true);
}
ClearAttachments();
$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>';
-echo $body;
-
-echo '</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