X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=b656eef502f2a931f39e813688e5eb6d2b45e55b;hb=04f17bd9fcafc9c7fe477bb88492b3c519ac4fb1;hp=90a644bcc0c54baef9ac97aaec1cad7f99e05e33;hpb=a8e019f9e24f84345f8843774f21a9c39029c3d6;p=squirrelmail.git
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 90a644bc..b656eef5 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -1,194 +1,337 @@
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);
- if (handleAsSent($mailbox)) {
- $msg['FROM'] = $msg['TO'];
- /*
+ // 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($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 {
+ $bHandleAsSent = $bSentFolder;
+ }
+ // If this is a Sent message, display To address instead of From
+ if ($bHandleAsSent) {
+ $sFrom = $sTo;
+ }
+ // Passing 1 below results in only 1 address being parsed, thus defeating the following code
+ $sFrom = parseAddress($sFrom/*,1*/);
+
+ /*
* This is done in case you're looking into Sent folders,
* because you can have multiple receivers.
*/
- $senderNames = explode(',', $msg['FROM']);
- $senderName = '';
- if (sizeof($senderNames)){
- foreach ($senderNames as $senderNames_part) {
+ $senderNames = $sFrom;
+ $senderName = '';
+ $senderAddress = '';
+ if (sizeof($senderNames)){
+ foreach ($senderNames as $senderNames_part) {
if ($senderName != '') {
$senderName .= ', ';
+ $senderAddress .= ', ';
}
- $senderName .= sqimap_find_displayable_name($senderNames_part);
- }
- }
- } else {
- $senderName = sqimap_find_displayable_name($msg['FROM']);
+ $sender_address_part = htmlspecialchars($senderNames_part[0]);
+ $sender_name_part = str_replace(' ',' ', decodeHeader($senderNames_part[1]));
+ if ($sender_name_part) {
+ $senderName .= $sender_name_part;
+ $senderAddress .= $sender_name_part . ' <' . $sender_address_part . '>';
+ } else {
+ $senderName .= $sender_address_part;
+ $senderAddress .= $sender_address_part;
+ }
+ }
+ }
+ // If Sent, prefix with To: but only if not Sent folder
+ if ($bHandleAsSent ^ $bSentFolder) {
+ $senderName = _("To:") . ' ' . $senderName;
+ $senderAddress = _("To:") . ' ' . $senderAddress;
}
- $subject = processSubject($msg['SUBJECT']);
-
- echo html_tag( 'tr' ) . "\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 (handleAsSent($mailbox)) {
+ 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) {
$searchstr = '&where='.$where.'&what='.$what;
} else {
$searchstr = '';
- }
- /**
- * AAAAH! Make my eyes stop bleeding!
- * Who wrote this?!
- */
- if (sizeof($message_highlight_list)){
+ }
+ /*
+ * Message highlight code
+ */
+ $matches = array('TO' => 'sTo', 'CC' => 'sCc', 'FROM' => 'sFrom', 'SUBJECT' => 'sSubject');
+ if (is_array($message_highlight_list) && count($message_highlight_list)) {
+ $sTo = parseAddress($sTo);
+ $sCc = parseAddress($sCc);
foreach ($message_highlight_list as $message_highlight_list_part) {
if (trim($message_highlight_list_part['value']) != '') {
- if ($message_highlight_list_part['match_type'] == 'to_cc') {
- if (strstr('^^' . strtolower($msg['TO']),
- strtolower($message_highlight_list_part['value']))
- || strstr('^^'.strtolower($msg['CC']),
- strtolower($message_highlight_list_part['value']))) {
- $hlt_color = $message_highlight_list_part['color'];
- continue;
+ $high_val = strtolower($message_highlight_list_part['value']);
+ $match_type = strtoupper($message_highlight_list_part['match_type']);
+ if($match_type == 'TO_CC') {
+ $match = array('TO', 'CC');
+ } else {
+ $match = array($match_type);
+ }
+ foreach($match as $match_type) {
+ switch($match_type) {
+ case('TO'):
+ case('CC'):
+ case('FROM'):
+ 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) ||
+ strstr('^^' . strtolower($address[1]), $high_val)) {
+ $hlt_color = $message_highlight_list_part['color'];
+ break 4;
+ }
+ }
+ break;
+ default:
+ $headertest = strtolower(decodeHeader($$matches[$match_type], true, false));
+ if (strstr('^^' . $headertest, $high_val)) {
+ $hlt_color = $message_highlight_list_part['color'];
+ break 3;
+ }
+ break;
}
- } else
- if (strstr('^^' . strtolower($msg[strtoupper($message_highlight_list_part['match_type'])]),
- strtolower($message_highlight_list_part['value']))) {
- $hlt_color = $message_highlight_list_part['color'];
- continue;
}
}
}
- }
+ } /* end Message highlight code */
if (!isset($hlt_color)) {
$hlt_color = $color_string;
}
+ $col = 0;
+ $sSubject = str_replace(' ', ' ', decodeHeader($sSubject));
+ $subject = processSubject($sSubject, $iIndent);
+
+ echo html_tag( 'tr','','','','VALIGN="top"') . "\n";
- $checked = ($checkall == 1) ? ' checked' : '';
- $row = new html();
- $row->tag = 'tr';
- $row->class = 'm_r';
- $row->id = 'mr'.$t;
-
-
- if (sizeof($index_order)){
+ 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 {
+ $title = '';
+ }
echo html_tag( 'td',
- $italic . $bold . $flag . $fontstr . $senderName .
- $fontstr_end . $flag_end . $bold_end . $italic_end,
- 'left',
- $hlt_color );
+ $italic . $bold . $flag . $fontstr . $senderName .
+ $fontstr_end . $flag_end . $bold_end . $italic_end,
+ 'left',
+ $hlt_color, $title );
break;
case 3: /* date */
+ if ($sDate == '') {
+ $sDate = _("Unknown date");
+ }
echo html_tag( 'td',
- $bold . $flag . $fontstr . $msg['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($msg['FLAG_ANSWERED']) && $msg['FLAG_ANSWERED'] == true) {
- $td_str .= _("A");
- $stuff = true;
- }
- if ($msg['TYPE0'] == 'multipart') {
- $td_str .= '+';
- $stuff = true;
+
+ // icon message markers
+ //
+ if ($use_icons && $icon_theme != 'none') {
+ $td_str = "";
+ if (isset($aFlags['\\flagged']) && $aFlags['\\flagged'] == true) {
+ $td_str .= ' ';
+ }
+ if ($default_use_priority) {
+ if ( ($iPrio == 1) || ($iPrio == 2) ) {
+ $td_str .= ' ';
+ }
+ else if ($iPrio == 5) {
+ $td_str .= ' ';
+ }
+ else {
+ $td_str .= ' ';
+ }
+ }
+ if ($sType1 == 'mixed') {
+ $td_str .= '';
+ } else {
+ $td_str .= '';
+ }
+
+ $msg_icon = '';
+ if (!isset($aFlags['\\seen']) || ($aFlags['\\seen']) == false) {
+ $msg_alt = '(' . _("New") . ')';
+ $msg_title = '(' . _("New") . ')';
+ $msg_icon .= SM_PATH . 'images/themes/' . $icon_theme . '/msg_new';
+ } else {
+ $msg_alt = '(' . _("Read") . ')';
+ $msg_title = '(' . _("Read") . ')';
+ $msg_icon .= SM_PATH . 'images/themes/' . $icon_theme . '/msg_read';
+ }
+ if (isset($aFlags['\\deleted']) && ($aFlags['\\deleted']) == true) {
+ $msg_icon .= '_deleted';
+ }
+ if (isset($aFlags['\\answered']) && ($aFlags['\\answered']) == true) {
+ $msg_alt = '(' . _("Answered") . ')';
+ $msg_title = '(' . _("Answered") . ')';
+ $msg_icon .= '_reply';
+ }
+ $td_str .= '';
+ $td_str .= '';
+ echo html_tag( 'td',
+ $td_str,
+ 'right',
+ $hlt_color,
+ 'nowrap' );
}
- if ($default_use_priority) {
- if ( ($msg['PRIORITY'] == 1) || ($msg['PRIORITY'] == 2) ) {
- $td_str .= "!";
+
+ // plain text message markers
+ //
+ else {
+ $stuff = false;
+ $td_str = "";
+ if (isset($aFlags['\\answered']) && $aFlags['\\answered'] == true) {
+ $td_str .= _("A");
$stuff = true;
}
- if ($msg['PRIORITY'] == 5) {
- $td_str .= "?";
+ if ($sType1 == 'mixed') {
+ $td_str .= '+';
$stuff = true;
}
+ if ($default_use_priority) {
+ if ( ($iPrio == 1) || ($iPrio == 2) ) {
+ $td_str .= "!";
+ $stuff = true;
+ }
+ if ($iPrio == 5) {
+ $td_str .= "?";
+ $stuff = true;
+ }
+ }
+ if (isset($aFlags['\\deleted']) && $aFlags['\\deleted'] == true) {
+ $td_str .= "D";
+ $stuff = true;
+ }
+ if (!$stuff) {
+ $td_str .= ' ';
+ }
+ $td_str .= '';
+ echo html_tag( 'td',
+ $td_str,
+ 'center',
+ $hlt_color,
+ 'nowrap' );
}
- if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED'] == true) {
- $td_str .= "D";
- $stuff = true;
- }
- if (!$stuff) {
- $td_str .= ' ';
- }
- $td_str .= '';
- echo html_tag( 'td',
- $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;
}
}
- echo "\n";
+ /* html for separationlines between rows */
+ if ($last) {
+ echo ''."\n";
+ } else {
+ echo '' . "\n" . ' |
' . "\n";
+ }
}
-function getThreadMessages($imapConnection, $start_msg, $show_num, $num_msgs) {
- $id = get_thread_sort($imapConnection);
- if ($id != 'no') {
- if ($start_msg + ($show_num - 1) < $num_msgs) {
- $end_msg = $start_msg + ($show_num-1);
- } else {
- $end_msg = $num_msgs;
- }
- $id = array_slice($id, ($start_msg-1), ($end_msg));
-
- $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);
- } else {
- return false;
- }
-}
+/**
+* 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);
- if ($id != 'no') {
- if ($start_msg + ($show_num - 1) < $num_msgs) {
- $end_msg = $start_msg + ($show_num-1);
- } else {
- $end_msg = $num_msgs;
- }
- $id = array_slice($id, ($start_msg-1), ($end_msg));
-
- $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);
- } else {
- return false;
- }
+ }
+ 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;
- } 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), ($end_msg));
- $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.").
+ '';
+ }
+ break;
+ default:
+ $sSortField = getSortField($aMailbox['SORT'],false);
+ $id = get_squirrel_sort($imapConnection, $sSortField, $bDirection);
+ break;
}
- $msgs = fillMessageArray($imapConnection,$id,$end_loop);
- }
- 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;
-
- /* 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;
- }
-
- 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($start_msg < 1) {
- $start_msg = 1;
+ /* if there's no messages in this folder */
+ if ($aMailbox['EXISTS'] == 0) {
+ $string = '' . _("THIS FOLDER IS EMPTY") . '';
+ echo '
';
+ echo ' ';
+ echo ' ';
+ echo ' ';
+ echo ' ';
+ echo ' ' . html_tag( 'td', $string."\n", 'left')
+ . ' ';
+ echo ' ';
+ echo '
| ';
+ 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;
+ }
}
- }
-
- /* 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 ($thread_sort_messages == 1) {
- $mode = 'thread';
- } elseif ($allow_server_sort == 1) {
- $mode = 'serversort';
- } else {
- $mode = '';
- }
-
- switch ($mode) {
- case 'thread':
- session_unregister('msort');
- session_unregister('msgs');
- $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();
- session_register('msort');
- session_register('msgs');
- } else {
- $msort= $msgs;
- $sort = 6;
- session_register('msort');
- session_register('msgs');
+ $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';
+ }
+
+ if ($aMailbox['SORT'] != SQSORT_NONE && isset($aMailbox['UIDSET']) &&
+ $aMailbox['UIDSET'] ) {
+ $id = $aMailbox['UIDSET'];
+ if (sqsession_is_registered('msgs')) {
+ sqsession_unregister('msgs');
}
-
- 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();
- session_register('msort');
- session_register('msgs');
- $id = array();
- } else {
- $sort = 6;
- $msort = $msgs;
- session_register('msort');
- session_register('msgs');
- }
- break;
- default:
- if (!$use_cache) {
- session_unregister('msgs');
- session_unregister('msort');
- $msgs= getSelfSortMessages($imapConnection, $start_msg, $show_num,
- $num_msgs, $sort, $mbxresponse);
- $msort = calc_msort($msgs, $sort);
- session_register('msort');
- session_register('msgs');
- } /* !use cache */
- break;
- } // switch
- } /* if exists > 0 */
-
- $end_msg = getEndMessage(&$start_msg, $show_num, $num_msgs);
-
- $paginator_str = get_paginator_str($mailbox, $start_msg, $end_msg,
- $num_msgs, $show_num, $sort);
-
- $msg_cnt_str = get_msgcnt_str($start_msg, $end_msg, $num_msgs);
-
- do_hook('mailbox_index_before');
-
- mail_message_listing_beginning($imapConnection, $mailbox, $sort,
- $msg_cnt_str, $paginator_str, $start_msg);
-
-
- printHeader($mailbox, $srt, $color, !$thread_sort_messages);
-
- displayMessageArray($imapConnection, $num_msgs, $start_msg,
- $msort, $mailbox, $sort, $color, $show_num,0,0);
-
- mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $color);
-
- /**
- * TODO: Switch to using $_SESSION[] whenever we ditch the 4.0.x series.
- */
-}
+ $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);
-function calc_msort($msgs, $sort) {
+ } else {
+ return false;
+ }
+ // FIX ME, move to msgs cache bound to a mailbox
+ sqsession_register($msgs, 'msgs');
+ } else {
+ if (sqsession_is_registered('server_sort_array')) {
+ sqsession_unregister('server_sort_array');
+ }
- /*
- * 0 = Date (up)
- * 1 = Date (dn)
- * 2 = Name (up)
- * 3 = Name (dn)
- * 4 = Subject (up)
- * 5 = Subject (dn)
- */
- if (($sort == 0) || ($sort == 1)) {
- $msort = array_cleave ($msgs, 'TIME_STAMP');
- } elseif (($sort == 2) || ($sort == 3)) {
- $msort = array_cleave ($msgs, 'FROM-SORT');
- } elseif (($sort == 4) || ($sort == 5)) {
- $msort = array_cleave ($msgs, 'SUBJECT-SORT');
- } else {
- $msort = $msgs;
- }
- if ($sort < 6) {
- if ($sort % 2) {
- asort($msort);
- } else {
- arsort($msort);
- }
- }
- return $msort;
-}
-
-function fillMessageArray($imapConnection,$id,$count) {
- $msgs_list = sqimap_get_small_header_list($imapConnection, $id);
- $messages = array();
- if (sizeof($msgs_list)){
- foreach ($msgs_list as $hdr) {
- $unique_id[] = $hdr->uid;
- $from[] = $hdr->from;
- $date[] = $hdr->date;
- $subject[] = $hdr->subject;
- $to[] = $hdr->to;
- $priority[] = $hdr->priority;
- $cc[] = $hdr->cc;
- $size[] = $hdr->size;
- $type[] = $hdr->type0;
- $flag_deleted[] = $hdr->flag_deleted;
- $flag_answered[] = $hdr->flag_answered;
- $flag_seen[] = $hdr->flag_seen;
- $flag_flagged[] = $hdr->flag_flagged;
- }
- }
-
- $j = 0;
- while ($j < $count) {
-
- if (isset($date[$j])) {
- $date[$j] = str_replace(' ', ' ', $date[$j]);
- $tmpdate = explode(' ', trim($date[$j]));
- } else {
- $tmpdate = $date = array('', '', '', '', '', '');
- }
- $messages[$j]['TIME_STAMP'] = getTimeStamp($tmpdate);
- $messages[$j]['DATE_STRING'] =
- getDateString($messages[$j]['TIME_STAMP']);
- $messages[$j]['ID'] = $unique_id[$j];
- $messages[$j]['FROM'] = decodeHeader($from[$j]);
- $messages[$j]['FROM-SORT'] =
- strtolower(sqimap_find_displayable_name(decodeHeader($from[$j])));
- $messages[$j]['SUBJECT'] = decodeHeader($subject[$j]);
- $messages[$j]['SUBJECT-SORT'] = strtolower(decodeHeader($subject[$j]));
- $messages[$j]['TO'] = decodeHeader($to[$j]);
- $messages[$j]['PRIORITY'] = $priority[$j];
- $messages[$j]['CC'] = $cc[$j];
- $messages[$j]['SIZE'] = $size[$j];
- $messages[$j]['TYPE0'] = $type[$j];
- $messages[$j]['FLAG_DELETED'] = $flag_deleted[$j];
- $messages[$j]['FLAG_ANSWERED'] = $flag_answered[$j];
- $messages[$j]['FLAG_SEEN'] = $flag_seen[$j];
- $messages[$j]['FLAG_FLAGGED'] = $flag_flagged[$j];
-
-
- /*
- * fix SUBJECT-SORT to remove Re:
- * vedr|sv (Danish)
- * re|aw (English)
- *
- * TODO: i18n should be incorporated here. E.g. we catch the ones
- * we know about, but also define in i18n what the localized
- * "Re: " is for this or that locale.
- */
- if (preg_match("/^(vedr|sv|re|aw):\s*(.*)$/si",
- $messages[$j]['SUBJECT-SORT'], $matches)){
- $messages[$j]['SUBJECT-SORT'] = $matches[2];
- }
- $j++;
- }
- return $messages;
-}
+ 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 {
+ // FIX ME, format message and fallback to squirrel sort
+ if ($error) {
+ echo $error;
+ }
+ }
+ } 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 */
-/* Generic function to convert the msgs array into an HTML table. */
-function displayMessageArray($imapConnection, $num_msgs, $start_msg,
- $msort, $mailbox, $sort, $color,
- $show_num, $where=0, $what=0) {
- global $imapServerAddress, $use_mailbox_cache,
- $index_order, $checkall,
- $indent_array, $thread_sort_messages, $allow_server_sort,
- $server_sort_order, $PHP_SELF;
+ $iEnd = ($aMailbox['PAGEOFFSET'] + ($aMailbox['LIMIT'] - 1) < $aMailbox['EXISTS']) ?
+ $aMailbox['PAGEOFFSET'] + $aMailbox['LIMIT'] - 1 : $aMailbox['EXISTS'];
- $end_msg = getEndMessage(&$start_msg, $show_num, $num_msgs);
+ $paginator_str = get_paginator_str($aMailbox['NAME'], $aMailbox['PAGEOFFSET'], $iEnd,
+ $aMailbox['EXISTS'], $aMailbox['LIMIT'], $aMailbox['SORT']);
- $urlMailbox = urlencode($mailbox);
+ $msg_cnt_str = get_msgcnt_str($aMailbox['PAGEOFFSET'], $iEnd,$aMailbox['EXISTS']);
- /* get indent level for subject display */
- if ($thread_sort_messages == 1 ) {
- $indent_array = get_parent_level($imapConnection);
- }
+ do_hook('mailbox_index_before');
+?>
+
+
+
+
+ |
+
+ |
+
+
+
+
+ |
+
+
+ $aHeaders[$aId[$i]],
+ 'INDX' => $t,
+ 'OFFSET' => $iOffset,
+ 'PAGEOFFSET' => $iPageOffset,
+ 'SORT' => $sort,
+ 'SEARCH' => $aSearch,
+ 'MAILBOX' => $sMailbox,
+ 'INDENT' => $indent,
+ 'LAST' => $bLast
+ );
+ printMessageInfo($aMsg);
+ ++$t;
+ } else {
+ break;
+ }
+ }
+}
- $real_startMessage = $start_msg;
- if ($sort == 6) {
- if ($end_msg - $start_msg < $show_num - 1) {
- $end_msg = $end_msg - $start_msg + 1;
- $start_msg = 1;
- } else if ($start_msg > $show_num) {
- $end_msg = $show_num;
- $start_msg = 1;
+/**
+* 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,
+ $aMailbox,
+ $msg_cnt_str = '',
+ $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);
}
- }
- $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 == 0) {
- /* 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;
+ $urlMailbox = urlencode($aMailbox['NAME']);
+
+ if (preg_match('/^(.+)\?.+$/',$php_self,$regs)) {
+ $source_url = $regs[1];
} else {
- $i = 1;
+ $source_url = $php_self;
}
- reset($msort);
- $k = 0;
- do {
- $key = key($msort);
- next($msort);
- $k++;
- } while (isset ($key) && ($k < $i));
- printMessageInfo($imapConnection, $t, $i, $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));
- do {
- printMessageInfo($imapConnection, $t, $i, $key, $mailbox,
- $real_startMessage, $where, $what);
- $key = key($msort);
- $t++;
- $i++;
- next($msort);
- } while ($i && $i < $endVar);
- }
- echo '';
-}
-/*
- * 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
- * $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
- */
-
-function mail_message_listing_beginning ($imapConnection,
- $mailbox = '', $sort = -1,
- $msg_cnt_str = '',
- $paginator = ' ',
- $start_msg = 1) {
- global $color, $auto_expunge, $base_uri, $thread_sort_messages,
- $allow_thread_sort, $allow_server_sort, $server_sort_order,
- $PHP_SELF;
-
- $urlMailbox = urlencode($mailbox);
-
- if (preg_match('/^(.+)\?.+$/',$PHP_SELF,$regs)) {
- $source_url = $regs[1];
- } else {
- $source_url = $PHP_SELF;
- }
-
- if (!isset($msg)) {
- $msg = '';
- }
- $moveURL = "move_messages.php?msg=$msg&mailbox=$urlMailbox"
- . "&startMessage=$start_msg";
-
- /*
- * This is the beginning of the message list table.
- * It wraps around all messages
- */
-
- echo "