X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=b656eef502f2a931f39e813688e5eb6d2b45e55b;hp=cce333f2d497c2596e7cb14894439053bf9cac9c;hb=04f17bd9fcafc9c7fe477bb88492b3c519ac4fb1;hpb=d36854019be01c90ac10b29536c8880caa56f3f7 diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index cce333f2..b656eef5 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -1,17 +1,17 @@ 1 ) { + $where = $aMsg['SEARCH'][0]; + $what = $aMsg['SEARCH'][1]; + } else { + $where = false; + $what = false; + } + $iIndent = $aMsg['INDENT']; + + $sSubject = (isset($msg['SUBJECT']) && $msg['SUBJECT'] != '') ? $msg['SUBJECT'] : _("(no subject)"); + $sFrom = (isset($msg['FROM'])) ? $msg['FROM'] : _("Unknown sender"); + $sTo = (isset($msg['TO'])) ? $msg['TO'] : _("Unknown recipient"); + $sCc = (isset($msg['CC'])) ? $msg['CC'] : ''; + $aFlags = (isset($msg['FLAGS'])) ? $msg['FLAGS'] : array(); + $iPrio = (isset($msg['PRIORITY'])) ? $msg['PRIORITY'] : 3; + $iSize = (isset($msg['SIZE'])) ? $msg['SIZE'] : 0; + $sType0 = (isset($msg['TYPE0'])) ? $msg['TYPE0'] : 'text'; + $sType1 = (isset($msg['TYPE1'])) ? $msg['TYPE1'] : 'plain'; + if (isset($msg['INTERNALDATE'])) { + $sDate = getDateString(getTimeStamp(explode(' ',$msg['INTERNALDATE']))); + } else { + $sDate = (isset($msg['DATE'])) ? getDateString(getTimeStamp(explode(' ',$msg['DATE']))) : ''; + } + $iId = (isset($msg['ID'])) ? $msg['ID'] : false; + + if (!$iId) { + return; + } + if ($GLOBALS['alt_index_colors']) { - if (!isset($row_count)) { - $row_count = 0; - } - $row_count++; - if ($row_count % 2) { + if (!($t % 2)) { if (!isset($color[12])) { $color[12] = '#EAEAEA'; } $color_string = $color[12]; } } - $msg = $msgs[$key]; - if($mailbox == 'None') { - $boxes = sqimap_mailbox_list($imapConnection); - $mailbox = $boxes[0]['unformatted']; - unset($boxes); - } $urlMailbox = urlencode($mailbox); + // FIXME, foldertype should be set in right_main.php + // in other words, handle as sent is obsoleted from now. + // We replace that by providing an array to aMailbox with the to shown headers + // that way we are free to show the user different layouts for different folders $bSentFolder = handleAsSent($mailbox); if ((!$bSentFolder) && ($show_recipient_instead)) { // If the From address is the same as $email_address, then handle as Sent - $from_array = parseAddress($msg['FROM'], 1); + $from_array = parseAddress($sFrom, 1); if (!isset($email_address)) { global $datadir, $username; $email_address = getPref($datadir, $username, 'email_address'); } $bHandleAsSent = ((isset($from_array[0][0])) && ($from_array[0][0] == $email_address)); - } - else + } else { $bHandleAsSent = $bSentFolder; + } // If this is a Sent message, display To address instead of From - if ($bHandleAsSent) - $msg['FROM'] = $msg['TO']; + if ($bHandleAsSent) { + $sFrom = $sTo; + } // Passing 1 below results in only 1 address being parsed, thus defeating the following code - $msg['FROM'] = parseAddress($msg['FROM']/*,1*/); + $sFrom = parseAddress($sFrom/*,1*/); - /* + /* * This is done in case you're looking into Sent folders, * because you can have multiple receivers. */ - $senderNames = $msg['FROM']; + $senderNames = $sFrom; $senderName = ''; $senderAddress = ''; if (sizeof($senderNames)){ @@ -133,38 +185,47 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox, $senderAddress = _("To:") . ' ' . $senderAddress; } - if ($truncate_sender > 0) - $senderName = truncateWithEntities($senderName, $truncate_sender); - - echo html_tag( 'tr','','','','VALIGN="top"') . "\n"; - - if (isset($msg['FLAG_FLAGGED']) && ($msg['FLAG_FLAGGED'] == true)) { - $flag = ""; - $flag_end = ''; - } else { - $flag = ''; - $flag_end = ''; + // this is a column property which can apply to multiple columns. Do not use vars for one column + // only. instead we should use something like this: + // 1ed column $aMailbox['columns']['SUBJECT'] value: aray with properties ... + // 2ed column $aMailbox['columns']['FROM'] value: aray with properties ... + // NB in case of the sentfolder this could be the TO field + // properties array example: + // 'truncate' => length (0 is no truncate) + // 'prefix => if (x in b then do that ) + if ($truncate_sender > 0) { + $senderName = truncateWithEntities($senderName, $truncate_sender); } - if (!isset($msg['FLAG_SEEN']) || ($msg['FLAG_SEEN'] == false)) { - $bold = ''; - $bold_end = ''; - } else { - $bold = ''; - $bold_end = ''; + + $flag = $flag_end = $bold = $bold_end = $fontstr = $fontstr_end = $italic = $italic_end = ''; + $bold = ''; + $bold_end = ''; + + foreach ($aFlags as $sFlag => $value) { + switch ($sFlag) { + case '\\flagged': + if ($value) { + $flag = ""; + $flag_end = ''; + } + break; + case '\\seen': + if ($value) { + $bold = ''; + $bold_end = ''; + } + break; + case '\\deleted': + if ($value) { + $fontstr = ""; + $fontstr_end = ''; + } + break; + } } if ($bHandleAsSent) { $italic = ''; $italic_end = ''; - } else { - $italic = ''; - $italic_end = ''; - } - if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) { - $fontstr = ""; - $fontstr_end = ''; - } else { - $fontstr = ''; - $fontstr_end = ''; } if ($where && $what) { @@ -172,10 +233,13 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox, } else { $searchstr = ''; } - + /* + * Message highlight code + */ + $matches = array('TO' => 'sTo', 'CC' => 'sCc', 'FROM' => 'sFrom', 'SUBJECT' => 'sSubject'); if (is_array($message_highlight_list) && count($message_highlight_list)) { - $msg['TO'] = parseAddress($msg['TO']); - $msg['CC'] = parseAddress($msg['CC']); + $sTo = parseAddress($sTo); + $sCc = parseAddress($sCc); foreach ($message_highlight_list as $message_highlight_list_part) { if (trim($message_highlight_list_part['value']) != '') { $high_val = strtolower($message_highlight_list_part['value']); @@ -190,7 +254,7 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox, case('TO'): case('CC'): case('FROM'): - foreach ($msg[$match_type] as $address) { + foreach ($$matches[$match_type] as $address) { $address[0] = decodeHeader($address[0], true, false); $address[1] = decodeHeader($address[1], true, false); if (strstr('^^' . strtolower($address[0]), $high_val) || @@ -201,74 +265,73 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox, } break; default: - $headertest = strtolower(decodeHeader($msg[$match_type], true, false)); + $headertest = strtolower(decodeHeader($$matches[$match_type], true, false)); if (strstr('^^' . $headertest, $high_val)) { $hlt_color = $message_highlight_list_part['color']; - break 3; + break 3; } break; } } } } - } + } /* end Message highlight code */ if (!isset($hlt_color)) { $hlt_color = $color_string; } - $checked = ($checkall == 1) ? ' CHECKED' : ''; $col = 0; - $msg['SUBJECT'] = str_replace(' ', ' ', decodeHeader($msg['SUBJECT'])); - $subject = processSubject($msg['SUBJECT'], $indent_array[$msg['ID']]); + $sSubject = str_replace(' ', ' ', decodeHeader($sSubject)); + $subject = processSubject($sSubject, $iIndent); + + echo html_tag( 'tr','','','','VALIGN="top"') . "\n"; + if (sizeof($index_order)) { foreach ($index_order as $index_order_part) { switch ($index_order_part) { case 1: /* checkbox */ echo html_tag( 'td', - "", - 'center', - $hlt_color ); + addCheckBox("msg[$t]", $checkall, $iId), + 'center', + $hlt_color ); break; case 2: /* from */ if ($senderAddress != $senderName) { $senderAddress = strtr($senderAddress, array_flip(get_html_translation_table(HTML_SPECIALCHARS))); $title = ' title="' . str_replace('"', "''", $senderAddress) . '"'; - } - else + } else { $title = ''; + } echo html_tag( 'td', - $italic . $bold . $flag . $fontstr . $senderName . - $fontstr_end . $flag_end . $bold_end . $italic_end, - 'left', - $hlt_color, $title ); + $italic . $bold . $flag . $fontstr . $senderName . + $fontstr_end . $flag_end . $bold_end . $italic_end, + 'left', + $hlt_color, $title ); break; case 3: /* date */ - $date_string = $msg['DATE_STRING'] . ''; - if ($date_string == '') { - $date_string = _("Unknown date"); + if ($sDate == '') { + $sDate = _("Unknown date"); } echo html_tag( 'td', - $bold . $flag . $fontstr . $date_string . - $fontstr_end . $flag_end . $bold_end, - 'center', - $hlt_color, - 'nowrap' ); + $bold . $flag . $fontstr . $sDate . + $fontstr_end . $flag_end . $bold_end, + 'center', + $hlt_color, + 'nowrap' ); break; case 4: /* subject */ $td_str = $bold; - if ($thread_sort_messages == 1) { - if (isset($indent_array[$msg['ID']])) { - $td_str .= str_repeat("    ",$indent_array[$msg['ID']]); - } + if ($iIndent) { + $td_str .= str_repeat("    ",$iIndent); } $td_str .= ' '); + if (isset($aFlags['\\flagged']) && $aFlags['\\flagged'] == true) { + $td_str .= ' '; } if ($default_use_priority) { - if ( ($msg['PRIORITY'] == 1) || ($msg['PRIORITY'] == 2) ) { - $td_str .= ' '; + if ( ($iPrio == 1) || ($iPrio == 2) ) { + $td_str .= ' '; } - else if ($msg['PRIORITY'] == 5) { - $td_str .= ' '; + else if ($iPrio == 5) { + $td_str .= ' '; } - else - { - $td_str .= ' '; + else { + $td_str .= ' '; } } - if ($msg['TYPE0'] == 'multipart') { - $td_str .= ''; - } - else - { - $td_str .= ''; + if ($sType1 == 'mixed') { + $td_str .= ''; + } else { + $td_str .= ''; } $msg_icon = ''; - if (!isset($msg['FLAG_SEEN']) || ($msg['FLAG_SEEN']) == false) - { + if (!isset($aFlags['\\seen']) || ($aFlags['\\seen']) == false) { $msg_alt = '(' . _("New") . ')'; $msg_title = '(' . _("New") . ')'; $msg_icon .= SM_PATH . 'images/themes/' . $icon_theme . '/msg_new'; - } - else - { + } else { $msg_alt = '(' . _("Read") . ')'; $msg_title = '(' . _("Read") . ')'; $msg_icon .= SM_PATH . 'images/themes/' . $icon_theme . '/msg_read'; } - if (isset($msg['FLAG_DELETED']) && ($msg['FLAG_DELETED']) == true) - { + if (isset($aFlags['\\deleted']) && ($aFlags['\\deleted']) == true) { $msg_icon .= '_deleted'; } - if (isset($msg['FLAG_ANSWERED']) && ($msg['FLAG_ANSWERED']) == true) - { + if (isset($aFlags['\\answered']) && ($aFlags['\\answered']) == true) { $msg_alt = '(' . _("Answered") . ')'; $msg_title = '(' . _("Answered") . ')'; $msg_icon .= '_reply'; } - $td_str .= ''. $msg_alt . ''; + $td_str .= ''. $msg_alt . ''; $td_str .= ''; echo html_tag( 'td', - $td_str, - 'right', - $hlt_color, - 'nowrap' ); + $td_str, + 'right', + $hlt_color, + 'nowrap' ); } - // plain text message markers // else { $stuff = false; $td_str = ""; - if (isset($msg['FLAG_ANSWERED']) && $msg['FLAG_ANSWERED'] == true) { + if (isset($aFlags['\\answered']) && $aFlags['\\answered'] == true) { $td_str .= _("A"); $stuff = true; } - if ($msg['TYPE0'] == 'multipart') { + if ($sType1 == 'mixed') { $td_str .= '+'; $stuff = true; } if ($default_use_priority) { - if ( ($msg['PRIORITY'] == 1) || ($msg['PRIORITY'] == 2) ) { + if ( ($iPrio == 1) || ($iPrio == 2) ) { $td_str .= "!"; $stuff = true; } - if ($msg['PRIORITY'] == 5) { + if ($iPrio == 5) { $td_str .= "?"; $stuff = true; } } - if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED'] == true) { + if (isset($aFlags['\\deleted']) && $aFlags['\\deleted'] == true) { $td_str .= "D"; $stuff = true; } @@ -369,415 +423,369 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox, } $td_str .= ''; echo html_tag( 'td', - $td_str, - 'center', - $hlt_color, - 'nowrap' ); + $td_str, + 'center', + $hlt_color, + 'nowrap' ); } break; case 6: /* size */ echo html_tag( 'td', - $bold . $fontstr . show_readable_size($msg['SIZE']) . - $fontstr_end . $bold_end, - 'right', - $hlt_color ); + $bold . $fontstr . show_readable_size($iSize) . + $fontstr_end . $bold_end, + 'right', + $hlt_color ); break; } ++$col; } } - if ($not_last) { - echo '' . "\n" . '' . "\n"; - } else { + /* html for separationlines between rows */ + if ($last) { echo ''."\n"; - } -} - -function getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id) { - if ($id != 'no') { - $id = array_slice($id, ($start_msg-1), $show_num); - $end = $start_msg + $show_num - 1; - if ($num_msgs < $show_num) { - $end_loop = $num_msgs; - } else if ($end > $num_msgs) { - $end_loop = $num_msgs - $start_msg + 1; - } else { - $end_loop = $show_num; - } - return fillMessageArray($imapConnection,$id,$end_loop,$show_num); } else { - return false; + echo '' . "\n" . '' . "\n"; } } -function getThreadMessages($imapConnection, $start_msg, $show_num, $num_msgs) { - $id = get_thread_sort($imapConnection); - return getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id); -} +/** +* Does the $sort $_GET var to field mapping +* +* @param int $sort Field to sort on +* @param bool $bServerSort Server sorting is true +* @param mixed $key UNDOCUMENTED +* @return string $sSortField Field tosort on +*/ +function getSortField($sort,$bServerSort) { + switch($sort) { + case SQSORT_NONE: + $sSortField = 'UID'; + break; + case SQSORT_DATE_ASC: + case SQSORT_DATE_DEC: + $sSortField = 'DATE'; + break; + case SQSORT_FROM_ASC: + case SQSORT_FROM_DEC: + $sSortField = 'FROM'; + break; + case SQSORT_SUBJ_ASC: + case SQSORT_SUBJ_DEC: + $sSortField = 'SUBJECT'; + break; + case SQSORT_SIZE_ASC: + case SQSORT_SIZE_DEC: + $sSortField = ($bServerSort) ? 'SIZE' : 'RFC822.SIZE'; + break; + case SQSORT_TO_ASC: + case SQSORT_TO_DEC: + $sSortField = 'TO'; + break; + case SQSORT_CC_ASC: + case SQSORT_CC_DEC: + $sSortField = 'CC'; + break; + case SQSORT_INT_DATE_ASC: + case SQSORT_INT_DATE_DEC: + $sSortField = ($bServerSort) ? 'ARRIVAL' : 'INTERNALDATE'; + break; + case SQSORT_THREAD: + break; + default: $sSortField = 'UID'; + break; -function getServerSortMessages($imapConnection, $start_msg, $show_num, - $num_msgs, $server_sort_order, $mbxresponse) { - $id = sqimap_get_sort_order($imapConnection, $server_sort_order,$mbxresponse); - return getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id); + } + return $sSortField; } -function getSelfSortMessages($imapConnection, $start_msg, $show_num, - $num_msgs, $sort, $mbxresponse) { - $msgs = array(); - if ($num_msgs >= 1) { - $id = sqimap_get_php_sort_order ($imapConnection, $mbxresponse); - if ($sort < 6 ) { - $end = $num_msgs; - $end_loop = $end; - /* set shownum to 999999 to fool sqimap_get_small_header_list - and rebuild the msgs_str to 1:* */ - $show_num = 999999; - } else { - /* if it's not sorted */ - if ($start_msg + ($show_num - 1) < $num_msgs) { - $end_msg = $start_msg + ($show_num - 1); - } else { - $end_msg = $num_msgs; - } - if ($end_msg < $start_msg) { - $start_msg = $start_msg - $show_num; - if ($start_msg < 1) { - $start_msg = 1; - } - } - $id = array_slice(array_reverse($id), ($start_msg-1), $show_num); - $end = $start_msg + $show_num - 1; - if ($num_msgs < $show_num) { - $end_loop = $num_msgs; - } else if ($end > $num_msgs) { - $end_loop = $num_msgs - $start_msg + 1; - } else { - $end_loop = $show_num; - } +function get_sorted_msgs_list($imapConnection,$aMailbox,&$error) { + $bDirection = ($aMailbox['SORT'] % 2); + $error = false; + switch ($aMailbox['SORT_METHOD']) { + case 'THREAD': + $id = get_thread_sort($imapConnection); + if ($id === false) { + $error = '
' . + _("Thread sorting is not supported by your IMAP server.") . '
' . + _("Please report this to the system administrator."). + '
'; + } + break; + case 'SERVER': + $sSortField = getSortField($aMailbox['SORT'],true); + $id = sqimap_get_sort_order($imapConnection, $sSortField, $bDirection); + if ($id === false) { + $error = '
' . + _( "Server-side sorting is not supported by your IMAP server.") . '
' . + _("Please report this to the system administrator."). + '
'; } - $msgs = fillMessageArray($imapConnection,$id,$end_loop, $show_num); + break; + default: + $sSortField = getSortField($aMailbox['SORT'],false); + $id = get_squirrel_sort($imapConnection, $sSortField, $bDirection); + break; } - return $msgs; + return $id; } +/** +* This function loops through a group of messages in the mailbox +* and shows them to the user. +* +* @param mixed $imapConnection +* @param array $aMailbox associative array with mailbox related vars +*/ +function showMessagesForMailbox($imapConnection, $aMailbox) { + global $msgs, $server_sort_array, $indent_array, $color; + // to retrieve the internaldate pref: (I know this is not the right place to do that, move up in front + // and use a properties array as function argument to provide user preferences + global $data_dir, $username; -/* - * This function loops through a group of messages in the mailbox - * and shows them to the user. - */ -function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, - $start_msg, $sort, $color, $show_num, - $use_cache, $mode='') { - global $msgs, $msort, $auto_expunge, $thread_sort_messages, - $allow_server_sort, $server_sort_order; - - /* - * For some reason, on PHP 4.3+, this being unset, and set in the session causes havoc - * so setting it to an empty array beforehand seems to clean up the issue, and stopping the - * "Your script possibly relies on a session side-effect which existed until PHP 4.2.3" error - */ - - if (!isset($msort)) { - $msort = array(); - } - - if (!isset($msgs)) { - $msgs = array(); - } - - //$start = microtime(); - /* If autoexpunge is turned on, then do it now. */ - $mbxresponse = sqimap_mailbox_select($imapConnection, $mailbox); - $srt = $sort; - /* If autoexpunge is turned on, then do it now. */ - if ($auto_expunge == true) { - $exp_cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, false, ''); - $mbxresponse['EXISTS'] = $mbxresponse['EXISTS'] - $exp_cnt; - $num_msgs = $mbxresponse['EXISTS']; - } - - if ($mbxresponse['EXISTS'] > 0) { - /* if $start_msg is lower than $num_msgs, we probably deleted all messages - * in the last page. We need to re-adjust the start_msg - */ - - if($start_msg > $num_msgs) { - $start_msg -= $show_num; + /* if there's no messages in this folder */ + if ($aMailbox['EXISTS'] == 0) { + $string = '' . _("THIS FOLDER IS EMPTY") . ''; + echo ' '; + echo ' '; + echo '
'; + echo ' '; + echo ' '; + echo '

'; + echo ' '; + echo ' ' . html_tag( 'td', $string."\n", 'left') + . ''; + echo '
'; + echo '
'; + return; + } else { + /* + * Adjust the start_msg + */ + $start_msg = $aMailbox['PAGEOFFSET']; + if($aMailbox['PAGEOFFSET'] > $aMailbox['EXISTS']) { + $start_msg -= $aMailbox['LIMIT']; if($start_msg < 1) { $start_msg = 1; } } + $aMailbox['SEARCH'] = array(); // Alex maybe you can change this so that you can use it from a search + + // initialize the fields we want to retrieve: + $aHeaderFields = array('Date', 'To', 'Cc', 'From', 'Subject', 'X-Priority', 'Content-Type'); + $aFetchItems = array('FLAGS', 'RFC822.SIZE'); + // Are we sorting on internaldate then retrieve the internaldate value as well + $internaldate = getPref($data_dir, $username, 'internal_date_sort'); + if ($internaldate) { + $aFetchItems[] = 'INTERNALDATE'; + } - /* This code and the next if() block check for - * server-side sorting methods. The $id array is - * formatted and $sort is set to 6 to disable - * SM internal sorting - */ + if ($aMailbox['SORT'] != SQSORT_NONE && isset($aMailbox['UIDSET']) && + $aMailbox['UIDSET'] ) { + $id = $aMailbox['UIDSET']; + if (sqsession_is_registered('msgs')) { + sqsession_unregister('msgs'); + } + $id_slice = array_slice($id,$start_msg-1,$aMailbox['LIMIT']); + if (count($id_slice)) { + $msgs = sqimap_get_small_header_list($imapConnection,$id_slice,$aMailbox['LIMIT'], + $aHeaderFields,$aFetchItems); - if ($thread_sort_messages == 1) { - $mode = 'thread'; - } elseif ($allow_server_sort == 1) { - $mode = 'serversort'; + } else { + return false; + } + // FIX ME, move to msgs cache bound to a mailbox + sqsession_register($msgs, 'msgs'); } else { - $mode = ''; - } + if (sqsession_is_registered('server_sort_array')) { + sqsession_unregister('server_sort_array'); + } - if ($use_cache) { - sqgetGlobalVar('msgs', $msgs, SQ_SESSION); - sqgetGlobalVar('msort', $msort, SQ_SESSION); - } else { - sqsession_unregister('msort'); - sqsession_unregister('msgs'); } - switch ($mode) { - case 'thread': - $msgs = getThreadMessages($imapConnection, $start_msg, $show_num, $num_msgs); - if ($msgs === false) { - echo '
' . - _("Thread sorting is not supported by your IMAP server.
Please report this to the system administrator."). - '
'; - $thread_sort_messages = 0; - $msort = $msgs = array(); - } else { - $msort= $msgs; - $sort = 6; - } - break; - case 'serversort': - $msgs = getServerSortMessages($imapConnection, $start_msg, $show_num, - $num_msgs, $sort, $mbxresponse); - if ($msgs === false) { - echo '
' . - _( "Server-side sorting is not supported by your IMAP server.
Please report this to the system administrator."). - '
'; - $sort = $server_sort_order; - $allow_server_sort = FALSE; - $msort = $msgs = array(); - $id = array(); + if ($aMailbox['SORT'] != SQSORT_NONE || $aMailbox['SORT_METHOD'] == 'THREAD') { + $id = get_sorted_msgs_list($imapConnection,$aMailbox,$error); + if ($id !== false) { + $id_slice = array_slice($id,$aMailbox['OFFSET'], $aMailbox['LIMIT']); + if (count($id_slice)) { + $msgs = sqimap_get_small_header_list($imapConnection,$id_slice,$aMailbox['LIMIT'], + $aHeaderFields,$aFetchItems); + } else { + // FIX ME do error handling + return false; + } } else { - $msort = $msgs; - $sort = 6; + // FIX ME, format message and fallback to squirrel sort + if ($error) { + echo $error; + } } - break; - default: - if (!$use_cache) { - $msgs = getSelfSortMessages($imapConnection, $start_msg, $show_num, - $num_msgs, $sort, $mbxresponse); - $msort = calc_msort($msgs, $sort); - } /* !use cache */ - break; - } // switch - sqsession_register($msort, 'msort'); - sqsession_register($msgs, 'msgs'); + } else { + /** + * retrieve messages by sequence id's and fetch the UID to retrieve + * the UID. for sorted lists this is not needed because a UID FETCH + * automaticly add the UID value in fetch results + **/ + $aFetchItems[] = 'UID'; + + //create id range + $iRangeEnd = (($aMailbox['EXISTS'] - $aMailbox['OFFSET']) > $aMailbox['LIMIT']) ? + $aMailbox['EXISTS'] - $aMailbox['OFFSET'] +1 - $aMailbox['LIMIT']: + $aMailbox['EXISTS'] - $aMailbox['OFFSET']; + $iRangeStart = (($aMailbox['EXISTS'] - $aMailbox['OFFSET']) > $aMailbox['LIMIT']) ? + $aMailbox['EXISTS']-$aMailbox['OFFSET'] +1:1; + $id_slice = range($iRangeStart, $iRangeEnd); + $msgs = sqimap_get_small_header_list($imapConnection,$id_slice,$aMailbox['LIMIT'], + $aHeaderFields,$aFetchItems); + $msgs = array_reverse($msgs,true /* preserve key */); + // generate id array + $id = array_keys($msgs); + $aMailbox['OFFSET'] = 0; + } + // FIX ME, use an id list bound to a mailbox + if ($id !== false) { + sqsession_register($id, 'server_sort_array'); + } + sqsession_register($msgs, 'msgs'); + } + $aMailbox['UIDSET'] =& $id; + $aMailbox['MSG_HEADERS'] =& $msgs; + if ($aMailbox['SORT_METHOD'] == 'THREAD') { + // retrieve indent array for thread sort + sqgetGlobalVar('indent_array',$indent_array,SQ_SESSION); + $aMailbox['THREAD_INDENT'] =& $indent_array; + } } /* if exists > 0 */ - $res = getEndMessage($start_msg, $show_num, $num_msgs); - $start_msg = $res[0]; - $end_msg = $res[1]; + $iEnd = ($aMailbox['PAGEOFFSET'] + ($aMailbox['LIMIT'] - 1) < $aMailbox['EXISTS']) ? + $aMailbox['PAGEOFFSET'] + $aMailbox['LIMIT'] - 1 : $aMailbox['EXISTS']; - $paginator_str = get_paginator_str($mailbox, $start_msg, $end_msg, - $num_msgs, $show_num, $sort); + $paginator_str = get_paginator_str($aMailbox['NAME'], $aMailbox['PAGEOFFSET'], $iEnd, + $aMailbox['EXISTS'], $aMailbox['LIMIT'], $aMailbox['SORT']); - $msg_cnt_str = get_msgcnt_str($start_msg, $end_msg, $num_msgs); + $msg_cnt_str = get_msgcnt_str($aMailbox['PAGEOFFSET'], $iEnd,$aMailbox['EXISTS']); do_hook('mailbox_index_before'); ?> - + - - - + + +
- +
- +
- + -
+ - + - +
- +
-
- +
+ - + $show_num) { - $end_msg = $show_num; - $start_msg = 1; - } - } - $endVar = $end_msg + 1; - /* - * Loop through and display the info for each message. - * ($t is used for the checkbox number) - */ - $t = 0; - - /* messages display */ - - if (!$num_msgs) { - /* if there's no messages in this folder */ - echo html_tag( 'tr', - html_tag( 'td', - "
" . _("THIS FOLDER IS EMPTY") . "
 ", - 'center', - $color[4], - 'COLSPAN="' . count($index_order) . '"' - ) - ); - } elseif ($start_msg == $end_msg) { - /* if there's only one message in the box, handle it differently. */ - if ($sort != 6) { - $i = $start_msg; + * Loop through and display the info for each message. + * ($t is used for the checkbox number) + */ + $iEnd = ($aMailbox['LIMIT']) ? $iOffset + $aMailbox['LIMIT'] : 99999999 /* no limit */; + for ($i=$iOffset,$t=0;$i<$iEnd;++$i) { + if (isset($aId[$i])) { + $bLast = ((isset($aId[$i+1]) && isset($aHeaders[$aId[$i+1]])) + || ($i == $iEnd )) ? false : true; + if ($bThread) { + $indent = (isset($aIndentArray[$aId[$i]])) ? $aIndentArray[$aId[$i]] : 0; + } else { + $indent = 0; + } + $aMsg = array( + 'HEADER' => $aHeaders[$aId[$i]], + 'INDX' => $t, + 'OFFSET' => $iOffset, + 'PAGEOFFSET' => $iPageOffset, + 'SORT' => $sort, + 'SEARCH' => $aSearch, + 'MAILBOX' => $sMailbox, + 'INDENT' => $indent, + 'LAST' => $bLast + ); + printMessageInfo($aMsg); + ++$t; } else { - $i = 1; + break; } - reset($msort); - $k = 0; - do { - $key = key($msort); - next($msort); - $k++; - } while (isset ($key) && ($k < $i)); - printMessageInfo($imapConnection, $t, true, $key, $mailbox, - $real_startMessage, $where, $what); - } else { - $i = $start_msg; - reset($msort); - $k = 0; - do { - $key = key($msort); - next($msort); - $k++; - } while (isset ($key) && ($k < $i)); - $not_last = true; - do { - if (!$i || $i == $endVar-1) $not_last = false; - printMessageInfo($imapConnection, $t, $not_last, $key, $mailbox, - $real_startMessage, $where, $what); - $key = key($msort); - $t++; - $i++; - next($msort); - } while ($i && $i < $endVar); } } -/* - * Displays the standard message list header. To finish the table, - * you need to do a ""; - * - * $moveURL is the URL to submit the delete/move form to - * $mbxresponse is the array with the results of SELECT against the current mailbox - * $mailbox is the current mailbox - * $sort is the current sorting method (-1 for no sorting available [searches]) - * $Message is a message that is centered on top of the list - * $More is a second line that is left aligned - */ - +/** +* Displays the standard message list header. +* +* To finish the table, you need to do a ""; +* +* @param resource $imapConnection +* @param array $aMailbox associative array with mailbox related information +* @param string $msg_cnt_str +* @param string $paginator Paginator string +*/ function mail_message_listing_beginning ($imapConnection, - $mbxresponse, - $mailbox = '', $sort = -1, + $aMailbox, $msg_cnt_str = '', - $paginator = ' ', - $start_msg = 1) { - global $color, $auto_expunge, $base_uri, $show_flag_buttons, - $allow_server_sort, $server_sort_order, - $PHP_SELF, $allow_thread_sort, $thread_sort_messages; + $paginator = ' ' + ) { + global $color, $base_uri, $show_flag_buttons, $PHP_SELF; + + $php_self = $PHP_SELF; /* fix for incorrect $PHP_SELF */ if (strpos($php_self, 'move_messages.php')) { $php_self = str_replace('move_messages.php', 'right_main.php', $php_self); } - $urlMailbox = urlencode($mailbox); + $urlMailbox = urlencode($aMailbox['NAME']); if (preg_match('/^(.+)\?.+$/',$php_self,$regs)) { $source_url = $regs[1]; @@ -795,182 +803,218 @@ function mail_message_listing_beginning ($imapConnection, $location = $php_self; } - $moveFields = '' . - '' . - ''. - ''; + $moveFields = addHidden('msg', $msg). + addHidden('mailbox', $aMailbox['NAME']). + addHidden('startMessage', $aMailbox['PAGEOFFSET']). + addHidden('location', $location); + + /* build thread sorting links */ + if ($aMailbox['ALLOW_THREAD']) { + if ($aMailbox['SORT_METHOD'] == 'THREAD') { + $set_thread = 2; + $thread_name = _("Unthread View"); + } else { + $set_thread = 1; + $thread_name = _("Thread View"); + } + $thread_link_str = '[' . $thread_name + . ']'; + } else { + $thread_link_str =''; + } /* - * This is the beginning of the message list table. - * It wraps around all messages - */ - $safe_name = preg_replace("/[^0-9A-Za-z_]/", '_', $mailbox); + * This is the beginning of the message list table. + * It wraps around all messages + */ + $safe_name = preg_replace("/[^0-9A-Za-z_]/", '_', $aMailbox['NAME']); $form_name = "FormMsgs" . $safe_name; echo '
' ."\n" - . $moveFields; + . $moveFields; ?> - +
- + - + -
+ - - + + + - +
-
+ - + - - +
- ' . _("Bypass Trash"); + if (array_search('\\deleted',$aMailbox['PERMANENTFLAGS'], true) !== FALSE) { + echo getButton('SUBMIT', 'delete',_("Delete")); + echo '' . _("Bypass Trash"); + echo ' '; + } + if (!$aMailbox['AUTO_EXPUNGE'] && $aMailbox['RIGHTS'] != 'READ-ONLY') { + echo getButton('SUBMIT', 'expungeButton',_("Expunge")) .' ' . _("mailbox") . "\n"; echo ' '; - if (!$auto_expunge) { - echo getButton('SUBMIT', 'expungeButton',_("Expunge")) .' ' . _("mailbox") . "\n"; - echo ' '; } do_hook('mailbox_display_buttons'); - ?> + ?> - [' . $thread_name - . ']'; - } - getMbxList($imapConnection); - echo getButton('SUBMIT', 'moveButton',_("Move")) . "\n"; - ?> + + '; + //echo $thread_link_str; //previous behaviour + getMbxList($imapConnection); + echo getButton('SUBMIT', 'moveButton',_("Move")) . "\n + "; + } + ?>
-
+ - - + + - +
- + -
+ - + - +
-
+ - + \n"; + echo "
\n"; } -function printHeader($mailbox, $sort, $color, $showsort=true, $start_msg=1) { - global $index_order; +/** +* Prints the table header for the messages list view +* +* @param array $aMailbox +*/ +function printHeader($aMailbox) { + global $index_order, $internal_date_sort, $color; + + if ($aMailbox['SORT_METHOD'] != 'THREAD') { + $showsort = true; + } else { + $showsort = false; + } + echo html_tag( 'tr' ,'' , 'center', $color[5] ); /* calculate the width of the subject column based on the - * widths of the other columns */ + * widths of the other columns */ $widths = array(1=>1,2=>25,3=>5,4=>0,5=>1,6=>5); $subjectwidth = 100; foreach($index_order as $item) { - $subjectwidth -= $widths[$item]; + $subjectwidth -= $widths[$item]; } foreach ($index_order as $item) { switch ($item) { case 1: /* checkbox */ - echo html_tag( 'td',get_selectall_link($start_msg, $sort, $mailbox) , '', '', 'width="1%"' ); + echo html_tag( 'td',get_selectall_link($aMailbox) , '', '', 'width="1%"' ); break; case 5: /* flags */ echo html_tag( 'td','' , '', '', 'width="1%"' ); break; case 2: /* from */ - if (handleAsSent($mailbox)) { + if (handleAsSent($aMailbox['NAME'])) { echo html_tag( 'td' ,'' , 'left', '', 'width="25%"' ) - . '' . _("To") . ''; + . '' . _("To") . ''; + if ($showsort) { + ShowSortButton($aMailbox, SQSORT_TO_ASC, SQSORT_TO_DEC); + } } else { echo html_tag( 'td' ,'' , 'left', '', 'width="25%"' ) - . '' . _("From") . ''; - } - if ($showsort) { - ShowSortButton($sort, $mailbox, 2, 3); + . '' . _("From") . ''; + if ($showsort) { + ShowSortButton($aMailbox, SQSORT_FROM_ASC, SQSORT_FROM_DEC); + } } echo "\n"; break; case 3: /* date */ echo html_tag( 'td' ,'' , 'left', '', 'width="5%" nowrap' ) - . '' . _("Date") . ''; + . '' . _("Date") . ''; if ($showsort) { - ShowSortButton($sort, $mailbox, 0, 1); + if ($internal_date_sort) { + ShowSortButton($aMailbox, SQSORT_INT_DATE_ASC, SQSORT_INT_DATE_DEC); + } else { + ShowSortButton($aMailbox, SQSORT_DATE_ASC, SQSORT_DATE_DEC); + } } echo "\n"; break; case 4: /* subject */ echo html_tag( 'td' ,'' , 'left', '', 'width="'.$subjectwidth.'%"' ) - . '' . _("Subject") . ''; + . '' . _("Subject") . ''; if ($showsort) { - ShowSortButton($sort, $mailbox, 4, 5); + ShowSortButton($aMailbox, SQSORT_SUBJ_ASC, SQSORT_SUBJ_DEC); } echo "\n"; break; case 6: /* size */ - echo html_tag( 'td', '' . _("Size") . '', 'center', '', 'width="5%" nowrap' ); + echo html_tag( 'td', '', 'center','','width="5%" nowrap') + . '' . _("Size") . ''; + if ($showsort) { + ShowSortButton($aMailbox, SQSORT_SIZE_ASC, SQSORT_SIZE_DEC); + } + echo "\n"; break; } } @@ -978,22 +1022,26 @@ function printHeader($mailbox, $sort, $color, $showsort=true, $start_msg=1) { } -/* - * This function shows the sort button. Isn't this a good comment? - */ -function ShowSortButton($sort, $mailbox, $Down, $Up ) { +/** +* This function shows the sort button. Isn't this a good comment? +* +* @param array $aMailbox +* @param integer $Down +* @param integer $Up +*/ +function ShowSortButton($aMailbox, $Down, $Up ) { global $PHP_SELF; /* Figure out which image we want to use. */ - if ($sort != $Up && $sort != $Down) { + if ($aMailbox['SORT'] != $Up && $aMailbox['SORT'] != $Down) { $img = 'sort_none.png'; $which = $Up; - } elseif ($sort == $Up) { + } elseif ($aMailbox['SORT'] == $Up) { $img = 'up_pointer.png'; $which = $Down; } else { $img = 'down_pointer.png'; - $which = 6; + $which = 0; } if (preg_match('/^(.+)\?.+$/',$PHP_SELF,$regs)) { @@ -1004,19 +1052,24 @@ function ShowSortButton($sort, $mailbox, $Down, $Up ) { /* Now that we have everything figured out, show the actual button. */ echo ' sort'; + . '&startMessage=1&mailbox=' . urlencode($aMailbox['NAME']) + . '">sort'; } -function get_selectall_link($start_msg, $sort, $mailbox) { - global $checkall, $what, $where, $javascript_on; +/** +* FIXME: Undocumented function +* +* @param array $aMailbox +*/ +function get_selectall_link($aMailbox) { + global $checkall, $javascript_on; global $PHP_SELF, $PG_SHOWNUM; $result = ''; if ($javascript_on) { - $safe_name = preg_replace("/[^0-9A-Za-z_]/", '_', $mailbox); + $safe_name = preg_replace("/[^0-9A-Za-z_]/", '_', $aMailbox['NAME']); $func_name = "CheckAll" . $safe_name; $form_name = "FormMsgs" . $safe_name; $result = '' - . ''; + . ''; // . ' . _("Toggle All") // . "\n"; } else { if (strpos($PHP_SELF, "?")) { - $result .= ""; - - if (isset($checkall) && ($checkall == '1')) { - $result .= _("Unselect All"); - } else { - $result .= _("Select All"); - } - $result .= "\n"; + $result .= _("All"); + $result .= "\n"; } /* Return our final result. */ return ($result); } -/* - * This function computes the "Viewing Messages..." string. - */ +/** +* This function computes the "Viewing Messages..." string. +* +* @param integer $start_msg first message number +* @param integer $end_msg last message number +* @param integer $num_msgs total number of message in folder +* @return string +*/ function get_msgcnt_str($start_msg, $end_msg, $num_msgs) { /* Compute the $msg_cnt_str. */ $result = ''; if ($start_msg < $end_msg) { - $result = sprintf(_("Viewing Messages: %s to %s (%s total)"), - $start_msg, $end_msg, $num_msgs); + $result = sprintf(_("Viewing Messages: %s to %s (%s total)"), + ''.$start_msg.'', ''.$end_msg.'', $num_msgs); } else if ($start_msg == $end_msg) { - $result = sprintf(_("Viewing Message: %s (1 total)"), $start_msg); + $result = sprintf(_("Viewing Message: %s (1 total)"), ''.$start_msg.''); } else { - $result = '
'; + $result = '
'; } /* Return our result string. */ return ($result); } -/* - * Generate a paginator link. - */ +/** +* Generate a paginator link. +* +* @param mixed $box Mailbox name +* @param mixed $start_msg Message Offset +* @param mixed $use +* @param string $text text used for paginator link +* @return string +*/ function get_paginator_link($box, $start_msg, $use, $text) { - global $PHP_SELF; - $result = "$text"; - return ($result); -/* - if (preg_match('/^(.+)\?.+$/',$PHP_SELF,$regs)) { - $source_url = $regs[1]; - } else { - $source_url = $PHP_SELF; - } + . ">$text"; - $result = '$text"; return ($result); -*/ } -/* - * This function computes the paginator string. - */ +/** +* This function computes the paginator string. +* +* @param string $box +* @param integer $start_msg +* @param integer $end_msg +* @param integer $num_msgs +* @param integer $show_num +* @param integer $sort +*/ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs, - $show_num, $sort) { + $show_num, $sort) { global $username, $data_dir, $use_mailbox_cache, $color, $PG_SHOWNUM; /* Initialize paginator string chunks. */ @@ -1123,7 +1177,7 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs, $all_str = ''; $box = urlencode($box); - + $use = 0; /* Create simple strings that will be creating the paginator. */ $spc = ' '; /* This will be used as a space. */ $sep = '|'; /* This will be used as a seperator. */ @@ -1135,14 +1189,6 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs, /* Make sure that our start message number is not too big. */ $start_msg = min($start_msg, $num_msgs); - /* Decide whether or not we will use the mailbox cache. */ - /* Not sure why $use_mailbox_cache is even passed in. */ - if ($sort == 6) { - $use = 0; - } else { - $use = 1; - } - /* Compute the starting message of the previous and next page group. */ $next_grp = $start_msg + $show_num; $prev_grp = $start_msg - $show_num; @@ -1160,7 +1206,7 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs, } /* Page selector block. Following code computes page links. */ - if ($pg_sel && ($num_msgs > $show_num)) { + if ($show_num != 0 && $pg_sel && ($num_msgs > $show_num)) { /* Most importantly, what is the current page!!! */ $cur_pg = intval($start_msg / $show_num) + 1; @@ -1179,11 +1225,11 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs, /* Otherwise, compute some magic to choose the four quarters. */ } else { /* - * Compute the magic base values. Added together, - * these values will always equal to the $pag_pgs. - * NOTE: These are DEFAULT values and do not take - * the current page into account. That is below. - */ + * Compute the magic base values. Added together, + * these values will always equal to the $pag_pgs. + * NOTE: These are DEFAULT values and do not take + * the current page into account. That is below. + */ $q1_pgs = floor($vis_pgs/4); $q2_pgs = round($vis_pgs/4, 0); $q3_pgs = ceil($vis_pgs/4); @@ -1224,11 +1270,11 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs, } /* - * I am leaving this debug code here, commented out, because - * it is a really nice way to see what the above code is doing. - * echo "qts = $q1_pgs/$q2_pgs/$q3_pgs/$q4_pgs = " - * . ($q1_pgs + $q2_pgs + $q3_pgs + $q4_pgs) . '
'; - */ + * I am leaving this debug code here, commented out, because + * it is a really nice way to see what the above code is doing. + * echo "qts = $q1_pgs/$q2_pgs/$q3_pgs/$q4_pgs = " + * . ($q1_pgs + $q2_pgs + $q3_pgs + $q4_pgs) . '
'; + */ /* Print out the page links from the compute page quarters. */ @@ -1273,28 +1319,28 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs, } } } else if ($PG_SHOWNUM == 999999) { - $pg_str = "" ._("Paginate") . ''; + . ">" ._("Paginate") . ''; } /* Put all the pieces of the paginator string together. */ /** - * Hairy code... But let's leave it like it is since I am not certain - * a different approach would be any easier to read. ;) - */ + * Hairy code... But let's leave it like it is since I am not certain + * a different approach would be any easier to read. ;) + */ $result = ''; if ( $prv_str != '' || $nxt_str != '' ) { - $result .= '['; - $result .= ($prv_str != '' ? $prv_str . $spc . $sep . $spc : ''); - $result .= ($nxt_str != '' ? $nxt_str : ''); - $result .= ']' . $spc ; - - /* Compute the 'show all' string. */ - $all_str = "" . _("Show All") . ''; + $result .= '['; + $result .= ($prv_str != '' ? $prv_str . $spc . $sep . $spc : ''); + $result .= ($nxt_str != '' ? $nxt_str : ''); + $result .= ']' . $spc ; + + /* Compute the 'show all' string. */ + $all_str = "" . _("Show All") . ''; } $result .= ($pg_str != '' ? $spc . '['.$spc.$pg_str.']' . $spc : ''); @@ -1309,6 +1355,9 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs, return ($result); } +/** +* FIXME: Undocumented function +*/ function truncateWithEntities($subject, $trim_at) { $ent_strlen = strlen($subject); @@ -1318,11 +1367,11 @@ function truncateWithEntities($subject, $trim_at) global $languages, $squirrelmail_language; /* - * see if this is entities-encoded string - * If so, Iterate through the whole string, find out - * the real number of characters, and if more - * than $trim_at, substr with an updated trim value. - */ + * see if this is entities-encoded string + * If so, Iterate through the whole string, find out + * the real number of characters, and if more + * than $trim_at, substr with an updated trim value. + */ $trim_val = $trim_at; $ent_offset = 0; $ent_loc = 0; @@ -1349,6 +1398,9 @@ function truncateWithEntities($subject, $trim_at) return substr_replace($subject, '...', $trim_val); } +/** +* FIXME: Undocumented function +*/ function processSubject($subject, $threadlevel = 0) { /* Shouldn't ever happen -- caught too many times in the IMAP functions */ if ($subject == '') { @@ -1365,17 +1417,45 @@ function processSubject($subject, $threadlevel = 0) { return truncateWithEntities($subject, $trim_at); } +/** +* FIXME: Undocumented function +* +* @param mixed $imapConnection +* @param mixed $boxes +*/ function getMbxList($imapConnection, $boxes = 0) { global $lastTargetMailbox; echo '   '; + echo sqimap_mailbox_option_list($imapConnection, array(strtolower($lastTargetMailbox)), 0, $boxes); + echo '  '; } -function getButton($type, $name, $value) { - return ''; +/** +* Creates button +* +* @deprecated see form functions available in 1.5.1 and 1.4.3. +* @param string $type +* @param string $name +* @param string $value +* @param string $js +* @param bool $enabled +*/ +function getButton($type, $name, $value, $js = '', $enabled = TRUE) { + $disabled = ( $enabled ? '' : 'disabled ' ); + $js = ( $js ? $js.' ' : '' ); + return ''; } +/** +* Puts string into cell, aligns it and adds tag +* +* @param string $string string +* @param string $align alignment +*/ function getSmallStringCell($string, $align) { return html_tag('td', '' . $string . ':  ', @@ -1384,26 +1464,13 @@ function getSmallStringCell($string, $align) { 'nowrap' ); } -function getEndMessage($start_msg, $show_num, $num_msgs) { - if ($start_msg + ($show_num - 1) < $num_msgs){ - $end_msg = $start_msg + ($show_num - 1); - } else { - $end_msg = $num_msgs; - } - - if ($end_msg < $start_msg) { - $start_msg = $start_msg - $show_num; - if ($start_msg < 1) { - $start_msg = 1; - } - } - return (array($start_msg,$end_msg)); -} - -// This should go in imap_mailbox.php +/** +* This should go in imap_mailbox.php +* @param string $mailbox +*/ function handleAsSent($mailbox) { global $handleAsSent_result; - + /* First check if this is the sent or draft folder. */ $handleAsSent_result = isSentMailbox($mailbox) || isDraftMailbox($mailbox);