X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=b656eef502f2a931f39e813688e5eb6d2b45e55b;hb=04f17bd9fcafc9c7fe477bb88492b3c519ac4fb1;hp=c38860dbfd8ae3f0484ded0ce4d741fdf97bc349;hpb=1c198ef7cdb0e8abecc3ebe67e6ff4bb35b1a7ea;p=squirrelmail.git
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index c38860db..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';
}
@@ -90,36 +130,36 @@ function printMessageInfo($imapConnection, $t, $last=false, $msg, $mailbox,
}
}
- 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)){
@@ -145,38 +185,47 @@ function printMessageInfo($imapConnection, $t, $last=false, $msg, $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) {
@@ -184,10 +233,13 @@ function printMessageInfo($imapConnection, $t, $last=false, $msg, $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']);
@@ -202,7 +254,7 @@ function printMessageInfo($imapConnection, $t, $last=false, $msg, $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) ||
@@ -213,7 +265,7 @@ function printMessageInfo($imapConnection, $t, $last=false, $msg, $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;
@@ -223,63 +275,63 @@ function printMessageInfo($imapConnection, $t, $last=false, $msg, $mailbox,
}
}
}
- }
+ } /* end Message highlight code */
if (!isset($hlt_color)) {
$hlt_color = $color_string;
}
$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',
- addCheckBox("msg[$t]", $checkall, $msg['ID']),
- '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($msg['FLAG_FLAGGED']) && $msg['FLAG_FLAGGED'] == true) {
+ if (isset($aFlags['\\flagged']) && $aFlags['\\flagged'] == true) {
$td_str .= ' ';
}
if ($default_use_priority) {
- if ( ($msg['PRIORITY'] == 1) || ($msg['PRIORITY'] == 2) ) {
+ if ( ($iPrio == 1) || ($iPrio == 2) ) {
$td_str .= ' ';
}
- else if ($msg['PRIORITY'] == 5) {
+ else if ($iPrio == 5) {
$td_str .= ' ';
}
- else
- {
+ else {
$td_str .= ' ';
}
}
- if ($msg['TYPE0'] == 'multipart') {
+ if ($sType1 == 'mixed') {
$td_str .= '';
- }
- else
- {
+ } 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';
@@ -341,37 +385,36 @@ function printMessageInfo($imapConnection, $t, $last=false, $msg, $mailbox,
$td_str .= '';
$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;
}
@@ -380,166 +423,129 @@ function printMessageInfo($imapConnection, $t, $last=false, $msg, $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;
}
}
+ /* html for separationlines between rows */
if ($last) {
echo ''."\n";
} else {
echo '' . "\n" . ' |
' . "\n";
- }
-}
-
-/**
- * FIXME: Undocumented function
- *
- * @param mixed $imapConnection
- * @param mixed $start_msg
- * @param mixed $show_num
- * @param mixed $num_msgs
- * @param mixed $id
- * @return array
- */
-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;
+ $color[0] . '" height="1">' . "\n";
}
}
/**
- * FIXME: Undocumented function
- *
- * @param mixed $imapConnection
- * @param mixed $start_msg
- * @param mixed $show_num
- * @param mixed $num_msgs
- * @return array
- */
-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;
-/**
- * FIXME: Undocumented function
- *
- * @param mixed $imapConnection
- * @param mixed $start_msg
- * @param mixed $show_num
- * @param mixed $num_msgs
- * @param mixed $server_sort_order
- * @param mixed $mbxresponse
- * @return array
- */
-function getServerSortMessages($imapConnection, $start_msg, $show_num,
- $num_msgs, $server_sort_order, $mbxresponse) {
- if (isset($mbxresponse['SORT_ARRAY']) && is_array($mbxresponse['SORT_ARRAY'])) {
- $id = $mbxresponse['SORT_ARRAY'];
- } else {
- $id = sqimap_get_sort_order($imapConnection, $server_sort_order,$mbxresponse);
}
- return getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id);
+ return $sSortField;
}
-/**
- * FIXME: Undocumented function
- *
- * @param mixed $imapConnection
- * @param mixed $start_msg
- * @param mixed $show_num
- * @param mixed $num_msgs
- * @param mixed $sort
- * @param mixed $mbxresponse
- * @return array
- */
-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 string $mailbox mail folder
- * @param mixed $num_msgs
- * @param mixed $start_msg
- * @param mixed $sort
- * @param mixed $color
- * @param mixed $show_num
- * @param mixed $use_cache
- * @param mixed $mode
- */
-function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs,
- $start_msg, $sort, $color, $show_num,
- $use_cache, $mode='',$mbxresponse) {
- global $msgs, $msort, $auto_expunge, $thread_sort_messages,
- $allow_server_sort, $server_sort_order;
+* 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;
+
/* if there's no messages in this folder */
- if ($mbxresponse['EXISTS'] == 0) {
+ if ($aMailbox['EXISTS'] == 0) {
$string = '' . _("THIS FOLDER IS EMPTY") . '';
echo '
';
echo ' ';
@@ -553,153 +559,144 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs,
echo ' |
';
echo ' ';
return;
- }
-
-
-
- /*
- * 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;
+ } 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 {
- $sort = 6;
- $msort = calc_msort($msgs, $sort);
- }
- 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 {
- $sort = 6;
- $msort = calc_msort($msgs, $sort);
+ // FIX ME, format message and fallback to squirrel sort
+ if ($error) {
+ echo $error;
+ }
}
- break;
- default:
- $msgs = getSelfSortMessages($imapConnection, $start_msg, $show_num,
- $num_msgs, $sort, $mbxresponse);
- $msort = calc_msort($msgs, $sort);
- 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');
?>
-
+
-
+
|
-
- |
-
+
+ |
+
-
+
|
-
+
";
- $msort[$item['ID']] = $item['SUBJECT-SORT'];
- }
- } else {
- return array_keys($msgs); //array_walk($msort, create_function('&$v,$k', '$v = $v["ID"];'));
- }
- if ($sort < 6) {
- if ($sort % 2) {
- asort($msort);
- } else {
- arsort($msort);
- }
- $msort = array_keys($msort);
- }
- return $msort;
-}
-
-/**
- * FIXME: Undocumented function
- *
- * @param mixed $imapConnection
- * @param mixed $id
- * @param mixed $count
- * @param bool $show_num
- */
-function fillMessageArray($imapConnection, $id, $count, $show_num=false) {
- return sqimap_get_small_header_list($imapConnection, $id, $show_num);
-}
-
-
-/**
- * Generic function to convert the msgs array into an HTML table.
- *
- * @param resource $imapConnection
- * @param int $num_msgs total number of messages in the mailbox
- * @param int $start_msg offset in messages to sisplay
- * @param array $msort sorted array which is used to map the index to the unsorted $msgs index
- * @param string $mailbox mail folder name
- * @param int $sort sort order. 6 means no sorting or server side / thread sort
- * @param array $color
- * @param int $show_num number of messages to show
- * @param mixed $where
- * @param mixed $what
- */
-function displayMessageArray($imapConnection, $num_msgs, $start_msg,
- $msort, $mailbox, $sort, $color,
- $show_num, $where=0, $what=0) {
- global $imapServerAddress, $use_mailbox_cache, $index_order,
- $indent_array, $thread_sort_messages, $allow_server_sort,
- $server_sort_order, $PHP_SELF, $msgs;
-
-
- $urlMailbox = urlencode($mailbox);
-
- /* get indent level for subject display */
-
- // FIX ME this call is at the wrong place
- if ($thread_sort_messages == 1 && $num_msgs) {
- $indent_array = get_parent_level($imapConnection);
- }
-
- /* messages display */
-
- // if client side sorting and no sort we only fetch num_msgs so the start_msg in the $msgs
- // array must be corrected
- if ($sort == 6) {
- $i = 0;
+* Function to map an uid list with a msg header array by uid
+* The mapped headers are printed with printMessage
+* aMailbox parameters contains info about the page we are on, the
+* used search criteria, the number of messages to show
+*
+* @param resource $imapConnection socket handle to imap
+* @param array $aMailbox array with required elements MSG_HEADERS, UIDSET, OFFSET, LIMIT
+* @return void
+**/
+function displayMessageArray($imapConnection, $aMailbox) {
+
+ $aId = $aMailbox['UIDSET'];
+ $aHeaders = $aMailbox['MSG_HEADERS'];
+ $iOffset = $aMailbox['OFFSET'];
+ $sort = $aMailbox['SORT'];
+ $iPageOffset = $aMailbox['PAGEOFFSET'];
+ $sMailbox = $aMailbox['NAME'];
+ $aSearch = (isset($aMailbox['SEARCH'])) ? $aMailbox['SEARCH'] : false;
+ if ($aMailbox['SORT_METHOD'] == 'THREAD') {
+ $aIndentArray =& $aMailbox['THREAD_INDENT'];
+ $bThread = true;
} else {
- $i = $start_msg -1;
+ $bThread = false;
}
-
/*
- * Loop through and display the info for each message.
- * ($t is used for the checkbox number)
- */
- $iEnd = $i +$show_num;
- for ($j=$i,$t=0;$j<$iEnd;++$j) {
- if (isset($msort[$j])) {
- $msg = $msgs[$msort[$j]];
- $last = (isset($msort[$j+1]) || $j == $iEnd) ? false : true;
- printMessageInfo($imapConnection, $t, $last, $msg, $mailbox,
- $start_msg, $where, $what);
- $t++;
+ * 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 {
break;
}
@@ -823,34 +762,30 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg,
}
/**
- * Displays the standard message list header.
- *
- * To finish the table, you need to do a "";
- *
- * @param mixed $imapConnection
- * @param array $mbxresponse the array with the results of SELECT against the current mailbox
- * @param string $mailbox the current mailbox
- * @param mixed $sort the current sorting method (-1 for no sorting available [searches])
- * @param mixed $msg_cnt_str
- * @param mixed $paginator
- * @param mixed $start_msg
- */
+* 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];
@@ -869,64 +804,64 @@ function mail_message_listing_beginning ($imapConnection,
}
$moveFields = addHidden('msg', $msg).
- addHidden('mailbox', $mailbox).
- addHidden('startMessage', $start_msg).
- addHidden('location', $location);
+ addHidden('mailbox', $aMailbox['NAME']).
+ addHidden('startMessage', $aMailbox['PAGEOFFSET']).
+ addHidden('location', $location);
/* build thread sorting links */
- if ($allow_thread_sort == TRUE) {
- if ($thread_sort_messages == 1 ) {
- $set_thread = 2;
- $thread_name = _("Unthread View");
- } elseif ($thread_sort_messages == 0) {
- $set_thread = 1;
- $thread_name = _("Thread View");
- }
- $thread_link_str = '[' . $thread_name
- . ']';
- }
- else
- $thread_link_str ='';
+ 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 '