- $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;
+
+ $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;
+ }
+ }
+