X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_messages.php;h=b8e185e28d7c317123d6627520326ed1614727e3;hp=859702b59e41cf7c30f337a658bac9de5167b3c9;hb=770f0e03743628226d8c740c921c3ae77e8d87bd;hpb=d7c82551df7a28530139681c44a283836be6b6fc
diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 859702b5..b8e185e2 100755
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -3,7 +3,7 @@
/**
* imap_messages.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This implements functions that manipulate messages
@@ -12,12 +12,22 @@
*/
/* Copies specified messages to specified folder */
+/* obsolete */
function sqimap_messages_copy ($imap_stream, $start, $end, $mailbox) {
global $uid_support;
$read = sqimap_run_command ($imap_stream, "COPY $start:$end \"$mailbox\"", true, $response, $message, $uid_support);
}
+function sqimap_msgs_list_copy ($imap_stream, $id, $mailbox) {
+ global $uid_support;
+ $msgs_id = sqimap_message_list_squisher($id);
+ $read = sqimap_run_command ($imap_stream, "COPY $msgs_id \"$mailbox\"", true, $response, $message, $uid_support);
+ $read = sqimap_run_command ($imap_stream, "STORE $msgs_id +FLAGS (\\Deleted)", true, $response, $message, $uid_support);
+}
+
+
/* Deletes specified messages and moves them to trash if possible */
+/* obsolete */
function sqimap_messages_delete ($imap_stream, $start, $end, $mailbox) {
global $move_to_trash, $trash_folder, $auto_expunge, $uid_support;
@@ -27,6 +37,16 @@ function sqimap_messages_delete ($imap_stream, $start, $end, $mailbox) {
sqimap_messages_flag ($imap_stream, $start, $end, "Deleted", true);
}
+function sqimap_msgs_list_delete ($imap_stream, $mailbox, $id) {
+ global $move_to_trash, $trash_folder, $uid_support;
+ $msgs_id = sqimap_message_list_squisher($id);
+ if (($move_to_trash == true) && (sqimap_mailbox_exists($imap_stream, $trash_folder) && ($mailbox != $trash_folder))) {
+ $read = sqimap_run_command ($imap_stream, "COPY $msgs_id \"$trash_folder\"", true, $response, $message, $uid_support);
+ }
+ $read = sqimap_run_command ($imap_stream, "STORE $msgs_id +FLAGS (\\Deleted)", true, $response, $message, $uid_support);
+}
+
+
/* Sets the specified messages with specified flag */
function sqimap_messages_flag ($imap_stream, $start, $end, $flag, $handle_errors) {
global $uid_support;
@@ -39,14 +59,15 @@ function sqimap_messages_remove_flag ($imap_stream, $start, $end, $flag, $handle
$read = sqimap_run_command ($imap_stream, "STORE $start:$end -FLAGS (\\$flag)", $handle_errors, $response, $message, $uid_support);
}
-/* Returns some general header information -- FROM, DATE, and SUBJECT */
-class small_header {
- var $from = '', $subject = '', $date = '', $to = '',
- $priority = 0, $message_id = 0, $cc = '', $uid = '';
+function sqimap_toggle_flag($imap_stream, $id, $flag, $set, $handle_errors) {
+ global $uid_support;
+ $msgs_id = sqimap_message_list_squisher($id);
+ $set_string = ($set ? '+' : '-');
+ $read = sqimap_run_command ($imap_stream, "STORE $msgs_id ".$set_string."FLAGS ($flag)", $handle_errors, $response, $message, $uid_support);
}
function sqimap_get_small_header ($imap_stream, $id, $sent) {
- $res = sqimap_get_small_header_list($imap_stream, array($id), $sent);
+ $res = sqimap_get_small_header_list($imap_stream, $id, $sent);
return $res[0];
}
@@ -56,7 +77,7 @@ function sqimap_get_small_header ($imap_stream, $id, $sent) {
*/
function sqimap_message_list_squisher($messages_array) {
if( !is_array( $messages_array ) ) {
- return;
+ return $messages_array;
}
sort($messages_array, SORT_NUMERIC);
@@ -138,6 +159,7 @@ function sqimap_get_sort_order ($imap_stream, $sort, $mbxresponse) {
$qty = $mbxresponse['EXISTS'];
$server_sort_array = range(1, $qty);
}
+ $server_sort_array = array_reverse($server_sort_array);
sqsession_register($server_sort_array, 'server_sort_array');
return $server_sort_array;
}
@@ -189,10 +211,10 @@ function sqimap_get_php_sort_order ($imap_stream, $mbxresponse) {
if ($uid_support) {
if (isset($mbxresponse['UIDNEXT']) && $mbxresponse['UIDNEXT']) {
- $uidnext = $mbxresponse['UIDNEXT']-1;
- } else {
- $uidnext = '*';
- }
+ $uidnext = $mbxresponse['UIDNEXT']-1;
+ } else {
+ $uidnext = '*';
+ }
$uid_query = "$sid SEARCH UID 1:$uidnext\r\n";
fputs($imap_stream, $uid_query);
$uids = sqimap_read_data($imap_stream, $sid, true ,$response, $message);
@@ -388,6 +410,7 @@ function get_thread_sort ($imap_stream) {
return $thread_list;
}
+
function elapsedTime($start) {
$stop = gettimeofday();
$timepassed = 1000000 * ($stop['sec'] - $start['sec']) + $stop['usec'] - $start['usec'];
@@ -396,14 +419,15 @@ function elapsedTime($start) {
function sqimap_get_small_header_list ($imap_stream, $msg_list) {
global $squirrelmail_language, $color, $data_dir, $username, $imap_server_type;
- global $uid_support;
+ global $uid_support, $allow_server_sort;
/* Get the small headers for each message in $msg_list */
$sid = sqimap_session_id($uid_support);
$maxmsg = sizeof($msg_list);
+
$msgs_str = sqimap_message_list_squisher($msg_list);
- $results = array();
+ $messages = array();
$read_list = array();
/*
* We need to return the data in the same order as the caller supplied
@@ -416,9 +440,9 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list) {
$internaldate = getPref($data_dir, $username, 'internal_date_sort');
if ($internaldate) {
- $query = "$sid FETCH $msgs_str (FLAGS UID RFC822.SIZE INTERNALDATE BODY.PEEK[HEADER.FIELDS (Date To From Cc Subject X-Priority Content-Type)])\r\n";
+ $query = "$sid FETCH $msgs_str (FLAGS UID RFC822.SIZE INTERNALDATE BODY.PEEK[HEADER.FIELDS (Date To Cc From Subject X-Priority Content-Type)])\r\n";
} else {
- $query = "$sid FETCH $msgs_str (FLAGS UID RFC822.SIZE BODY.PEEK[HEADER.FIELDS (Date To From Cc Subject X-Priority Content-Type)])\r\n";
+ $query = "$sid FETCH $msgs_str (FLAGS UID RFC822.SIZE BODY.PEEK[HEADER.FIELDS (Date To Cc From Subject X-Priority Content-Type)])\r\n";
}
fputs ($imap_stream, $query);
$readin_list = sqimap_read_data_list($imap_stream, $sid, false, $response, $message);
@@ -431,14 +455,14 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list) {
_("ERROR : Could not complete request.") .
'
' .
_("Unknown response from IMAP server: ") . ' 1.' .
- $r[0] . "
\n";
+ htmlspecialchars($r[0]) . "
\n";
} else if (! isset($id2index[$regs[1]]) || !count($id2index[$regs[1]])) {
set_up_language($squirrelmail_language);
echo '
' .
_("ERROR : Could not complete request.") .
'
' .
_("Unknown message number in reply from server: ") .
- $regs[1] . "
\n";
+ htmlspecialchars($regs[1]) . "
\n";
} else {
$read_list[$id2index[$regs[1]]] = $r;
}
@@ -449,14 +473,14 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list) {
_("ERROR : Could not complete request.") .
'
' .
_("Unknown response from IMAP server: ") . ' 1.' .
- $r[0] . "
\n";
+ htmlspecialchars($r[0]) . "
\n";
} else if (! isset($id2index[$regs[2]]) || !count($id2index[$regs[2]])) {
set_up_language($squirrelmail_language);
echo '
' .
_("ERROR : Could not complete request.") .
'
' .
_("Unknown message number in reply from server: ") .
- $regs[2] . "
\n";
+ htmlspecialchars($regs[2]) . "
\n";
} else {
$read_list[$id2index[$regs[2]]] = $r;
$unique_id = $regs[2];
@@ -480,25 +504,18 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list) {
$subject = _("(no subject)");
$from = _("Unknown Sender");
$priority = 0;
- $messageid = "<>";
- $cc = "";
- $to = "";
- $date = "";
- $type[0] = "";
- $type[1] = "";
- $inrepto = "";
- $flag_seen = false;
- $flag_answered = false;
- $flag_deleted = false;
- $flag_flagged = false;
+ $messageid = '<>';
+ $cc = $to = $date = $type[0] = $type[1] = $inrepto = '';
+ $flag_seen = $flag_answered = $flag_deleted = $flag_flagged = false;
$read = $read_list[$msgi];
$prevline = false;
foreach ($read as $read_part) {
//unfold multi-line headers
- if ($prevline && strpos($read_part, "\t ") === true) {
- $read_part = substr($prevline, 0, -2) . preg_replace('/(\t\s+)/',' ',$read_part);
- }
+ if ($prevline && $prevline{strlen($prevline)-1} == "\n"
+ && ($read_part{0} == ' ' || $read_part{0} == "\t")) {
+ $read_part = substr($prevline, 0, -2) . preg_replace('/(\t\s+)/',' ',$read_part);
+ }
$prevline = $read_part;
if ($read_part{0} == '*') {
if ($internaldate) {
@@ -507,7 +524,7 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list) {
$tmpdate = str_replace(' ',' ',$tmpdate);
$tmpdate = explode(' ',$tmpdate);
$date = str_replace('-',' ',$tmpdate[0]) . " " .
- $tmpdate[1] . " " .
+ $tmpdate[1] . ' ' .
$tmpdate[2];
}
}
@@ -533,7 +550,7 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list) {
$unique_id = $reg[1];
}
} else {
- $firstchar = $read_part{0};
+ $firstchar = strtoupper($read_part{0});
if ($firstchar == 'T') {
$regpattern = $patterns[0];
$id = 1;
@@ -563,22 +580,22 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list) {
if (preg_match ($regpattern, $read_part, $regs)) {
switch ($id) {
case 1:
- $to = $regs[1];
+ $to = trim($regs[1]);
break;
case 2:
- $from = $regs[1];
+ $from = trim($regs[1]);
break;
case 3:
$priority = $regs[1];
break;
case 4:
- $cc = $regs[1];
+ $cc = trim($regs[1]);
break;
case 5:
$date = $regs[1];
break;
case 6:
- $subject = htmlspecialchars(trim($regs[1]));
+ $subject = trim($regs[1]);
if ($subject == "") {
$subject = _("(no subject)");
}
@@ -589,6 +606,9 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list) {
$type = substr($type, 0, $pos);
}
$type = explode("/", $type);
+ if(!is_array($type)) {
+ $type[0] = 'text';
+ }
if (!isset($type[1])) {
$type[1] = '';
}
@@ -601,32 +621,54 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list) {
}
}
-
- $header = new small_header;
-
+
+ if (isset($date)) {
+ $date = str_replace(' ', ' ', $date);
+ $tmpdate = explode(' ', trim($date));
+ } else {
+ $tmpdate = $date = array('', '', '', '', '', '');
+ }
if ($uid_support) {
- $header->uid = $unique_id;
+ $messages[$msgi]['ID'] = $unique_id;
} else {
- $header->uid = $msg_list[$msgi];
+ $messages[$msgi]['ID'] = $msg_list[$msgi];
+ }
+
+ $messages[$msgi]['TIME_STAMP'] = getTimeStamp($tmpdate);
+ $messages[$msgi]['DATE_STRING'] = getDateString($messages[$msgi]['TIME_STAMP']);
+ $messages[$msgi]['FROM'] = parseAddress($from);
+ $messages[$msgi]['SUBJECT'] = $subject;
+// if (handleAsSent($mailbox)) {
+ $messages[$msgi]['TO'] = parseAddress($to);
+// }
+ $messages[$msgi]['PRIORITY'] = $priority;
+ $messages[$msgi]['CC'] = parseAddress($cc);
+ $messages[$msgi]['SIZE'] = $size;
+ $messages[$msgi]['TYPE0'] = $type[0];
+ $messages[$msgi]['FLAG_DELETED'] = $flag_deleted;
+ $messages[$msgi]['FLAG_ANSWERED'] = $flag_answered;
+ $messages[$msgi]['FLAG_SEEN'] = $flag_seen;
+ $messages[$msgi]['FLAG_FLAGGED'] = $flag_flagged;
+
+ /* non server sort stuff */
+ if (!$allow_server_sort) {
+ $from = parseAddress($from);
+ if ($from[0][1]) {
+ $from = decodeHeader($from[0][1]);
+ } else {
+ $from = $from[0][0];
+ }
+ $messages[$msgi]['FROM-SORT'] = $from;
+ $subject_sort = strtolower(decodeHeader($subject));
+ if (preg_match("/^(vedr|sv|re|aw):\s*(.*)$/si", $subject_sort, $matches)){
+ $messages[$msgi]['SUBJECT-SORT'] = $matches[2];
+ } else {
+ $messages[$msgi]['SUBJECT-SORT'] = $subject_sort;
+ }
}
- $header->date = $date;
- $header->subject = $subject;
- $header->to = $to;
- $header->from = $from;
- $header->priority = $priority;
- $header->message_id = $messageid;
- $header->cc = $cc;
- $header->size = $size;
- $header->type0 = $type[0];
- $header->type1 = $type[1];
- $header->flag_seen = $flag_seen;
- $header->flag_answered = $flag_answered;
- $header->flag_deleted = $flag_deleted;
- $header->flag_flagged = $flag_flagged;
- $header->inrepto = $inrepto;
- $result[] = $header;
+
}
- return $result;
+ return $messages;
}
function sqimap_get_headerfield($imap_stream, $field) {
@@ -643,12 +685,12 @@ function sqimap_get_headerfield($imap_stream, $field) {
foreach ($readin_list as $r) {
$r = implode('',$r);
/* first we unfold the header */
- $r = str_replace(array("\r\n\t","\r\n\s"),array('',''),$r);
- /*
- * now we can make a new header array with each element representing
- * a headerline
- */
- $r = explode("\r\n" , $r);
+ $r = str_replace(array("\r\n\t","\r\n\s"),array('',''),$r);
+ /*
+ * now we can make a new header array with each element representing
+ * a headerline
+ */
+ $r = explode("\r\n" , $r);
if (!$uid_support) {
if (!preg_match("/^\\*\s+([0-9]+)\s+FETCH/iAU",$r[0], $regs)) {
set_up_language($squirrelmail_language);
@@ -669,12 +711,12 @@ function sqimap_get_headerfield($imap_stream, $field) {
_("Unknown response from IMAP server: ") . ' 1.' .
$r[0] . "
\n";
} else {
- $id = $regs[2];
+ $id = $regs[2];
}
}
- $field = $r[1];
- $field = substr($field,strlen($field)+2);
- $result[] = array($id,$field);
+ $field = $r[1];
+ $field = substr($field,strlen($field)+2);
+ $result[] = array($id,$field);
}
return $result;
}
@@ -731,19 +773,6 @@ function sqimap_get_ent_header ($imap_stream, $id, $mailbox, $ent) {
return $header;
}
-
-/* Wrapper function that returns entity headers for use by decodeMime */
-/*
-function sqimap_get_entity_header ($imap_stream, &$read, &$type0, &$type1, &$bound, &$encoding, &$charset, &$filename) {
- $header = sqimap_get_header($imap_stream, $read);
- $type0 = $header["TYPE0"];
- $type1 = $header["TYPE1"];
- $bound = $header["BOUNDARY"];
- $encoding = $header["ENCODING"];
- $charset = $header["CHARSET"];
- $filename = $header["FILENAME"];
-}
-
/* function to get the mime headers */
function sqimap_get_mime_ent_header ($imap_stream, $id, $mailbox, $ent) {
global $uid_support;
@@ -754,9 +783,4 @@ function sqimap_get_mime_ent_header ($imap_stream, $id, $mailbox, $ent) {
return $header;
}
-/* Returns the body of a message. */
-function sqimap_get_message_body ($imap_stream, &$header) {
-// return decodeMime($imap_stream, $header->id);
-}
-
?>