/**
* imap_messages.php
*
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This implements functions that manipulate messages
* @return array $id sorted uid list
*/
function sqimap_get_sort_order($imap_stream, $sSortField, $reverse, $search='ALL') {
- global $default_charset,
- $sent_folder;
-
- $id = array();
- $sort_test = array();
- $sort_query = '';
+ global $default_charset;
if ($sSortField) {
if ($reverse) {
$sPersonal = (isset($addr[SQM_ADDR_PERSONAL]) && $addr[SQM_ADDR_PERSONAL]) ?
$addr[SQM_ADDR_PERSONAL] : "";
$sEmail = ($addr[SQM_ADDR_HOST]) ?
- $addr[SQM_ADDR_HOST] . "@".$addr[SQM_ADDR_HOST] :
+ $addr[SQM_ADDR_MAILBOX] . "@".$addr[SQM_ADDR_HOST] :
$addr[SQM_ADDR_HOST];
$v[$f] = ($sPersonal) ? decodeHeader($sPersonal):$sEmail;'),$sSortField);
$walk = true;
case 'RFC822.SIZE':
if(!$walk) {
// redefine $sSortField to maintain the same namespace between
- // server-side sorting and squirrelmail sorting
+ // server-side sorting and SquirrelMail sorting
$sSortField = 'SIZE';
}
foreach ($msgs as $item) {
$thread_temp = preg_split("//", $thread_list, -1, PREG_SPLIT_NO_EMPTY);
}
- $char_count = count($thread_temp);
$counter = 0;
$thread_new = array();
$k = 0;
}
+/**
+ * Normalise the different Priority headers into a uniform value,
+ * namely that of the X-Priority header (1, 3, 5). Supports:
+ * Prioirty, X-Priority, Importance.
+ * X-MS-Mail-Priority is not parsed because it always coincides
+ * with one of the other headers.
+ *
+ * DUPLICATE CODE ALERT:
+ * NOTE: this is actually a duplicate from the function in
+ * class/mime/Rfc822Header.php.
+ */
+function parsePriority($value) {
+ $value = strtolower(array_shift(split('/\w/',trim($value))));
+ if ( is_numeric($value) ) {
+ return $value;
+ }
+ if ( $value == 'urgent' || $value == 'high' ) {
+ return 1;
+ } elseif ( $value == 'non-urgent' || $value == 'low' ) {
+ return 5;
+ }
+ return 3;
+}
+
/**
* Parses a string in an imap response. String starts with " or { which means it
* can handle double quoted strings and literal strings
* @return array $aMessages associative array with messages. Key is the UID, value is an associative array
*/
function sqimap_get_small_header_list($imap_stream, $msg_list,
- $aHeaderFields = array('Date', 'To', 'Cc', 'From', 'Subject', 'X-Priority', 'Content-Type'),
+ $aHeaderFields = array('Date', 'To', 'Cc', 'From', 'Subject', 'X-Priority', 'Importance', 'Priority', 'Content-Type'),
$aFetchItems = array('FLAGS', 'RFC822.SIZE', 'INTERNALDATE')) {
$aMessageList = array();
- $read_list = array();
$bUidFetch = ! in_array('UID', $aFetchItems, true);
}
} else {
$msgs_str = '1:*';
- $aId = array();
}
/*
case 'BODYSTRUCTURE':
break;
case 'INTERNALDATE':
- $msg['INTERNALDATE'] = str_replace(' ', ' ',parseString($read,$i));
+ $msg['INTERNALDATE'] = trim(str_replace(' ', ' ',parseString($read,$i)));
break;
case 'BODY.PEEK[HEADER.FIELDS':
case 'BODY[HEADER.FIELDS':
case 'date':
$msg['DATE'] = str_replace(' ', ' ', $value);
break;
- case 'x-priority': $msg['PRIORITY'] = $value; break;
+ case 'x-priority':
+ case 'importance':
+ case 'priority':
+ $msg['PRIORITY'] = parsePriority($value); break;
case 'subject': $msg['SUBJECT'] = $value; break;
case 'content-type':
$type = $value;
* Deprecated !!!!!!! DO NOT USE THIS, use sqimap_msgs_list_delete instead
*/
function sqimap_messages_delete($imap_stream, $start, $end, $mailbox, $bypass_trash=false) {
- global $move_to_trash, $trash_folder, $auto_expunge;
+ global $move_to_trash, $trash_folder;
if (($move_to_trash == true) && ($bypass_trash != true) &&
(sqimap_mailbox_exists($imap_stream, $trash_folder) && ($mailbox != $trash_folder))) {
return $res[0];
}
-?>
\ No newline at end of file
+?>