X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=26290e6813d059359eefd48b301f9e703ee530fb;hb=6ab20f61072b628bcad085244158aaa7ca3265ec;hp=4d0e4524c08217c9889cf1c96badb8a5e0b45ca1;hpb=c22c351be8493ddcb78d177c6eddd0de6e31b5c3;p=squirrelmail.git
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 4d0e4524..26290e68 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -1,477 +1,27 @@
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;
-
- // These don't appear to be used... are they safe to remove
- $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['UID'])) ? $msg['UID'] : false;
-
- if (!$iId) {
- return;
- }
-
- if ($GLOBALS['alt_index_colors']) {
- if (!($t % 2)) {
- if (!isset($color[12])) {
- $color[12] = '#EAEAEA';
- }
- $color_string = $color[12];
- }
- }
-
- $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($sFrom, 1);
- if (!isset($email_address)) {
- global $data_dir, $username;
- $email_address = getPref($data_dir, $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 = $sFrom;
- $senderName = '';
- $senderAddress = '';
- if (sizeof($senderNames)){
- foreach ($senderNames as $senderNames_part) {
- if ($senderName != '') {
- $senderName .= ', ';
- $senderAddress .= ', ';
- }
- $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;
- }
-
- // 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);
- }
-
- $flag = $flag_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 = '';
- }
-
- if ($where && $what) {
- $searchstr = '&where='.$where.'&what='.$what;
- } 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)) {
- $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']);
- $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;
- }
- }
- }
- }
- } /* 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";
-
- 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, $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(array('"', '<', '>'), array("''", '<', '>'), $senderAddress) . '"';
- } else {
- $title = '';
- }
- echo html_tag( 'td',
- $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 . $sDate .
- $fontstr_end . $flag_end . $bold_end,
- 'center',
- $hlt_color,
- 'style="white-space: nowrap;"' );
- break;
- case 4: /* subject */
- $td_str = $bold;
- if ($iIndent) {
- $td_str .= str_repeat(" ",$iIndent);
- }
- $td_str .= ''), array("''", '<', '>'), $title);
- $td_str .= " title=\"$title\"";
- }
- $td_str .= ">$flag$subject$flag_end$bold_end";
- echo html_tag( 'td', $td_str, 'left', $hlt_color );
- break;
- case 5: /* flags */
-
- // 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,
- 'style="white-space: nowrap;"' );
- }
-
- // plain text message markers
- //
- else {
- $stuff = false;
- $td_str = "";
- if (isset($aFlags['\\answered']) && $aFlags['\\answered'] == true) {
- $td_str .= _("A");
- $stuff = true;
- }
- 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,
- 'style="white-space: nowrap;"' );
- }
- break;
- case 6: /* size */
- echo html_tag( 'td',
- $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";
- }
-}
-
-
-function setUserPref($username, $pref, $value) {
- global $data_dir;
- setPref($data_dir,$username,$pref,$value);
-}
/**
* Selects a mailbox for header retrieval.
@@ -484,32 +34,16 @@ function setUserPref($username, $pref, $value) {
* @return array $aMailbox mailbox array with all relevant information
* @author Marc Groot Koerkamp
*/
-function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) {
+function sqm_api_mailbox_select($imapConnection,$account,$mailbox,$aConfig,$aProps) {
+
/**
* NB: retrieve this from the session before accessing this function
* and make sure you write it back at the end of the script after
* the aMailbox var is added so that the headers are added to the cache
*/
global $mailbox_cache;
- /**
- * In case the properties arrays are empty set the defaults.
- */
- // Doesn't appear to be used... safe to remove?
- $aDefaultMbxPref = array ();
-// MBX_PREF_SORT => 0,
-// MBX_PREF_LIMIT => 15,
-// MBX_PREF_AUTO_EXPUNGE => 0,
-// MBX_PREF_INTERNALDATE => 0
-// );
- /* array_merge doesn't work with integers as keys */
-// foreach ($aDefaultMbxPref as $key => $value) {
-// if (!isset($aProps[$key])) {
-// $aProps[$key] = $value;
-// }
-// }
+
$aDefaultConfigProps = array(
-// 'allow_thread_sort' => 0,
- 'allow_server_sort' => sqimap_capability($imapConnection,'SORT'),
// 'charset' => 'US-ASCII',
'user' => false, /* no pref storage if false */
'setindex' => 0,
@@ -518,13 +52,14 @@ function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) {
);
$aConfig = array_merge($aDefaultConfigProps,$aConfig);
+
$iSetIndx = $aConfig['setindex'];
$aMbxResponse = sqimap_mailbox_select($imapConnection, $mailbox);
if ($mailbox_cache) {
- if (isset($mailbox_cache[$mailbox])) {
- $aCachedMailbox = $mailbox_cache[$mailbox];
+ if (isset($mailbox_cache[$account.'_'.$mailbox])) {
+ $aCachedMailbox = $mailbox_cache[$account.'_'.$mailbox];
} else {
$aCachedMailbox = false;
}
@@ -567,6 +102,7 @@ function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) {
$aMbxResponse['UIDVALIDTY'] = $aStatus['UIDVALIDITY'];
}
+ $aMailbox['ACCOUNT'] = $account;
$aMailbox['UIDSET'][$iSetIndx] = false;
$aMailbox['ID'] = false;
$aMailbox['SETINDEX'] = $iSetIndx;
@@ -598,6 +134,7 @@ function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) {
(!($newsort % 2) && ($newsort - 1 == $oldsort))) {
$aMailbox['UIDSET'][$iSetIndx] = array_reverse($aCachedMailbox['UIDSET'][$iSetIndx]);
} else {
+ $server_sort_array = false;
$aMailbox['MSG_HEADERS'] = false;
$aMailbox['ID'] = false;
}
@@ -605,7 +142,7 @@ function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) {
if ($aConfig['user']) {
// FIXME, in ideal situation, we write back the
// prefs at the end of the script
- setUserPref($aConfig['user'],"pref_$mailbox",serialize($aProps));
+ setUserPref($aConfig['user'],'pref_'.$account.'_'.$mailbox,serialize($aProps));
}
} else {
$aMailbox['UIDSET'][$iSetIndx] = $aCachedMailbox['UIDSET'][$iSetIndx];
@@ -623,6 +160,12 @@ function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) {
$aMailbox['OFFSET'] = (isset($aConfig['offset']) && $aConfig['offset']) ? $aConfig['offset'] -1 : 0;
$aMailbox['PAGEOFFSET'] = (isset($aConfig['offset']) && $aConfig['offset']) ? $aConfig['offset'] : 1;
}
+ /**
+ * Restore the number of messages in the result set
+ */
+ if (isset($aCachedMailbox['TOTAL'][$iSetIndx]) && $aCachedMailbox['TOTAL'][$iSetIndx]) {
+ $aMailbox['TOTAL'][$iSetIndx] = $aCachedMailbox['TOTAL'][$iSetIndx];
+ }
/**
* Restore the showall value no new showall value is provided.
@@ -634,42 +177,55 @@ function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) {
$aMailbox['SHOWALL'][$iSetIndx] = (isset($aConfig['showall']) && $aConfig['showall']) ? 1 : 0;
}
+ /**
+ * Restore the sort order if no new sort order is provided.
+ */
if (!isset($aProps[MBX_PREF_SORT]) && isset($aCachedMailbox['SORT'])) {
$aMailbox['SORT'] = $aCachedMailbox['SORT'];
} else {
$aMailbox['SORT'] = (isset($aProps[MBX_PREF_SORT])) ? $aProps[MBX_PREF_SORT] : 0;
}
+ /**
+ * Restore the number of message to show per page when no new limit is provided
+ */
if (!isset($aProps[MBX_PREF_LIMIT]) && isset($aCachedMailbox['LIMIT'])) {
$aMailbox['LIMIT'] = $aCachedMailbox['LIMIT'];
} else {
$aMailbox['LIMIT'] = (isset($aProps[MBX_PREF_LIMIT])) ? $aProps[MBX_PREF_LIMIT] : 15;
}
- if (!isset($aProps[MBX_PREF_INTERNALDATE]) && isset($aCachedMailbox['INTERNALDATE'])) {
- $aMailbox['INTERNALDATE'] = $aCachedMailbox['INTERNALDATE'];
+ /**
+ * Restore the ordered columns to show when no new ordered columns are provided
+ */
+ if (!isset($aProps[MBX_PREF_COLUMNS]) && isset($aCachedMailbox['COLUMNS'])) {
+ $aMailbox['COLUMNS'] = $aCachedMailbox['COLUMNS'];
} else {
- $aMailbox['INTERNALDATE'] = (isset($aProps[MBX_PREF_INTERNALDATE])) ? $aProps[MBX_PREF_INTERNALDATE] : false;
+ $aMailbox['COLUMNS'] = (isset($aProps[MBX_PREF_COLUMNS])) ? $aProps[MBX_PREF_COLUMNS] :
+ array(SQM_COL_FLAGS,SQM_COL_FROM, SQM_COL_SUBJ, SQM_COL_FLAGS);
}
+ /**
+ * Restore the headers we fetch the last time. Saves intitialisation stuff in read_body.
+ */
+ $aMailbox['FETCHHEADERS'] = (isset($aCachedMailbox['FETCHHEADERS'])) ? $aCachedMailbox['FETCHHEADERS'] : null;
+
if (!isset($aProps[MBX_PREF_AUTO_EXPUNGE]) && isset($aCachedMailbox['AUTO_EXPUNGE'])) {
$aMailbox['AUTO_EXPUNGE'] = $aCachedMailbox['AUTO_EXPUNGE'];
} else {
$aMailbox['AUTO_EXPUNGE'] = (isset($aProps[MBX_PREF_AUTO_EXPUNGE])) ? $aProps[MBX_PREF_AUTO_EXPUNGE] : false;
}
-
- if (!isset($aConfig['allow_thread_sort']) && isset($aCachedMailbox['ALLOW_THREAD'])) {
- $aMailbox['ALLOW_THREAD'] = $aCachedMailbox['ALLOW_THREAD'];
- } else {
- $aMailbox['ALLOW_THREAD'] = (isset($aConfig['allow_thread_sort'])) ? $aConfig['allow_thread_sort'] : false;
- }
-
if (!isset($aConfig['search']) && isset($aCachedMailbox['SEARCH'][$iSetIndx])) {
$aMailbox['SEARCH'][$iSetIndx] = $aCachedMailbox['SEARCH'][$iSetIndx];
+ } else if (isset($aConfig['search']) && isset($aCachedMailbox['SEARCH'][$iSetIndx]) &&
+ $aConfig['search'] != $aCachedMailbox['SEARCH'][$iSetIndx]) {
+ // reset the pageindex
+ $aMailbox['SEARCH'][$iSetIndx] = $aConfig['search'];
+ $aMailbox['OFFSET'] = 0;
+ $aMailbox['PAGEOFFSET'] = 1;
} else {
$aMailbox['SEARCH'][$iSetIndx] = (isset($aConfig['search'])) ? $aConfig['search'] : 'ALL';
}
-
if (!isset($aConfig['charset']) && isset($aCachedMailbox['CHARSET'][$iSetIndx])) {
$aMailbox['CHARSET'][$iSetIndx] = $aCachedMailbox['CHARSET'][$iSetIndx];
} else {
@@ -685,22 +241,14 @@ function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) {
$aMailbox['PERMANENTFLAGS'] = $aMbxResponse['PERMANENTFLAGS'];
$aMailbox['RIGHTS'] = $aMbxResponse['RIGHTS'];
-
-
/* decide if we are thread sorting or not */
- if (!$aMailbox['ALLOW_THREAD']) {
- if ($aMailbox['SORT'] & SQSORT_THREAD) {
- $aMailbox['SORT'] -= SQSORT_THREAD;
- }
- }
if ($aMailbox['SORT'] & SQSORT_THREAD) {
- $aMailbox['SORT_METHOD'] = 'THREAD';
- $aMailbox['THREAD_INDENT'] = $aCachedMailbox['THREAD_INDENT'];
- } else if (isset($aConfig['allow_server_sort']) && $aConfig['allow_server_sort']) {
- $aMailbox['SORT_METHOD'] = 'SERVER';
- $aMailbox['THREAD_INDENT'] = false;
+ if (!sqimap_capability($imapConnection,'THREAD')) {
+ $aMailbox['SORT'] ^= SQSORT_THREAD;
+ } else {
+ $aMailbox['THREAD_INDENT'] = $aCachedMailbox['THREAD_INDENT'];
+ }
} else {
- $aMailbox['SORT_METHOD'] = 'SQUIRREL';
$aMailbox['THREAD_INDENT'] = false;
}
@@ -709,107 +257,21 @@ function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) {
return $aMailbox;
}
-
-
/**
- * Does the $srt $_GET var to field mapping
+ * Fetch the message headers for a mailbox. Settings are part of the aMailbox
+ * array.
*
- * @param int $srt Field to sort on
- * @param bool $bServerSort Server sorting is true
- * @return string $sSortField Field to sort on
+ * @param resource $imapConnection imap socket handle
+ * @param array $aMailbox (reference) mailbox retrieved from sqm_api_mailbox_select
+ * @return error $error error number
+ * @author Marc Groot Koerkamp
*/
-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;
-
- }
- return $sSortField;
-}
-
-function get_sorted_msgs_list($imapConnection,&$aMailbox,&$error) {
- $iSetIndx = (isset($aMailbox['SETINDEX'])) ? $aMailbox['SETINDEX'] : 0;
- $bDirection = ($aMailbox['SORT'] % 2);
- $error = false;
- if (!$aMailbox['SEARCH'][$iSetIndx]) {
- $aMailbox['SEARCH'][$iSetIndx] = 'ALL';
- }
- switch ($aMailbox['SORT_METHOD']) {
- case 'THREAD':
- $aRes = get_thread_sort($imapConnection,$aMailbox['SEARCH'][$iSetIndx]);
- if ($aRes === false) {
- $error = '' .
- _("Thread sorting is not supported by your IMAP server.") . '
' .
- _("Please contact your system administrator and report this error.") .
- '';
- $aMailbox['SORT'] -= SQSORT_THREAD;
- } else {
- $aMailbox['UIDSET'][$iSetIndx] = $aRes[0];
- $aMailbox['THREAD_INDENT'][$iSetIndx] = $aRes[1];
- }
- break;
- case 'SERVER':
- $sSortField = getSortField($aMailbox['SORT'],true);
- $id = sqimap_get_sort_order($imapConnection, $sSortField, $bDirection, $aMailbox['SEARCH'][$iSetIndx]);
- if ($id === false) {
- $error = '' .
- _("Server-side sorting is not supported by your IMAP server.") . '
' .
- _("Please contact your system administrator and report this error.") .
- '';
- } else {
- $aMailbox['UIDSET'][$iSetIndx] = $id;
- }
- break;
- default:
- $id = NULL;
- if ($aMailbox['SEARCH'][$iSetIndx] != 'ALL') {
- $id = sqimap_run_search($imapConnection, $aMailbox['SEARCH'][$iSetIndx], $aMailbox['CHARSET'][$iSetIndx]);
- }
- $sSortField = getSortField($aMailbox['SORT'],false);
- $aMailbox['UIDSET'][$iSetIndx] = get_squirrel_sort($imapConnection, $sSortField, $bDirection, $id);
- break;
- }
- return $error;
-}
-
-
-
-
function fetchMessageHeaders($imapConnection, &$aMailbox) {
+ /* FIX ME, this function is kind of big, maybe we can split it up in
+ a couple of functions. Make sure the functions are private and starts with _
+ Also make sure that the error codes are propagated */
+
/**
* Retrieve the UIDSET.
* Setindex is used to be able to store multiple uid sets. That will make it
@@ -830,31 +292,39 @@ function fetchMessageHeaders($imapConnection, &$aMailbox) {
}
}
-
if (is_array($aMailbox['UIDSET'])) {
$aUid =& $aMailbox['UIDSET'][$iSetIndx];
} else {
$aUid = false;
}
+ $aFetchHeaders = $aMailbox['FETCHHEADERS'];
+ $iError = 0;
+ $aFetchItems = $aHeaderItems = array();
// 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
- if ($aMailbox['INTERNALDATE']) {
- $aFetchItems[] = 'INTERNALDATE';
+ $aHeaderFields = array();
+ foreach ($aFetchHeaders as $v) {
+ switch ($v) {
+ case SQM_COL_DATE: $aHeaderFields[] = 'Date'; break;
+ case SQM_COL_TO: $aHeaderFields[] = 'To'; break;
+ case SQM_COL_CC: $aHeaderFields[] = 'Cc'; break;
+ case SQM_COL_FROM: $aHeaderFields[] = 'From'; break;
+ case SQM_COL_SUBJ: $aHeaderFields[] = 'Subject'; break;
+ case SQM_COL_PRIO: $aHeaderFields[] = 'X-Priority'; break;
+ case SQM_COL_ATTACHMENT: $aHeaderFields[] = 'Content-Type'; break;
+ case SQM_COL_INT_DATE: $aFetchItems[] = 'INTERNALDATE'; break;
+ case SQM_COL_FLAGS: $aFetchItems[] = 'FLAGS'; break;
+ case SQM_COL_SIZE: $aFetchItems[] = 'RFC822.SIZE'; break;
+ default: break;
+ }
}
-
/**
* A uidset with sorted uid's is available. We can use the cache
*/
- if (($aMailbox['SORT'] != SQSORT_NONE || $aMailbox['SEARCH'][$iSetIndx] != 'ALL') &&
- isset($aUid) && $aUid ) {
-
+ if (isset($aUid) && $aUid ) {
// limit the cache to SQM_MAX_PAGES_IN_CACHE
- if (!$aMailbox['SHOWALL'][$iSetIndx]) {
+ if (!$aMailbox['SHOWALL'][$iSetIndx] && isset($aMailbox['MSG_HEADERS'])) {
$iMaxMsgs = $iLimit * SQM_MAX_PAGES_IN_CACHE;
$iCacheSize = count($aMailbox['MSG_HEADERS']);
if ($iCacheSize > $iMaxMsgs) {
@@ -872,8 +342,14 @@ function fetchMessageHeaders($imapConnection, &$aMailbox) {
$id_slice = array_slice($aUid,$start_msg-1,$iLimit);
/* do some funky cache checks */
- $aUidCached = array_keys($aMailbox['MSG_HEADERS']);
+ if (isset($aMailbox['MSG_HEADERS']) && is_array($aMailbox['MSG_HEADERS'])) {
+ $aUidCached = array_keys($aMailbox['MSG_HEADERS']);
+ } else {
+ $aMailbox['MSG_HEADERS'] = array();
+ $aUidCached = array();
+ }
$aUidNotCached = array_values(array_diff($id_slice,$aUidCached));
+
/**
* $aUidNotCached contains an array with UID's which need to be fetched to
* complete the needed message headers.
@@ -884,1024 +360,790 @@ function fetchMessageHeaders($imapConnection, &$aMailbox) {
// append the msgs to the existend headers
$aMailbox['MSG_HEADERS'] += $aMsgs;
}
-
} else {
/**
- * Initialize the sorted UID list and fetch the visible message headers
+ * Initialize the sorted UID list or initiate a UID list with search
+ * results and fetch the visible message headers
*/
- if ($aMailbox['SORT'] != SQSORT_NONE || $aMailbox['SEARCH'][$iSetIndx] != 'ALL') {// || $aMailbox['SORT_METHOD'] & SQSORT_THREAD 'THREAD') {
- $error = false;
+ if ($aMailbox['SEARCH'][$iSetIndx] != 'ALL') { // in case of a search request
+
if ($aMailbox['SEARCH'][$iSetIndx] && $aMailbox['SORT'] == 0) {
$aUid = sqimap_run_search($imapConnection, $aMailbox['SEARCH'][$iSetIndx], $aMailbox['CHARSET'][$iSetIndx]);
} else {
- $error = get_sorted_msgs_list($imapConnection,$aMailbox,$error);
+
+ $iError = 0;
+ $iError = _get_sorted_msgs_list($imapConnection,$aMailbox,$iError);
$aUid = $aMailbox['UIDSET'][$iSetIndx];
}
- if ($error === false) {
+ if (!$iError) {
+ /**
+ * Number of messages is the resultset
+ */
+ $aMailbox['TOTAL'][$iSetIndx] = count($aUid);
$id_slice = array_slice($aUid,$aMailbox['OFFSET'], $iLimit);
if (count($id_slice)) {
$aMailbox['MSG_HEADERS'] = sqimap_get_small_header_list($imapConnection,$id_slice,
$aHeaderFields,$aFetchItems);
} else {
- return false;
- }
-
- } else {
- // FIX ME, format message and fallback to squirrel sort
- if ($error) {
- echo $error;
+ $iError = 1; // FIX ME, define an error code
}
}
- } else {
- // limit the cache to SQM_MAX_PAGES_IN_CACHE
- if (!$aMailbox['SHOWALL'][$iSetIndx] && isset($aMailbox['MSG_HEADERS']) && is_array($aMailbox['MSG_HEADERS'])) {
- $iMaxMsgs = $iLimit * SQM_MAX_PAGES_IN_CACHE;
- $iCacheSize = count($aMailbox['MSG_HEADERS']);
- if ($iCacheSize > $iMaxMsgs) {
- $iReduce = $iCacheSize - $iMaxMsgs;
- foreach ($aMailbox['MSG_HEADERS'] as $iUid => $value) {
- if ($iReduce) {
- $iId = $aMailbox['MSG_HEADERS'][$iUid]['ID'];
- unset($aMailbox['MSG_HEADERS'][$iUid]);
- unset($aMailbox['ID'][$iId]);
- } else {
- break;
- }
- --$iReduce;
- }
- }
- }
-
- /**
- * 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
- $iRangeStart = $aMailbox['EXISTS'] - $aMailbox['OFFSET'];
- $iRangeEnd = ($iRangeStart > $iLimit) ?
- ($iRangeStart - $iLimit+1):1;
-
- $id_slice = range($iRangeStart, $iRangeEnd);
- /**
- * Non sorted mailbox with cached message headers
- */
- if (isset($aMailbox['ID']) && is_array($aMailbox['ID'])) {
- // the fetched id => uid relation
- $aId = $aMailbox['ID'];
- $aIdCached = array();
- foreach ($aId as $iId => $iUid) {
- if (isset($aMailbox['MSG_HEADERS'][$iUid])) {
- if ($iId <= $iRangeStart && $iId >= $iRangeEnd) {
- $aIdCached[] = $iId;
- }
- }
- }
- $aIdNotCached = array_diff($id_slice,$aIdCached);
- } else {
- $aIdNotCached = $id_slice;
- }
-
- if (count($aIdNotCached)) {
- $aMsgs = sqimap_get_small_header_list($imapConnection,$aIdNotCached,
- $aHeaderFields,$aFetchItems);
- // append the msgs to the existend headers
- if (isset($aMailbox['MSG_HEADERS']) && is_array($aMailbox['MSG_HEADERS'])) {
- $aMailbox['MSG_HEADERS'] += $aMsgs;
+ } else { //
+ $iError = 0;
+ $iError = _get_sorted_msgs_list($imapConnection,$aMailbox,$iError);
+ $aUid = $aMailbox['UIDSET'][$iSetIndx];
+
+ if (!$iError) {
+ /**
+ * Number of messages is the resultset
+ */
+ $aMailbox['TOTAL'][$iSetIndx] = count($aUid);
+ $id_slice = array_slice($aUid,$aMailbox['OFFSET'], $iLimit);
+ if (count($id_slice)) {
+ $aMailbox['MSG_HEADERS'] = sqimap_get_small_header_list($imapConnection,$id_slice,
+ $aHeaderFields,$aFetchItems);
} else {
- $aMailbox['MSG_HEADERS'] = $aMsgs;
- }
- // update the ID array
- foreach ($aMsgs as $iUid => $aMsg) {
- if (isset($aMsg['ID'])) {
- $aMailbox['ID'][$aMsg['ID']] = $iUid;
- }
- }
- }
-
- /**
- * In unsorted state we show newest messages first which means
- * that the UIDSET which represents the order of the messages
- * should contain a high to low ordered UID list
- */
- $aSortedUidList = array();
- foreach ($id_slice as $iId) {
- if (isset($aMailbox['ID'][$iId])) {
- $aSortedUidList[] = $aMailbox['ID'][$iId];
+ $iError = 1; // FIX ME, define an error code
}
}
- $aMailbox['UIDSET'][$iSetIndx] = $aSortedUidList;
- $aMailbox['OFFSET'] = 0;
}
}
- return true;
+ return $iError;
}
-/**
- * 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 $color, $javascript_on, $compact_paginator;
+function prepareMessageList(&$aMailbox, $aProps) {
+ /* retrieve the properties */
+ $my_email_address = (isset($aProps['email'])) ? $aProps['email'] : false;
+ $highlight_list = (isset($aProps['config']['highlight_list'])) ? $aProps['config']['highlight_list'] : false;
+ $aColumnDesc = (isset($aProps['columns'])) ? $aProps['columns'] : false;
+ $aExtraColumns = (isset($aProps['extra_columns'])) ? $aProps['extra_columns'] : array();
+ $iAccount = (isset($aProps['account'])) ? (int) $aProps['account'] : 0;
+ $sMailbox = (isset($aProps['mailbox'])) ? $aProps['mailbox'] : false;
+ $sTargetModule = (isset($aProps['module'])) ? $aProps['module'] : 'read_body';
- // 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 (!fetchMessageHeaders($imapConnection, $aMailbox)) {
- return false;
- }
- $iSetIndx = $aMailbox['SETINDEX'];
- $iLimit = ($aMailbox['SHOWALL'][$iSetIndx]) ? $aMailbox['EXISTS'] : $aMailbox['LIMIT'];
- $iEnd = ($aMailbox['PAGEOFFSET'] + ($iLimit - 1) < $aMailbox['EXISTS']) ?
- $aMailbox['PAGEOFFSET'] + $iLimit - 1 : $aMailbox['EXISTS'];
-
- $paginator_str = get_paginator_str($aMailbox['NAME'], $aMailbox['PAGEOFFSET'],
- $aMailbox['EXISTS'], $aMailbox['LIMIT'], $aMailbox['SHOWALL'][$iSetIndx]);
-
- $msg_cnt_str = get_msgcnt_str($aMailbox['PAGEOFFSET'], $iEnd,$aMailbox['EXISTS']);
-
- do_hook('mailbox_index_before');
-
- if ($javascript_on && $compact_paginator) {
- // Insert compact paginator javascript
- echo "\n\n"
- . "\n"
- . "\n";
- }
- mail_message_listing_beginning($imapConnection, $aMailbox, $msg_cnt_str, $paginator_str);
-?>
- |
-
-
-
- |
-
-
-
- $aHeaders[$aId[$i]],
- 'INDX' => $t,
- 'OFFSET' => $iOffset,
- 'PAGEOFFSET' => $iPageOffset,
- 'SORT' => $sort,
- 'SEARCH' => $aSearch,
- 'MAILBOX' => $sMailbox,
- 'INDENT' => $indent,
- 'LAST' => $bLast
- );
- printMessageInfo($aMsg);
- ++$t;
- } else {
- break;
- }
- }
-}
-
-/**
- * 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, $show_flag_buttons, $PHP_SELF;
- global $lastTargetMailbox, $boxes;
-
- $php_self = $PHP_SELF;
-
- if (preg_match('/^(.+)\?.+$/',$php_self,$regs)) {
- $source_url = $regs[1];
- } else {
- $source_url = $php_self;
- }
- $php_self = str_replace('&', '&', $php_self);
-
- if (!isset($msg)) {
- $msg = '';
- }
-
- $moveFields = addHidden('msg', $msg).
- addHidden('mailbox', $aMailbox['NAME']).
- addHidden('startMessage', $aMailbox['PAGEOFFSET']);
+ * TODO 1, retrieve array with identity email addresses in order to match against to,cc and set a flag
+ * $aFormattedMessages[$iUid]['match_identity'] = true
+ * The template can show some image if there is a match.
+ * TODO 2, makes sure the matching is done fast by doing a strpos call on the returned $value
+ */
- /* build thread sorting links */
- $sort = $aMailbox['SORT'];
- if ($aMailbox['ALLOW_THREAD']) {
- if ($aMailbox['SORT'] & SQSORT_THREAD) {
- $sort -= SQSORT_THREAD;
- $thread_name = _("Unthread View");
- } else {
- $thread_name = _("Thread View");
- $sort = $aMailbox['SORT'] + SQSORT_THREAD;
+ /**
+ * Only retrieve values for displayable columns
+ */
+ foreach ($aColumnDesc as $k => $v) {
+ switch ($k) {
+ case SQM_COL_FROM: $aCol[SQM_COL_FROM] = 'from'; break;
+ case SQM_COL_DATE: $aCol[SQM_COL_DATE] = 'date'; break;
+ case SQM_COL_SUBJ: $aCol[SQM_COL_SUBJ] = 'subject'; break;
+ case SQM_COL_FLAGS: $aCol[SQM_COL_FLAGS] = 'FLAGS'; break;
+ case SQM_COL_SIZE: $aCol[SQM_COL_SIZE] = 'SIZE'; break;
+ case SQM_COL_PRIO: $aCol[SQM_COL_PRIO] = 'x-priority'; break;
+ case SQM_COL_ATTACHMENT: $aCol[SQM_COL_ATTACHMENT] = 'content-type'; break;
+ case SQM_COL_INT_DATE: $aCol[SQM_COL_INT_DATE] = 'INTERNALDATE'; break;
+ case SQM_COL_TO: $aCol[SQM_COL_TO] = 'to'; break;
+ case SQM_COL_CC: $aCol[SQM_COL_CC] = 'cc'; break;
+ case SQM_COL_BCC: $aCol[SQM_COL_BCC] = 'bcc'; break;
+ default: break;
}
- $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_]/", '_', $aMailbox['NAME']);
- $form_name = "FormMsgs" . $safe_name;
-
- echo '