X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=e9a6dcfd98f378f0810a399d8b3c5af998960336;hb=39de750f7ebb151f2a03db2e9f0304b4d9b90c1b;hp=c60c0fd61478f20e2a36e911501d9b66614f3242;hpb=62c36fb6c78d9e4c3cb61038a107277d3a02cafd;p=squirrelmail.git diff --git a/src/read_body.php b/src/read_body.php index c60c0fd6..e9a6dcfd 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -1,34 +1,37 @@ $value) { if ($passed_id == $value) { - if ($key == 0) { - break; + if ($key != 0) { + $result = $server_sort_array[$key - 1]; } - $result = $server_sort_array[$key - 1]; break; } } @@ -108,9 +116,11 @@ function findPreviousMessage($numMessages, $passed_id) { /** * Displays a link to a page where the message is displayed more * "printer friendly". + * @param string $mailbox Name of current mailbox + * @param int $passed_id */ -function printer_friendly_link($mailbox, $passed_id, $passed_ent_id, $color) { - global $javascript_on; +function printer_friendly_link($mailbox, $passed_id, $passed_ent_id) { + global $javascript_on, $color; $params = '?passed_ent_id=' . $passed_ent_id . '&mailbox=' . urlencode($mailbox) . @@ -121,35 +131,35 @@ function printer_friendly_link($mailbox, $passed_id, $passed_ent_id, $color) { $result = ''; /* Output the link. */ if ($javascript_on) { - $result .= '\n" . - "$print_text\n"; + $result = '\n" . + "$print_text\n"; } else { - $result .= '$print_text\n"; + $result = '$print_text\n"; } return $result; } function ServerMDNSupport($read) { /* escaping $ doesn't work -> \x36 */ - $ret = preg_match('/(\x36MDNSent|\\\*)/i', $read); + $ret = preg_match('/(\x36MDNSent|\\\\\*)/i', $read); return $ret; } function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { - global $username, $attachment_dir, $_SERVER, + global $username, $attachment_dir, $version, $attachments, $squirrelmail_language, $default_charset, $languages, $useSendmail, $domain, $sent_folder, $popuser, $data_dir, $username; - $SERVER_NAME = $_SERVER['SERVER_NAME']; + sqgetGlobalVar('SERVER_NAME', $SERVER_NAME, SQ_SERVER); $header = $message->rfc822_header; $hashed_attachment_dir = getHashedDir($username, $attachment_dir); @@ -164,27 +174,30 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { } $rfc822_header->content_type = $content_type; $rfc822_header->to[] = $header->dnt; - $rfc822_header->subject = _("Read:") . ' ' . $header->subject; - - - $reply_to = ''; - if (isset($identity) && $identity != 'default') { - $from_mail = getPref($data_dir, $username, - 'email_address' . $identity); - $full_name = getPref($data_dir, $username, - 'full_name' . $identity); - $from_addr = '"'.$full_name.'" <'.$from_mail.'>'; - $reply_to = getPref($data_dir, $username, - 'reply_to' . $identity); + $rfc822_header->subject = _("Read:") . ' ' . encodeHeader($header->subject); + + // Patch #793504 Return Receipt Failing with <@> from Tim Craig (burny_md) + // This merely comes from compose.php and only happens when there is no + // email_addr specified in user's identity (which is the startup config) + if (ereg("^([^@%/]+)[@%/](.+)$", $username, $usernamedata)) { + $popuser = $usernamedata[1]; + $domain = $usernamedata[2]; + unset($usernamedata); } else { - $from_mail = getPref($data_dir, $username, 'email_address'); - $full_name = getPref($data_dir, $username, 'full_name'); - $from_addr = '"'.$full_name.'" <'.$from_mail.'>'; - $reply_to = getPref($data_dir, $username,'reply_to'); + $popuser = $username; } - if (!$from_addr) { - $from_addr = "$popuser@$domain"; - $from_mail = $from_addr; + + $reply_to = ''; + $ident = get_identities(); + if(!isset($identity)) $identity = 0; + $full_name = $ident[$identity]['full_name']; + $from_mail = $ident[$identity]['email_address']; + $from_addr = '"'.$full_name.'" <'.$from_mail.'>'; + $reply_to = $ident[$identity]['reply_to']; + + if (!$from_mail) { + $from_mail = "$popuser@$domain"; + $from_addr = $from_mail; } $rfc822_header->from = $rfc822_header->parseAddress($from_addr,true); if ($reply_to) { @@ -201,8 +214,8 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { $now = getLongDateString( time() ); set_my_charset(); $body = _("Your message") . "\r\n\r\n" . - "\t" . _("To:") . ' ' . $to . "\r\n" . - "\t" . _("Subject:") . ' ' . $header->subject . "\r\n" . + "\t" . _("To:") . ' ' . decodeHeader($to,false,false) . "\r\n" . + "\t" . _("Subject:") . ' ' . decodeHeader($header->subject,false,false) . "\r\n" . "\t" . _("Sent:") . ' ' . $senton . "\r\n" . "\r\n" . sprintf( _("Was displayed on %s"), $now ); @@ -270,18 +283,11 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { } else { require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php'); $deliver = new Deliver_SMTP(); - global $smtpServerAddress, $smtpPort, $use_authenticated_smtp, $pop_before_smtp; - if ($use_authenticated_smtp) { - global $key, $onetimepad; - $user = $username; - $pass = OneTimePadDecrypt($key, $onetimepad); - } else { - $user = ''; - $pass = ''; - } + global $smtpServerAddress, $smtpPort, $smtp_auth_mech, $pop_before_smtp; $authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false; + get_smtp_user($user, $pass); $stream = $deliver->initStream($composeMessage,$domain,0, - $smtpServerAddress, $smtpPort, $authPop); + $smtpServerAddress, $smtpPort, $user, $pass, $authPop); } $success = false; if ($stream) { @@ -289,7 +295,9 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { $success = $deliver->finalizeStream($stream); } if (!$success) { - $msg = $deliver->dlv_msg . '
Server replied: '.$deliver->dlv_ret_nr; + $msg = $deliver->dlv_msg . '
' . + _("Server replied: ") . $deliver->dlv_ret_nr . ' '. + $deliver->dlv_server_msg; require_once(SM_PATH . 'functions/display_messages.php'); plain_error_message($msg, $color); } else { @@ -306,12 +314,11 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { return $success; } - -function ToggleMDNflag ($set ,$imapConnection, $mailbox, $passed_id, $uid_support) { +function ToggleMDNflag ($set ,$imapConnection, $mailbox, $passed_id) { $sg = $set?'+':'-'; $cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)'; $read = sqimap_run_command ($imapConnection, $cmd, true, $response, - $readmessage, $uid_support); + $readmessage, TRUE); } function ClearAttachments() { @@ -320,15 +327,17 @@ function ClearAttachments() { $hashed_attachment_dir = getHashedDir($username, $attachment_dir); $rem_attachments = array(); - foreach ($attachments as $info) { - if ($info['session'] == -1) { - $attached_file = "$hashed_attachment_dir/$info[localfilename]"; - if (file_exists($attached_file)) { - unlink($attached_file); - } - } else { - $rem_attachments[] = $info; - } + if (isset($attachments)) { + foreach ($attachments as $info) { + 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; } @@ -366,7 +375,7 @@ function formatRecipientString($recipients, $item ) { $cnt = count($recipients); foreach($recipients as $r) { - $add = htmlspecialchars($r->getAddress()); + $add = decodeHeader($r->getAddress(true)); if ($string) { $string .= '
' . $add; } else { @@ -388,27 +397,27 @@ function formatRecipientString($recipients, $item ) { function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $color, $FirstTimeSee) { - global $msn_user_support, $default_use_mdn, $draft_folder, $sent_folder, - $default_use_priority, $show_xmailer_default, - $mdn_user_support, $PHP_SELF, $javascript_on; + global $msn_user_support, $default_use_mdn, $default_use_priority, + $show_xmailer_default, $mdn_user_support, $PHP_SELF, $javascript_on, + $squirrelmail_language; $header = $message->rfc822_header; $env = array(); - $env[_("Subject")] = htmlspecialchars(decodeHeader($header->subject)); + $env[_("Subject")] = str_replace(" "," ",decodeHeader($header->subject)); + $from_name = $header->getAddr_s('from'); - if (!$from_name) { + if (!$from_name) $from_name = $header->getAddr_s('sender'); - if (!$from_name) { - $from_name = _("Unknown sender"); - } - } - $env[_("From")] = htmlspecialchars(decodeHeader($from_name)); + if (!$from_name) + $env[_("From")] = _("Unknown sender"); + else + $env[_("From")] = decodeHeader($from_name); $env[_("Date")] = getLongDateString($header->date); $env[_("To")] = formatRecipientString($header->to, "to"); $env[_("Cc")] = formatRecipientString($header->cc, "cc"); $env[_("Bcc")] = formatRecipientString($header->bcc, "bcc"); if ($default_use_priority) { - $env[_("Priority")] = getPriorityStr($header->priority); + $env[_("Priority")] = htmlspecialchars(getPriorityStr($header->priority)); } if ($show_xmailer_default) { $env[_("Mailer")] = decodeHeader($header->xmailer); @@ -417,11 +426,10 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, if ($mdn_user_support) { if ($header->dnt) { if ($message->is_mdnsent) { - $env[_("Read receipt")] = _("send"); + $env[_("Read receipt")] = _("sent"); } else { $env[_("Read receipt")] = _("requested"); - if (!($mailbox == $draft_folder || - $mailbox == $sent_folder || + if (!(handleAsSent($mailbox) || $message->is_deleted || $passed_ent_id)) { $mdn_url = $PHP_SELF . '&sendreceipt=1'; @@ -456,146 +464,285 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, } } echo ''."\n"; - echo '
'."\n"; + ' CELLSPACING="0" BORDER="0" ALIGN="center">'."\n"; + echo '
'."\n"; echo $s; - do_hook("read_body_header"); + do_hook('read_body_header'); formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color); echo '
'; - echo ''."\n"; + echo ''."\n"; echo ''; } -function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response) { - global $base_uri, $sent_folder, $draft_folder, $where, $what, $color, $sort, - $startMessage, $compose_new_win, $PHP_SELF, $save_as_draft, - $enable_forward_as_attachment; +/** + * Format message toolbar + * + * @param string $mailbox Name of current mailbox + * @param int $passed_id UID of current message + * @param int $passed_ent_id Id of entity within message + * @param object $message Current message object + * @param object $mbx_response + */ +function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response, $nav_on_top = TRUE) { + global $base_uri, $draft_folder, $where, $what, $color, $sort, + $startMessage, $PHP_SELF, $save_as_draft, + $enable_forward_as_attachment, $imapConnection, $lastTargetMailbox, + $data_dir, $username, $delete_prev_next_display, + $compose_new_win, $javascript_on; $topbar_delimiter = ' | '; + $double_delimiter = '    '; $urlMailbox = urlencode($mailbox); - $s = ''; + + + // BEGIN MENU ROW - DELETE/REPLY/FORWARD/MOVE/etc. + $menu_row = '' . "\n" . ''; - $comp_action_uri = $comp_uri . '&action=reply_all'; - $s .= $link_open . $comp_action_uri . $link_close . _("Reply All") . ''; - $s .= '
'; $msgs_url = $base_uri . 'src/'; + + // BEGIN NAV ROW - PREV/NEXT, DEL PREV/NEXT, LINKS TO INDEX, etc. + $nav_row = '
'; + + // Create Prev & Next links + // Handle nested entities first (i.e. Mime Attach parts) + if (isset($passed_ent_id) && $passed_ent_id) { + // code for navigating through attached message/rfc822 messages + $url = set_url_var($PHP_SELF, 'passed_ent_id',0); + $entities = array(); + $entity_count = array(); + $c = 0; + + foreach($message->parent->entities as $ent) { + if ($ent->type0 == 'message' && $ent->type1 == 'rfc822') { + $c++; + $entity_count[$c] = $ent->entity_id; + $entities[$ent->entity_id] = $c; + } + } + + $prev_link = _("Previous"); + if($entities[$passed_ent_id] > 1) { + $prev_ent_id = $entity_count[$entities[$passed_ent_id] - 1]; + $prev_link = '' . $prev_link . ''; + } + + $next_link = _("Next"); + if($entities[$passed_ent_id] < $c) { + $next_ent_id = $entity_count[$entities[$passed_ent_id] + 1]; + $next_link = '' . $next_link . ''; + } + + $par_ent_id = $message->parent->entity_id; + $up_link = ''; + if ($par_ent_id) { + $par_ent_id = substr($par_ent_id,0,-2); + if ( $par_ent_id != 0 ) { + $up_link = $topbar_delimiter; + $url = set_url_var($PHP_SELF, 'passed_ent_id',$par_ent_id); + $up_link .= ''._("Up").''; + } + } + + $nav_row .= $prev_link . $up_link . $topbar_delimiter . $next_link; + $nav_row .= $double_delimiter . '['._("View Message").']'; + + // Prev/Next links for regular messages + } else if ( !(isset($where) && isset($what)) ) { + $prev = findPreviousMessage($mbx_response['EXISTS'], $passed_id); + $next = findNextMessage($passed_id); + + $prev_link = _("Previous"); + if ($prev >= 0) { + $uri = $base_uri . 'src/read_body.php?passed_id='.$prev. + '&mailbox='.$urlMailbox.'&sort='.$sort. + '&startMessage='.$startMessage.'&show_more=0'; + $prev_link = ''.$prev_link.''; + } + + $next_link = _("Next"); + if ($next >= 0) { + $uri = $base_uri . 'src/read_body.php?passed_id='.$next. + '&mailbox='.$urlMailbox.'&sort='.$sort. + '&startMessage='.$startMessage.'&show_more=0'; + $next_link = ''.$next_link.''; + } + + // Only bother with Delete & Prev and Delete & Next IF + // top display is enabled. + if ( $delete_prev_next_display == 1 ) { + $del_prev_link = _("Delete & Prev"); + if ($prev >= 0) { + $uri = $base_uri . 'src/read_body.php?passed_id='.$prev. + '&mailbox='.$urlMailbox.'&sort='.$sort. + '&startMessage='.$startMessage.'&show_more=0'. + '&delete_id='.$passed_id; + $del_prev_link = ''.$del_prev_link.''; + } + + $del_next_link = _("Delete & Next"); + if ($next >= 0) { + $uri = $base_uri . 'src/read_body.php?passed_id='.$next. + '&mailbox='.$urlMailbox.'&sort='.$sort. + '&startMessage='.$startMessage.'&show_more=0'. + '&delete_id='.$passed_id; + $del_next_link = ''.$del_next_link.''; + } + } + + $nav_row .= '['.$prev_link.$topbar_delimiter.$next_link.']'; + if ( isset($del_prev_link) && isset($del_next_link) ) + $nav_row .= $double_delimiter.'['.$del_prev_link.$topbar_delimiter.$del_next_link.']'; + } + + // Start with Search Results or Message List link. if (isset($where) && isset($what)) { $msgs_url .= 'search.php?where=' . urlencode($where) . '&what=' . urlencode($what) . '&mailbox=' . $urlMailbox; - $msgs_str = _("Search results"); + $msgs_str = _("Search Results"); } else { $msgs_url .= 'right_main.php?sort=' . $sort . '&startMessage=' . $startMessage . '&mailbox=' . $urlMailbox; $msgs_str = _("Message List"); } - $s .= '' . $msgs_str . ''; - $s .= $topbar_delimiter; + $nav_row .= $double_delimiter . + '[' . $msgs_str . ']'; - $delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox . - '&message=' . $passed_id . '&'; - if (!(isset($passed_ent_id) && $passed_ent_id)) { - if ($where && $what) { - $delete_url .= 'where=' . urlencode($where) . '&what=' . urlencode($what); + $nav_row .= '
'; + $comp_uri = $base_uri.'src/compose.php' . + '?passed_id=' . $passed_id . + '&mailbox=' . $urlMailbox . + '&startMessage=' . $startMessage . + (isset($passed_ent_id) ? '&passed_ent_id='.$passed_ent_id : ''); + + // Start form for reply/reply all/forward.. + $target = ''; + $on_click=''; + $method='method="post" '; + if ($compose_new_win == '1') { + if ( $javascript_on ) { + $on_click=' onclick="comp_in_new_form(\''.$comp_uri.'\', this, this.form)"'; + $comp_uri = 'javascript:void(0)'; + $method='method="get" '; } else { - $delete_url .= 'sort=' . $sort . '&startMessage=' . $startMessage; + $target = 'target="_blank"'; } - $s .= '' . _("Delete") . ''; } - $comp_uri = $base_uri . 'src/compose.php' . - '?passed_id=' . $passed_id . - '&mailbox=' . $urlMailbox . - (isset($passed_ent_id)?'&passed_ent_id='.$passed_ent_id:''); + $menu_row .= "\n".'
'."\n"; - if ($compose_new_win == '1') { - $link_open = ''; - } else { - $link_open = ''; - } + // If Draft folder - create Resume link if (($mailbox == $draft_folder) && ($save_as_draft)) { - $comp_alt_uri = $comp_uri . '&action=draft'; + $new_button = 'smaction_draft'; $comp_alt_string = _("Resume Draft"); - } else if ($mailbox == $sent_folder) { - $comp_alt_uri = $comp_uri . '&action=edit_as_new'; + } else if (handleAsSent($mailbox)) { + // If in Sent folder, edit as new + $new_button = 'smaction_edit_new'; $comp_alt_string = _("Edit Message as New"); } - if (isset($comp_alt_uri)) { - $s .= $topbar_delimiter; - $s .= $link_open . $comp_alt_uri . $link_close . $comp_alt_string . ''; - } + // Show Alt URI for Draft/Sent + if (isset($comp_alt_string)) + $menu_row .= getButton('SUBMIT', $new_button, $comp_alt_string, $on_click) . "\n"; - $s .= '
'; + $menu_row .= getButton('SUBMIT', 'smaction_reply', _("Reply"), $on_click) . "\n"; + $menu_row .= getButton('SUBMIT', 'smaction_reply_all', _("Reply All"), $on_click) ."\n"; + $menu_row .= getButton('SUBMIT', 'smaction_forward', _("Forward"), $on_click); + if ($enable_forward_as_attachment) + $menu_row .= '' . _("Attachment") ."\n"; - if (!(isset($where) && isset($what)) && !$passed_ent_id) { - $prev = findPreviousMessage($mbx_response['EXISTS'], $passed_id); - $next = findNextMessage($passed_id); - if ($prev != -1) { - $uri = $base_uri . 'src/read_body.php?passed_id='.$prev. - '&mailbox='.$urlMailbox.'&sort='.$sort. - '&startMessage='.$startMessage.'&show_more=0'; - $s .= ''._("Previous").''; + $menu_row .= ''.'  '."\n"; + + // Form for deletion + $delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox; + $menu_row .= '
'; + + if (!(isset($passed_ent_id) && $passed_ent_id)) { + $menu_row .= ''; + + if ($where && $what) { + $menu_row .= ''; + $menu_row .= ''; } else { - $s .= _("Previous"); + $menu_row .= ''; + $menu_row .= ''; } - $s .= $topbar_delimiter; - if ($next != -1) { - $uri = $base_uri . 'src/read_body.php?passed_id='.$next. - '&mailbox='.$urlMailbox.'&sort='.$sort. - '&startMessage='.$startMessage.'&show_more=0'; - $s .= ''._("Next").''; + $menu_row .= getButton('SUBMIT', 'delete', _("Delete")); + $menu_row .= '' . _("Bypass Trash"); + } + else + $menu_row .= getButton('SUBMIT', 'delete', _("Delete"), '', FALSE) . "\n"; // delete button is disabled + + $menu_row .= '' . "\n"; + + + // Add top move link + $menu_row .= '
'; + if ( !(isset($passed_ent_id) && $passed_ent_id) ) { + + $current_box = 'mailbox='.$mailbox.'&sort='.$sort.'&startMessage='.$startMessage; + + // Set subsequent location based on whether or not there is a 'next' message. + if ( isset($next) && $next >= 0 ) { + $location = $base_uri . 'src/read_body.php?passed_id='.$next.'&'; + } elseif (isset($prev) && $prev >= 0) { + $location = $base_uri . 'src/read_body.php?passed_id='.$prev.'&'; } else { - $s .= _("Next"); + $location = $base_uri . 'src/right_main.php?'; } - } else if (isset($passed_ent_id) && $passed_ent_id) { - /* code for navigating through attached message/rfc822 messages */ - $url = set_url_var($PHP_SELF, 'passed_ent_id',0); - $s .= ''._("View Message").''; - $par_ent_id = $message->parent->entity_id; - if ($par_ent_id) { - $par_ent_id = substr($par_ent_id,0,-2); - $s .= $topbar_delimiter; - $url = set_url_var($PHP_SELF, 'passed_ent_id',$par_ent_id); - $s .= ''._("Up").''; - } - } - $s .= ''; - $comp_action_uri = $comp_uri . '&action=forward'; - $s .= $link_open . $comp_action_uri . $link_close . _("Forward") . ''; - $s .= $topbar_delimiter; + $menu_row .= '
'. + ''. + ''. + ''. + ''._("Move to:") . + ' '; - $comp_action_uri = decodeHeader($comp_uri . '&action=reply'); - $s .= $link_open . $comp_action_uri . $link_close . _("Reply") . ''; - $s .= $topbar_delimiter; + $menu_row .= getButton('SUBMIT', 'moveButton',_("Move")) . "\n" . ''; + } + $menu_row .= '
'; - do_hook("read_body_menu_top"); - echo $s; - do_hook("read_body_menu_bottom"); + // echo rows, with hooks + $ret = do_hook_function('read_body_menu_top', array($nav_row, $menu_row)); + if (is_array($ret)) { + if (isset($ret[0]) && !empty($ret[0])) { + $nav_row = $ret[0]; + } + if (isset($ret[1]) && !empty($ret[1])) { + $menu_row = $ret[1]; + } + } + echo ''; + echo $nav_on_top ? $nav_row . $menu_row : $menu_row . $nav_row; + echo '
'."\n"; + do_hook('read_body_menu_bottom'); } function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) { global $base_uri; $urlMailbox = urlencode($mailbox); - $url = $base_uri.'src/view_header.php?'.$_SERVER['QUERY_STRING']; + sqgetGlobalVar('QUERY_STRING', $query_string, SQ_SERVER); + $url = $base_uri.'src/view_header.php?'.$query_string; $s = "\n" . - '' . _("Options") . ":  \n" . - '' . + html_tag( 'td', '', 'right', '', 'VALIGN="MIDDLE" WIDTH="20%"' ) . '' . _("Options") . ":  \n" . + html_tag( 'td', '', 'left', '', 'VALIGN="MIDDLE" WIDTH="80%"' ) . '' . ''._("View Full Header").''; /* Output the printer friendly link if we are in subtle mode. */ $s .= ' | ' . - printer_friendly_link($mailbox, $passed_id, $passed_ent_id, $color); + printer_friendly_link($mailbox, $passed_id, $passed_ent_id); echo $s; do_hook("read_body_header_right"); $s = "\n" . @@ -610,100 +757,66 @@ function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) { /* get the globals we may need */ -$username = $_SESSION['username']; -$key = $_COOKIE['key']; -$onetimepad = $_SESSION['onetimepad']; -$msgs = $_SESSION['msgs']; -$base_uri = $_SESSION['base_uri']; -$delimiter = $_SESSION['delimiter']; +sqgetGlobalVar('key', $key, SQ_COOKIE); +sqgetGlobalVar('username', $username, SQ_SESSION); +sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION); +sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); +sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION); + +sqgetGlobalVar('msgs', $msgs, SQ_SESSION); +sqgetGlobalVar('msort', $msort, SQ_SESSION); +sqgetGlobalVar('lastTargetMailbox', $lastTargetMailbox, SQ_SESSION); +sqgetGlobalVar('server_sort_array', $server_sort_array, SQ_SESSION); +if (!sqgetGlobalVar('messages', $messages, SQ_SESSION) ) { + $messages = array(); +} -if (isset($_GET['passed_id'])) { - $passed_id = $_GET['passed_id']; +/** GET VARS */ +sqgetGlobalVar('sendreceipt', $sendreceipt, SQ_GET); +sqgetGlobalVar('where', $where, SQ_GET); +sqgetGlobalVar('what', $what, SQ_GET); +if ( sqgetGlobalVar('show_more', $temp, SQ_GET) ) { + $show_more = (int) $temp; } -elseif (isset($_POST['passed_id'])) { - $passed_id = $_POST['passed_id']; +if ( sqgetGlobalVar('show_more_cc', $temp, SQ_GET) ) { + $show_more_cc = (int) $temp; } - -if (isset($_GET['passed_ent_id'])) { - $passed_ent_id = $_GET['passed_ent_id']; +if ( sqgetGlobalVar('show_more_bcc', $temp, SQ_GET) ) { + $show_more_bcc = (int) $temp; } -elseif (isset($_POST['passed_ent_id'])) { - $passed_ent_id = $_POST['passed_ent_id']; +if ( sqgetGlobalVar('view_hdr', $temp, SQ_GET) ) { + $view_hdr = (int) $temp; } -if (isset($_GET['sendreceipt'])) { - $sendreceipt = $_GET['sendreceipt']; -} +/** GET/POST VARS */ +sqgetGlobalVar('passed_ent_id', $passed_ent_id); +sqgetGlobalVar('mailbox', $mailbox); -if (isset($_GET['sort'])) { - $sort = $_GET['sort']; +if ( sqgetGlobalVar('passed_id', $temp) ) { + $passed_id = (int) $temp; } -elseif (isset($_POST['sort'])) { - $sort = $_POST['sort']; +if ( sqgetGlobalVar('sort', $temp) ) { + $sort = (int) $temp; } -if (isset($_GET['startMessage'])) { - $startMessage = $_GET['startMessage']; +if ( sqgetGlobalVar('startMessage', $temp) ) { + $startMessage = (int) $temp; } -elseif (isset($_POST['startMessage'])) { - $startMessage = $_POST['startMessage']; -} -if (isset($_GET['show_more'])) { - $show_more = $_GET['show_more']; -} -if (isset($_GET['show_more_cc'])) { - $show_more_cc = $_GET['show_more_cc']; -} -if (isset($_GET['show_more_bcc'])) { - $show_more_bcc = $_GET['show_more_bcc']; -} -if (isset($_GET['mailbox'])) { - $mailbox = $_GET['mailbox']; -} -elseif (isset($_POST['mailbox'])) { - $mailbox = $_POST['mailbox']; -} -if (isset($_GET['where'])) { - $where = $_GET['where']; -} -if (isset($_GET['what'])) { - $what = $_GET['what']; -} -if (isset($_GET['view_hdr'])) { - $view_hdr = $_GET['view_hdr']; -} -if (isset($_SESSION['server_sort_array'])) { - $server_sort_array = $_SESSION['server_sort_array']; -} -if (isset($_SESSION['msgs'])) { - $msgs = $_SESSION['msgs']; -} -if (isset($_SESSION['msort'])) { - $msort = $_SESSION['msort']; -} -if (isset($_POST['move_id'])) { - $move_id = $_POST['move_id']; -} -if (isset($_SESSION['lastTargetMailbox'])) { - $lastTargetMailbox = $_SESSION['lastTargetMailbox']; -} -if (isset($_SESSION['messages'])) { - $messages = $_SESSION['messages']; -} else { - $messages = array(); -} - - /* end of get globals */ -global $uid_support, $sqimap_capabilities; - -if (isset($mailbox)) { - $mailbox = urldecode( $mailbox ); -} +global $sqimap_capabilities, $lastTargetMailbox; $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); -$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true); +$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true); +/** + * Process Delete from delete-move-next + * but only if delete_id was set + */ +if ( sqgetGlobalVar('delete_id', $delete_id, SQ_GET) ) { + sqimap_messages_delete($imapConnection, $delete_id, $delete_id, $mailbox); + + sqimap_mailbox_expunge_dmn($delete_id); +} /** * $message contains all information about the message @@ -711,11 +824,11 @@ $mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, t */ $uidvalidity = $mbx_response['UIDVALIDITY']; - + if (!isset($messages[$uidvalidity])) { $messages[$uidvalidity] = array(); -} -if (!isset($messages[$uidvalidity][$passed_id]) || !$uid_support) { +} +if (!isset($messages[$uidvalidity][$passed_id])) { $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); $FirstTimeSee = !$message->is_seen; $message->is_seen = true; @@ -731,7 +844,7 @@ if (isset($passed_ent_id) && $passed_ent_id) { if ($message->type0 != 'message' && $message->type1 != 'rfc822') { $message = $message->parent; } - $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY[$passed_ent_id.HEADER]", true, $response, $msg, $uid_support); + $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY[$passed_ent_id.HEADER]", true, $response, $msg, TRUE); $rfc822_header = new Rfc822Header(); $rfc822_header->parseHeader($read); $message->rfc822_header = $rfc822_header; @@ -748,19 +861,14 @@ do_hook('html_top'); if (isset($sendreceipt)) { if ( !$message->is_mdnsent ) { - if (isset($identity) ) { - $final_recipient = getPref($data_dir, $username, 'email_address' . '0', '' ); - } else { - $final_recipient = getPref($data_dir, $username, 'email_address', '' ); - } - - $final_recipient = trim($final_recipient); - if ($final_recipient == '' ) { - $final_recipient = getPref($data_dir, $username, 'email_address', '' ); - } + $final_recipient = ''; + if ((isset($identity)) && ($identity != 0)) //Main identity + $final_recipient = trim(getPref($data_dir, $username, 'email_address' . $identity, '' )); + if ($final_recipient == '' ) + $final_recipient = trim(getPref($data_dir, $username, 'email_address', '' )); $supportMDN = ServerMDNSupport($mbx_response["PERMANENTFLAGS"]); if ( SendMDN( $mailbox, $passed_id, $final_recipient, $message, $imapConnection ) > 0 && $supportMDN ) { - ToggleMDNflag( true, $imapConnection, $mailbox, $passed_id, $uid_support); + ToggleMDNflag( true, $imapConnection, $mailbox, $passed_id); $message->is_mdnsent = true; $messages[$uidvalidity][$passed_id]=$message; } @@ -772,8 +880,8 @@ if (isset($sendreceipt)) { /***********************************************/ $msgs[$passed_id]['FLAG_SEEN'] = true; - -$messagebody = ''; + +$messagebody = ''; do_hook('read_body_top'); if ($show_html_default == 1) { $ent_ar = $message->findDisplayEntity(array()); @@ -797,31 +905,36 @@ echo ' '; echo '
'; echo ' '; echo ' '; echo '
'; -echo ' '; -echo ' '. html_tag( 'td', '
'. $messagebody."\n", 'left').''; +// echo '
'; +echo html_tag( 'table' ,'' , 'left', '', 'cellpadding="1" cellspacing="5" border="0"' ); +echo ' ' . html_tag( 'td', '
'. $messagebody."\n", 'left') + . ''; echo '
'; echo '
'; echo ' '; +echo ''."\n"; + $attachmentsdisplay = formatAttachments($message,$ent_ar,$mailbox, $passed_id); if ($attachmentsdisplay) { - echo ' '; + echo ' '; echo ' '; echo ' '; - echo '
'; - echo ' '; - echo ' '; - echo '
'; + echo ' '; + echo ' ' . html_tag( 'td', '', 'left', $color[9] ); echo ' ' . _("Attachments") . ':'; echo ' '; echo '
'; echo '
'; echo $attachmentsdisplay; echo '
'; - echo '
'; + echo ' '; echo ' '; + echo ''; } echo ''; @@ -845,6 +958,8 @@ if (($attachment_common_show_images) && } } +formatMenuBar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response, FALSE); + do_hook('read_body_bottom'); do_hook('html_bottom'); sqimap_logout($imapConnection);