X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_messages.php;h=c8a98781965ed98f67eae3f8a1ceee0d25bc6ff8;hb=098ea084d624846de46648afacc0564d9f2c1959;hp=29d28fb3700434cd3e1024c068818477c231b754;hpb=114f2a240cef7ccf89abac98fa28e67c7f6e5627;p=squirrelmail.git diff --git a/functions/imap_messages.php b/functions/imap_messages.php index 29d28fb3..c8a98781 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,41 +12,62 @@ */ /* 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; if (($move_to_trash == true) && (sqimap_mailbox_exists($imap_stream, $trash_folder) && ($mailbox != $trash_folder))) { sqimap_messages_copy ($imap_stream, $start, $end, $trash_folder); } - sqimap_messages_flag ($imap_stream, $start, $end, "Deleted"); + 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) { +function sqimap_messages_flag ($imap_stream, $start, $end, $flag, $handle_errors) { global $uid_support; - $read = sqimap_run_command ($imap_stream, "STORE $start:$end +FLAGS (\\$flag)", true, $response, $message, $uid_support); + $read = sqimap_run_command ($imap_stream, "STORE $start:$end +FLAGS (\\$flag)", $handle_errors, $response, $message, $uid_support); } /* Remove specified flag from specified messages */ -function sqimap_messages_remove_flag ($imap_stream, $start, $end, $flag) { +function sqimap_messages_remove_flag ($imap_stream, $start, $end, $flag, $handle_errors) { global $uid_support; - $read = sqimap_run_command ($imap_stream, "STORE $start:$end -FLAGS (\\$flag)", true, $response, $message, $uid_support); + $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); @@ -83,15 +104,15 @@ function get_reference_header ($imap_stream, $message) { global $uid_support; $responses = array (); $sid = sqimap_session_id($uid_support); - $results = array(); - $references = ""; + $results = array(); + $references = ""; $query = "$sid FETCH $message BODY[HEADER.FIELDS (References)]\r\n"; fputs ($imap_stream, $query); - $responses = sqimap_read_data_list($imap_stream, $sid, true, $responses, $message); + $responses = sqimap_read_data_list($imap_stream, $sid, true, $responses, $message); if (!eregi("^\\* ([0-9]+) FETCH", $responses[0][0], $regs)) { - $responses = array (); - } - return $responses; + $responses = array (); + } + return $responses; } @@ -99,14 +120,14 @@ function get_reference_header ($imap_stream, $message) { * return it as the $id array for * mailbox_display */ - + function sqimap_get_sort_order ($imap_stream, $sort, $mbxresponse) { global $default_charset, $thread_sort_messages, $internal_date_sort, $server_sort_array, $sent_folder, $mailbox, $uid_support; - if (session_is_registered('server_sort_array')) { - session_unregister('server_sort_array'); + if (sqsession_is_registered('server_sort_array')) { + sqsession_unregister('server_sort_array'); } $sid = sqimap_session_id($uid_support); @@ -118,23 +139,27 @@ function sqimap_get_sort_order ($imap_stream, $sort, $mbxresponse) { if ($sort == 6) { if ($uid_support) { - $uidnext = $mbxresponse['UIDNEXT']-1; - $uid_query = "$sid SEARCH UID 1:$uidnext\r\n"; - fputs($imap_stream, $uid_query); - $uids = sqimap_read_data($imap_stream, $sid, true ,&$response, $message); - if (isset($uids[0])) { - if (preg_match("/^\* SEARCH (.+)$/", $uids[0], $regs)) { - $server_sort_array = preg_split("/ /", trim($regs[1])); - } - } - if (!preg_match("/OK/", $response)) { - $server_sort_array = 'no'; - } + if (isset($mbxresponse['UIDNEXT']) && $mbxresponse['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); + if (isset($uids[0])) { + if (preg_match("/^\* SEARCH (.+)$/", $uids[0], $regs)) { + $server_sort_array = preg_split("/ /", trim($regs[1])); + } + } + if (!preg_match("/OK/", $response)) { + $server_sort_array = 'no'; + } } else { - $qty = $mbxresponse['EXISTS']; - $server_sort_array = range(1, $qty); - } - session_register('server_sort_array'); + $qty = $mbxresponse['EXISTS']; + $server_sort_array = range(1, $qty); + } + sqsession_register($server_sort_array, 'server_sort_array'); return $server_sort_array; } @@ -155,20 +180,20 @@ function sqimap_get_sort_order ($imap_stream, $sort, $mbxresponse) { if (!empty($sort_on[$sort])) { $sort_query = "$sid SORT ($sort_on[$sort]) ".strtoupper($default_charset)." ALL\r\n"; fputs($imap_stream, $sort_query); - $sort_test = sqimap_read_data($imap_stream, $sid, true ,&$response, $message); + $sort_test = sqimap_read_data($imap_stream, $sid, true ,$response, $message); } if (isset($sort_test[0])) { - if (preg_match("/^\* SORT (.+)$/", $sort_test[0], $regs)) { - $server_sort_array = preg_split("/ /", trim($regs[1])); - } + if (preg_match("/^\* SORT (.+)$/", $sort_test[0], $regs)) { + $server_sort_array = preg_split("/ /", trim($regs[1])); + } } if ($sort == 0 || $sort == 2 || $sort == 4) { $server_sort_array = array_reverse($server_sort_array); } if (!preg_match("/OK/", $response)) { - $server_sort_array = 'no'; - } - session_register('server_sort_array'); + $server_sort_array = 'no'; + } + sqsession_register($server_sort_array, 'server_sort_array'); return $server_sort_array; } @@ -176,35 +201,39 @@ function sqimap_get_sort_order ($imap_stream, $sort, $mbxresponse) { function sqimap_get_php_sort_order ($imap_stream, $mbxresponse) { global $uid_support; - if (session_is_registered('php_sort_array')) { - session_unregister('php_sort_array'); + if (sqsession_is_registered('php_sort_array')) { + sqsession_unregister('php_sort_array'); } $sid = sqimap_session_id($uid_support); $php_sort_array = array(); if ($uid_support) { - $uidnext = $mbxresponse['UIDNEXT']-1; - $uid_query = "$sid SEARCH UID 1:$uidnext\r\n"; - fputs($imap_stream, $uid_query); - $uids = sqimap_read_data($imap_stream, $sid, true ,&$response, $message); - if (isset($uids[0])) { - if (preg_match("/^\* SEARCH (.+)$/", $uids[0], $regs)) { + if (isset($mbxresponse['UIDNEXT']) && $mbxresponse['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); + if (isset($uids[0])) { + if (preg_match("/^\* SEARCH (.+)$/", $uids[0], $regs)) { $php_sort_array = preg_split("/ /", trim($regs[1])); - } - } - if (!preg_match("/OK/", $response)) { - $php_sort_array = 'no'; - } + } + } + if (!preg_match("/OK/", $response)) { + $php_sort_array = 'no'; + } } else { - $qty = $mbxresponse['EXISTS']; + $qty = $mbxresponse['EXISTS']; $php_sort_array = range(1, $qty); } - session_register('php_sort_array'); + sqsession_register($php_sort_array, 'php_sort_array'); return $php_sort_array; -} +} + - /* returns an indent array for printMessageinfo() this represents the amount of indent needed (value) for this message number (key) @@ -215,7 +244,7 @@ function get_parent_level ($imap_stream) { $parent = ""; $child = ""; $cutoff = 0; - + /* loop through the threads and take unwanted characters out of the thread string then chop it up */ @@ -229,10 +258,10 @@ function get_parent_level ($imap_stream) { $thread_new = array(); } /* looping through the parts of one message thread */ - + for ($i=0;$i' . - _("ERROR : Could not complete request.") . - '
' . - _("Unknown response from IMAP server: ") . ' 1.' . - $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"; - } else { - $read_list[$id2index[$regs[1]]] = $r; - } - } else { - if (!preg_match("/^\\*\s+([0-9]+)\s+FETCH.*UID\s+([0-9]+)\s+/iAU",$r[0], $regs)) { - set_up_language($squirrelmail_language); - echo '
' . - _("ERROR : Could not complete request.") . - '
' . - _("Unknown response from IMAP server: ") . ' 1.' . - $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"; + if (!$uid_support) { + if (!preg_match("/^\\*\s+([0-9]+)\s+FETCH/iAU",$r[0], $regs)) { + set_up_language($squirrelmail_language); + echo '
' . + _("ERROR : Could not complete request.") . + '
' . + _("Unknown response from IMAP server: ") . ' 1.' . + 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: ") . + htmlspecialchars($regs[1]) . "
\n"; + } else { + $read_list[$id2index[$regs[1]]] = $r; + } } else { - $read_list[$id2index[$regs[2]]] = $r; - $unique_id = $regs[2]; + if (!preg_match("/^\\*\s+([0-9]+)\s+FETCH.*UID\s+([0-9]+)\s+/iAU",$r[0], $regs)) { + set_up_language($squirrelmail_language); + echo '
' . + _("ERROR : Could not complete request.") . + '
' . + _("Unknown response from IMAP server: ") . ' 1.' . + 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: ") . + htmlspecialchars($regs[2]) . "
\n"; + } else { + $read_list[$id2index[$regs[2]]] = $r; + $unique_id = $regs[2]; + } } - } } arsort($read_list); $patterns = array ( - "/^To:(.*)\$/AUi", - "/^From:(.*)\$/AUi", - "/^X-Priority:(.*)\$/AUi", - "/^Cc:(.*)\$/AUi", - "/^Date:(.*)\$/AUi", - "/^Subject:(.*)\$/AUi", - "/^Content-Type:(.*)\$/AUi" - ); - $regpattern = ''; + "/^To:(.*)\$/AUi", + "/^From:(.*)\$/AUi", + "/^X-Priority:(.*)\$/AUi", + "/^Cc:(.*)\$/AUi", + "/^Date:(.*)\$/AUi", + "/^Subject:(.*)\$/AUi", + "/^Content-Type:(.*)\$/AUi" + ); + $regpattern = ''; for ($msgi = 0; $msgi < $maxmsg; $msgi++) { $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 - while ($prevline && strspn($read_part, "\t ") > 0) { - $read_part = substr($prevline, 0, -2) . ' ' . ltrim($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); } - $prev_line = $read_part; - if ($read_part{0} == '*') { - if ($internaldate) { - if (preg_match ("/^.+INTERNALDATE\s+\"(.+)\".+/iUA",$read_part, $reg)) { + $prevline = $read_part; + if ($read_part{0} == '*') { + if ($internaldate) { + if (preg_match ("/^.+INTERNALDATE\s+\"(.+)\".+/iUA",$read_part, $reg)) { $tmpdate = trim($reg[1]); $tmpdate = str_replace(' ',' ',$tmpdate); $tmpdate = explode(' ',$tmpdate); $date = str_replace('-',' ',$tmpdate[0]) . " " . - $tmpdate[1] . " " . + $tmpdate[1] . ' ' . $tmpdate[2]; } - } - if (preg_match ("/^.+RFC822.SIZE\s+(\d+).+/iA",$read_part, $reg)) { - $size = $reg[1]; - } - if (preg_match("/^.+FLAGS\s+\((.*)\).+/iUA", $read_part, $regs)) { - $flags = explode(' ',trim($regs[1])); - foreach ($flags as $flag) { - $flag = strtolower($flag); - if ($flag == '\\seen') { - $flag_seen = true; - } else if ($flag == '\\answered') { - $flag_answered = true; - } else if ($flag == '\\deleted') { - $flag_deleted = true; - } else if ($flag == '\\flagged') { - $flag_flagged = true; - } - } - } - if (preg_match ("/^.+UID\s+(\d+).+/iA",$read_part, $reg)) { - $unique_id = $reg[1]; - } + } + if (preg_match ("/^.+RFC822.SIZE\s+(\d+).+/iA",$read_part, $reg)) { + $size = $reg[1]; + } + if (preg_match("/^.+FLAGS\s+\((.*)\).+/iUA", $read_part, $regs)) { + $flags = explode(' ',trim($regs[1])); + foreach ($flags as $flag) { + $flag = strtolower($flag); + if ($flag == '\\seen') { + $flag_seen = true; + } else if ($flag == '\\answered') { + $flag_answered = true; + } else if ($flag == '\\deleted') { + $flag_deleted = true; + } else if ($flag == '\\flagged') { + $flag_flagged = true; + } + } + } + if (preg_match ("/^.+UID\s+(\d+).+/iA",$read_part, $reg)) { + $unique_id = $reg[1]; + } + } else { + $firstchar = strtoupper($read_part{0}); + if ($firstchar == 'T') { + $regpattern = $patterns[0]; + $id = 1; + } else if ($firstchar == 'F') { + $regpattern = $patterns[1]; + $id = 2; + } else if ($firstchar == 'X') { + $regpattern = $patterns[2]; + $id = 3; + } else if ($firstchar == 'C') { + if (strtolower($read_part{1}) == 'c') { + $regpattern = $patterns[3]; + $id = 4; + } else if (strtolower($read_part{1}) == 'o') { + $regpattern = $patterns[6]; + $id = 7; + } + } else if ($firstchar == 'D' && !$internaldate ) { + $regpattern = $patterns[4]; + $id = 5; + } else if ($firstchar == 'S') { + $regpattern = $patterns[5]; + $id = 6; + } else $regpattern = ''; + + if ($regpattern) { + if (preg_match ($regpattern, $read_part, $regs)) { + switch ($id) { + case 1: + $to = trim($regs[1]); + break; + case 2: + $from = trim($regs[1]); + break; + case 3: + $priority = $regs[1]; + break; + case 4: + $cc = trim($regs[1]); + break; + case 5: + $date = $regs[1]; + break; + case 6: + $subject = trim($regs[1]); + if ($subject == "") { + $subject = _("(no subject)"); + } + break; + case 7: + $type = strtolower(trim($regs[1])); + if ($pos = strpos($type, ";")) { + $type = substr($type, 0, $pos); + } + $type = explode("/", $type); + if(!is_array($type)) { + $type[0] = 'text'; + } + if (!isset($type[1])) { + $type[1] = ''; + } + break; + default: + break; + } + } + } + } + } + + if (isset($date)) { + $date = str_replace(' ', ' ', $date); + $tmpdate = explode(' ', trim($date)); + } else { + $tmpdate = $date = array('', '', '', '', '', ''); + } + if ($uid_support) { + $messages[$msgi]['ID'] = $unique_id; + } else { + $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 { - $firstchar = $read_part{0}; - if ($firstchar == 'T') { - $regpattern = $patterns[0]; - $id = 1; - } else if ($firstchar == 'F') { - $regpattern = $patterns[1]; - $id = 2; - } else if ($firstchar == 'X') { - $regpattern = $patterns[2]; - $id = 3; - } else if ($firstchar == 'C') { - if (strtolower($read_part{1}) == 'c') { - $regpattern = $patterns[3]; - $id = 4; - } else if (strtolower($read_part{1}) == 'o') { - $regpattern = $patterns[6]; - $id = 7; - } - } else if ($firstchar == 'D' && !$internaldate ) { - $regpattern = $patterns[4]; - $id = 5; - } else if ($firstchar == 'S') { - $regpattern = $patterns[5]; - $id = 6; - } else $regpattern = ''; - - if ($regpattern) { - if (preg_match ($regpattern, $read_part, $regs)) { - switch ($id) { - case 1: - $to = $regs[1]; - break; - case 2: - $from = $regs[1]; - break; - case 3: - $priority = $regs[1]; - break; - case 4: - $cc = $regs[1]; - break; - case 5: - $date = $regs[1]; - break; - case 6: - $subject = htmlspecialchars(trim($regs[1])); - if ($subject == "") { - $subject = _("(no subject)"); - } - break; - case 7: - $type = strtolower(trim($regs[1])); - if ($pos = strpos($type, ";")) { - $type = substr($type, 0, $pos); - } - $type = explode("/", $type); - if (!isset($type[1])) { - $type[1] = ''; - } - break; - default: - break; - } - } - } + $from = $from[0][0]; } - - } - $header = new small_header; - if ($issent) { - $header->from = (trim($to) != '' ? $to : '(' ._("No To Address") . ')'); - } else { - $header->from = $from; + $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; + } } + + } + return $messages; +} - if ($uid_support) { - $header->uid = $unique_id; +function sqimap_get_headerfield($imap_stream, $field) { + $sid = sqimap_session_id(false); + + $results = array(); + $read_list = array(); + + $query = "$sid FETCH 1:* (UID BODY.PEEK[HEADER.FIELDS ($field)])\r\n"; + fputs ($imap_stream, $query); + $readin_list = sqimap_read_data_list($imap_stream, $sid, false, $response, $message); + $i = 0; + + 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); + if (!$uid_support) { + if (!preg_match("/^\\*\s+([0-9]+)\s+FETCH/iAU",$r[0], $regs)) { + set_up_language($squirrelmail_language); + echo '
' . + _("ERROR : Could not complete request.") . + '
' . + _("Unknown response from IMAP server: ") . ' 1.' . + $r[0] . "
\n"; + } else { + $id = $regs[1]; + } } else { - $header->uid = $msgi +1; - } - $header->date = $date; - $header->subject = $subject; - $header->to = $to; - $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; + if (!preg_match("/^\\*\s+([0-9]+)\s+FETCH.*UID\s+([0-9]+)\s+/iAU",$r[0], $regs)) { + set_up_language($squirrelmail_language); + echo '
' . + _("ERROR : Could not complete request.") . + '
' . + _("Unknown response from IMAP server: ") . ' 1.' . + $r[0] . "
\n"; + } else { + $id = $regs[2]; + } + } + $field = $r[1]; + $field = substr($field,strlen($field)+2); + $result[] = array($id,$field); } return $result; } + + + + /* * Returns a message array with all the information about a message. * See the documentation folder for more information about this array. */ function sqimap_get_message ($imap_stream, $id, $mailbox) { global $uid_support; - + $flags = array(); $read = sqimap_run_command ($imap_stream, "FETCH $id (FLAGS BODYSTRUCTURE)", true, $response, $message, $uid_support); if ($read) { @@ -642,15 +740,15 @@ function sqimap_get_message ($imap_stream, $id, $mailbox) { } } } else { - echo "ERROR Yeah I know, not a very usefull errormessage (sqimap_get_message)"; + echo "ERROR Yeah I know, not a very usefull errormessage (id = $id, mailbox = $mailbox sqimap_get_message)"; exit; } $bodystructure = implode('',$read); $msg = mime_structure($bodystructure,$flags); $read = sqimap_run_command ($imap_stream, "FETCH $id BODY[HEADER]", true, $response, $message, $uid_support); - $msg->addRFC822Header($read); - $msg->id = $id; - $msg->mailbox = $mailbox; + $rfc822_header = new Rfc822Header(); + $rfc822_header->parseHeader($read); + $msg->rfc822_header = $rfc822_header; return $msg; } @@ -674,19 +772,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; @@ -697,9 +782,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); -} - ?>