X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fread_body.php;h=cc76a830d46167314417066f450d24581e20b75f;hp=c9fe21569710cc0288591fdcb1ef669e00505489;hb=8ed0d71a42bdb66faf6ecc9db45ec594d479a610;hpb=3d570ba0eb0d354b2216225bc0a629e3b4767671 diff --git a/src/read_body.php b/src/read_body.php index c9fe2156..cc76a830 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -20,35 +20,65 @@ require_once('../functions/url_parser.php'); require_once('../functions/smtp.php'); /** -* Given an IMAP message id number, this will look it up in the cached -* and sorted msgs array and return the index. Used for finding the next -* and previous messages. -* -* returns the index of the next valid message from the array -*/ + * Given an IMAP message id number, this will look it up in the cached + * and sorted msgs array and return the index. Used for finding the next + * and previous messages. + * + * @return the index of the next valid message from the array + */ function findNextMessage() { - global $msort, $currentArrayIndex, $msgs, $sort; + global $msort, $currentArrayIndex, $msgs, $sort, + $thread_sort_messages, $allow_server_sort, + $server_sort_array; + if (!is_array($server_sort_array)) { + $thread_sort_messages = 0; + $allow_server_sort = FALSE; + } $result = -1; - - if ($sort == 6) { + if ($thread_sort_messages == 1 || $allow_server_sort == TRUE) { + reset($server_sort_array); + while(list($key, $value) = each ($server_sort_array)) { + if ($currentArrayIndex == $value) { + if ($key == (count($server_sort_array) - 1)) { + $result = -1; + break; + } + $result = $server_sort_array[$key + 1]; + break; + } + } + } + elseif ($sort == 6 && $allow_server_sort != TRUE && + $thread_sort_messages != 1) { if ($currentArrayIndex != 1) { $result = $currentArrayIndex - 1; } - } else { + } + elseif ($allow_server_sort != TRUE && $thread_sort_messages != 1 ) { + if (!is_array($msort)) { + return -1; + } for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) { if ($currentArrayIndex == $msgs[$key]['ID']) { next($msort); $key = key($msort); - if (isset($key)) + if (isset($key)){ $result = $msgs[$key]['ID']; break; + } } } } return ($result); } -/** Removes just one address from the list of addresses. */ +/** + * Removes just one address from the list of addresses. + * + * @param &$addr_list a by-ref array of addresses + * @param $addr an address to remove + * @return void, since it operates on a by-ref param + */ function RemoveAddress(&$addr_list, $addr) { if ($addr != '') { foreach (array_keys($addr_list, $addr) as $key_to_delete) { @@ -60,16 +90,37 @@ function RemoveAddress(&$addr_list, $addr) { /** returns the index of the previous message from the array. */ function findPreviousMessage() { global $msort, $currentArrayIndex, $sort, $msgs, $imapConnection, - $mailbox, $data_dir, $username; - + $mailbox, $data_dir, $username, $thread_sort_messages, + $allow_server_sort, $server_sort_array; $result = -1; - - if ($sort == 6) { + if (!is_array($server_sort_array)) { + $thread_sort_messages = 0; + $allow_server_sort = FALSE; + } + if ($thread_sort_messages == 1 || $allow_server_sort == TRUE) { + reset($server_sort_array); + while(list($key, $value) = each ($server_sort_array)) { + if ($currentArrayIndex == $value) { + if ($key == 0) { + $result = -1; + break; + } + $result = $server_sort_array[$key -1]; + break; + } + } + } + elseif ($sort == 6 && $allow_server_sort != TRUE && + $thread_sort_messages != 1) { $numMessages = sqimap_get_num_messages($imapConnection, $mailbox); if ($currentArrayIndex != $numMessages) { $result = $currentArrayIndex + 1; } - } else { + } + elseif ($thread_sort_messages != 1 && $allow_server_sort != TRUE) { + if (!is_array($msort)) { + return -1; + } for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) { if ($currentArrayIndex == $msgs[$key]['ID']) { prev($msort); @@ -85,9 +136,9 @@ function findPreviousMessage() { } /** -* Displays a link to a page where the message is displayed more -* "printer friendly". -*/ + * Displays a link to a page where the message is displayed more + * "printer friendly". + */ function printer_friendly_link() { global $passed_id, $mailbox, $ent_num, $color, $pf_subtle_link, @@ -98,17 +149,17 @@ function printer_friendly_link() { } $params = '?passed_ent_id=' . $ent_num . - '&mailbox=' . urlencode($mailbox) . - '&passed_id=' . $passed_id; + '&mailbox=' . urlencode($mailbox) . + '&passed_id=' . $passed_id; $print_text = _("View Printable Version"); if (!$pf_subtle_link) { /* The link is large, on the bottom of the header panel. */ - $result = '' . - '' . - ' ' . - ''."\n"; + $result = '' . + '' . + ' ' . + ''."\n"; } else { /* The link is subtle, below "view full header". */ $result = "
\n"; @@ -163,6 +214,8 @@ function SendMDN ( $recipient , $sender) { $subject = $header->subject; $now = getLongDateString( time() ); + set_my_charset(); + $body = _("Your message") . "\r\n\r\n" . "\t" . _("To:") . ' ' . $to . "\r\n" . "\t" . _("Subject:") . ' ' . $subject . "\r\n" . @@ -195,19 +248,19 @@ function SendMDN ( $recipient , $sender) { $newAttachment = array(); $newAttachment['localfilename'] = $localfilename; $newAttachment['type'] = "message/disposition-notification"; - + $newAttachment['session']=-1; $attachments[] = $newAttachment; $MDN_to = trim($recipient); $reply_id = 0; - return (SendMessage($MDN_to,'','', _("Read:") . ' ' . $subject, $body,$reply_id, True, 3) ); + return (SendMessage($MDN_to, '', '', _("Read:") . ' ' . $subject, + $body, $reply_id, True, 3, -1) ); } 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, @@ -219,17 +272,112 @@ function ClearAttachments() { $hashed_attachment_dir = getHashedDir($username, $attachment_dir); + $rem_attachments = array(); foreach ($attachments as $info) { - $attached_file = "$hashed_attachment_dir/$info[localfilename]"; - if (file_exists($attached_file)) { - unlink($attached_file); - } - } + if ($info->session == -1) { + $attached_file = "$hashed_attachment_dir/$info[localfilename]"; + if (file_exists($attached_file)) { + unlink($attached_file); + } + } else { + $rem_attachments[] = $info; + } + } + $attachments = $rem_attachments; +} - $attachments = array(); +function formatRecipientString($recipients, $item ) { + global $base_uri, $passed_id, $urlMailbox, $startMessage, $show_more_cc, + $echo_more, $echo_less, $show_more, $show_more_bcc, $sort; + + $i = 0; + $url_string = ''; + + if (isset ($recipients[0]) && trim($recipients[0])) { + $string = ''; + $ary = $recipients; + + 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)) { + $ary[$i] = decodeHeader(htmlspecialchars($ary[$i])); + $url_string .= $ary[$i]; + if ($string) { + $string = "$string
$ary[$i]"; + } else { + $string = "$ary[$i]"; + } + + $i++; + if (count($ary) > 1) { + if ($show_more == false) { + if ($i == 1) { + /* From a search... */ + $string .= ' ($echo_more)"; + } else { + $string .= "sort=$sort&startMessage=". + "$startMessage"."$show\">$echo_more)"; + } + $i = count($ary); + } + } else if ($i == 1) { + /* From a search... */ + $string .= ' ($echo_less)"; + } else { + $string .= "sort=$sort&startMessage=$startMessage". + "$show_n\">$echo_less)"; + } + } + } + } + } + else { + $string = ''; + } + $url_string = urlencode($url_string); + $result = array(); + $result['str'] = $string; + $result['url_str'] = $url_string; + return $result; } + /* * Main of read_boby.php -------------------------------------------------- */ @@ -240,10 +388,11 @@ function ClearAttachments() { $passed_id */ -if ( isset( $mailbox ) ) { +if (isset($mailbox)){ $mailbox = urldecode( $mailbox ); } -$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); +$imapConnection = sqimap_login($username, $key, $imapServerAddress, + $imapPort, 0); $read = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true); do_hook('html_top'); @@ -251,9 +400,10 @@ do_hook('html_top'); /* * 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) ) ) { - +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 )); @@ -266,22 +416,29 @@ 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); - + $read=sqimap_run_command ($imapConnection, "FETCH $passed_id BODY[HEADER]", + true, $a, $b); + echo '
' . - '' . "\n" . - "
" . _("Viewing Full Header") . ' - '. - '' . "\n" . + "
". + _("Viewing Full Header") . ' - '. + ''; + echo "&passed_id=$passed_id&where=".urlencode($where). + "&what=".urlencode($what).'">'; } else { - echo "&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more\">"; + echo "&passed_id=$passed_id&startMessage=$startMessage". + "&show_more=$show_more\">"; } - echo _("View message") . "
\n" . - "\n" . - '
'; - + echo _("View message") . "
\n". + "\n". + '
'; + $cnum = 0; for ($i=1; $i < count($read); $i++) { $line = htmlspecialchars($read[$i]); @@ -314,10 +471,12 @@ if (isset($view_hdr)) { $j++; } parseEmail($s); - if (isset($f)) echo "$f$s"; + if (isset($f)) { + echo "$f$s"; + } } echo "
\n" . - ''; + ''; sqimap_logout($imapConnection); exit; } @@ -334,8 +493,10 @@ for ($i = 0; $i < count($msgs); $i++) { } } -// $message contains all information about the message -// including header and body +/** + * $message contains all information about the message + * including header and body + */ $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); /** translate the subject and mailbox into url-able text **/ @@ -346,30 +507,40 @@ if (isset($message->header->replyto)) { $url_replyto = urlencode($message->header->replyto); } -$url_replytoall = $url_replyto; +$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) +/** + * 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 -); + array($message->header->from), + $message->header->to, + $message->header->cc + ); -// 2) Make one big string out of them +/** + * 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 +/** + * 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) +/** + * 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)); -// 5) Remove the addresses we'll be sending the message 'to' +/** + * 5) 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; @@ -380,29 +551,38 @@ 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 -// TO list) only if $include_self_reply_all is turned off +/** + * 6) 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')); + getPref($data_dir, $username, '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); + $cur_email_address = getPref($data_dir, $username, + 'email_address' . $i); RemoveAddress($url_replytoall_extra_addrs, $cur_email_address); } } } -// 7) Smoosh back into one nice line +/** + * 7) Smoosh back into one nice line + */ $url_replytoallcc = getLineOfAddrs($url_replytoall_extra_addrs); -// 8) urlencode() it +/** + * 8) urlencode() it + */ $url_replytoallcc = urlencode($url_replytoallcc); $dateString = getLongDateString($message->header->date); -// What do we reply to -- text only, if possible +/** + * What do we reply to -- text only, if possible + */ $ent_num = findDisplayEntity($message); /** TEXT STRINGS DEFINITIONS **/ @@ -413,133 +593,27 @@ if (!isset($show_more_cc)) { $show_more_cc = FALSE; } +if (!isset($show_more_bcc)) { + $show_more_bcc = FALSE; +} + /** FORMAT THE TO STRING **/ -$i = 0; -$to_string = ''; -$to_ary = $message->header->to; -while ($i < count($to_ary)) { - $to_ary[$i] = htmlspecialchars(decodeHeader($to_ary[$i])); - - if ($to_string) { - $to_string = "$to_string
$to_ary[$i]"; - } else { - $to_string = "$to_ary[$i]"; - } +$to = formatRecipientString($message->header->to, "to"); +$to_string = $to['str']; +$url_to_string = $to['url_str']; - $i++; - if (count($to_ary) > 1) { - if ($show_more == false) { - if ($i == 1) { - /* From a search... */ - $to_string .= ' ($echo_more)"; - } else { - $to_string .= "sort=$sort&startMessage=$startMessage&show_more=1&show_more_cc=$show_more_cc\">$echo_more)"; - } - $i = count($to_ary); - } - } else if ($i == 1) { - /* From a search... */ - $to_string .= ' ($echo_less)"; - } else { - $to_string .= "sort=$sort&startMessage=$startMessage&show_more=0&show_more_cc=$show_more_cc\">$echo_less)"; - } - } - } -} /** FORMAT THE CC STRING **/ -$i = 0; -if (isset ($message->header->cc[0]) && trim($message->header->cc[0])) { - $cc_string = ""; - $cc_ary = $message->header->cc; - while ($i < count(decodeHeader($cc_ary))) { - $cc_ary[$i] = htmlspecialchars($cc_ary[$i]); - if ($cc_string) { - $cc_string = "$cc_string
$cc_ary[$i]"; - } else { - $cc_string = "$cc_ary[$i]"; - } - $i++; - if (count($cc_ary) > 1) { - if ($show_more_cc == false) { - if ($i == 1) { - /* From a search... */ - $cc_string .= ' ($echo_more)"; - } else { - $cc_string .= "&sort=$sort&startMessage=$startMessage&show_more_cc=1&show_more=$show_more\">$echo_more)"; - } - $i = count($cc_ary); - } - } else if ($i == 1) { - /* From a search... */ - $cc_string .= ' ($echo_less)"; - } else { - $cc_string .= "sort=$sort&startMessage=$startMessage&show_more_cc=0&show_more=$show_more\">$echo_less)"; - } - } - } - } -} -else { - $cc_string = ''; -} +$cc = formatRecipientString($message->header->cc, "cc"); +$cc_string = $cc['str']; +$url_cc_string = $cc['url_str']; /** FORMAT THE BCC STRING **/ -$i = 0; -if (isset ($message->header->bcc[0]) && trim($message->header->bcc[0])){ - $bcc_string = ""; - $bcc_ary = $message->header->bcc; - while ($i < count(decodeHeader($bcc_ary))) { - $bcc_ary[$i] = htmlspecialchars($bcc_ary[$i]); - if ($bcc_string) { - $bcc_string = "$bcc_string
$bcc_ary[$i]"; - } else { - $bcc_string = "$bcc_ary[$i]"; - } - $i++; - if (count($bcc_ary) > 1) { - if ($show_more_cc == false) { - if ($i == 1) { - /* From a search... */ - $bcc_string .= ' ($echo_more)"; - } else { - $bcc_string .= "sort=$sort&startMessage=$startMessage&show_more_cc=1&show_more=$show_more\">$echo_more)"; - } - $i = count($bcc_ary); - } - } else if ($i == 1) { - /* From a search... */ - $bcc_string .= ' ($echo_less)"; - } else { - $bcc_string .= "sort=$sort&startMessage=$startMessage&show_more_cc=0&show_more=$show_more\">$echo_less)"; - } - } - } - } -} -else { - $bcc_string = ''; -} +$bcc = formatRecipientString($message->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); @@ -570,6 +644,22 @@ if ($default_use_priority) { /** make sure everything will display in HTML format **/ $from_name = decodeHeader(htmlspecialchars($message->header->from)); $subject = decodeHeader(htmlspecialchars($message->header->subject)); +$identity = ''; +$idents = getPref($data_dir, $username, 'identities'); +if (!empty($idents) && $idents > 1) { + for ($i = 1; $i < $idents; $i++) { + $enc_from_name = '"'. + encodeHeader(getPref($data_dir, + $username, + 'full_name' . $i)) . + '" <' . getPref($data_dir, $username, + 'email_address' . $i) . '>'; + if (htmlspecialchars($enc_from_name) == $from_name) { + $identity = $i; + break; + } + } +} do_hook('read_body_top'); echo '
' . @@ -582,10 +672,10 @@ echo '
' . '"; + echo "search.php?where=".urlencode($where)."&pos=$pos&what=".urlencode($what)."&mailbox=$urlMailbox\">"; } else { echo "right_main.php?sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\">"; } @@ -599,14 +689,35 @@ if ($where && $what) { } echo _("Delete") . ' '; if (($mailbox == $draft_folder) && ($save_as_draft)) { - echo '| '. _("Resume Draft") . ''; } +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"; + + if ($compose_new_win == '1') { + echo "'. + _("Edit Message as New") . ''; +} echo '  ' . '' . @@ -615,7 +726,6 @@ echo '  ' . ''; if ( !($where && $what) ) { - if ($currentArrayIndex == -1) { echo 'Previous | Next'; } else { @@ -638,31 +748,49 @@ if ( !($where && $what) ) { echo '' . '' . - '' . - '' ; + +$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 "'. _("Forward") . - ' | ' . - ' | '; + +$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 "'. _("Reply") . - ' | ' . - ' | '; + +$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 "'. _("Reply All") . '  ' . @@ -783,7 +911,7 @@ if ($default_use_mdn) { if ($mdn_user_support) { // debug gives you the capability to remove mdn-flags - $MDNDebug = false; + // $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], ' ')); @@ -791,7 +919,6 @@ if ($default_use_mdn) { $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) && @@ -800,7 +927,8 @@ if ($default_use_mdn) { if ( $MDN_flag_present && $supportMDN) { $sendreceipt = 'removeMDN'; $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\""; - $sendreceipt=""; + $sendreceipt=''; + /* if ($MDNDebug ) { echo '' . "" . @@ -812,14 +940,17 @@ if ($default_use_mdn) { '' . '' . "\n"; } else { - echo '' . - "" . - _("Read receipt") . ': ' . - "" . - ''._("send").''. - '' . - '' . "\n"; + */ + echo '' . + "" . + _("Read receipt") . ': ' . + "" . + ''._("send").''. + '' . + '' . "\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])) ) { @@ -834,7 +965,7 @@ if ($default_use_mdn) { // 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\""; + $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\""; echo '' . "" . _("Read receipt") . ': ' . @@ -847,15 +978,14 @@ if ($default_use_mdn) { } else { $sendreceipt = 'send'; - $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\""; + $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\""; if ($javascript_on) { echo "' . "\n"; @@ -892,8 +1022,8 @@ if ($default_use_mdn) { } $sendreceipt = 'removeMDN'; $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\""; - $sendreceipt=""; - + $sendreceipt=''; + /* if ($MDNDebug && $supportMDN) { echo " \n" . " \n" . @@ -903,6 +1033,7 @@ if ($default_use_mdn) { ' ' . "\n" . ' ' . "\n"; } else { + */ echo " \n" . " \n" . " "._("Read receipt").": \n". @@ -910,7 +1041,9 @@ if ($default_use_mdn) { ' '._("send").''. "\n" . ' ' . "\n" . ' ' . "\n"; + /* } + */ } elseif ($sendreceipt == 'removeMDN' ) { ToggleMDNflag ( false );