summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-04-08 06:15:37 +0000
committeralecpl <alec@alec.pl>2011-04-08 06:15:37 +0000
commitf66f5f02e30d9fc2d5c06eeefb4377b8ff36fce2 (patch)
tree2b47469570e2882e0ffa9ccc86f4efcf0ce16aef /program
parent89a30354be12c28d4bf7c4d0f99ce7edcb0d7da1 (diff)
- Removed dependency on rcube_* functions, small improvements
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_imap_generic.php120
1 files changed, 55 insertions, 65 deletions
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index 5bf1ce52e..b4479d619 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -1558,36 +1558,21 @@ class rcube_imap_generic
if (preg_match('/^\* [0-9]+ FETCH \((.*) BODY/sU', $line, $matches)) {
$str = $matches[1];
- // swap parents with quotes, then explode
- $str = preg_replace('/[()]/', '"', $str);
- $a = rcube_explode_quoted_string(' ', $str);
-
- // did we get the right number of replies?
- $parts_count = count($a);
- if ($parts_count>=6) {
- for ($i=0; $i<$parts_count; $i=$i+2) {
- if ($a[$i] == 'UID') {
- $result[$id]->uid = intval($a[$i+1]);
- }
- else if ($a[$i] == 'RFC822.SIZE') {
- $result[$id]->size = intval($a[$i+1]);
- }
- else if ($a[$i] == 'INTERNALDATE') {
- $time_str = $a[$i+1];
- }
- else if ($a[$i] == 'FLAGS') {
- $flags_str = $a[$i+1];
- }
+ while (list($name, $value) = $this->tokenizeResponse($str, 2)) {
+ if ($name == 'UID') {
+ $result[$id]->uid = intval($value);
+ }
+ else if ($name == 'RFC822.SIZE') {
+ $result[$id]->size = intval($value);
+ }
+ else if ($name == 'INTERNALDATE') {
+ $result[$id]->internaldate = $value;
+ $result[$id]->date = $value;
+ $result[$id]->timestamp = $this->StrToTime($value);
+ }
+ else if ($name == 'FLAGS') {
+ $flags_a = $value;
}
-
- $time_str = str_replace('"', '', $time_str);
-
- // if time is gmt...
- $time_str = str_replace('GMT','+0000',$time_str);
-
- $result[$id]->internaldate = $time_str;
- $result[$id]->timestamp = $this->StrToTime($time_str);
- $result[$id]->date = $time_str;
}
// BODYSTRUCTURE
@@ -1635,7 +1620,7 @@ class rcube_imap_generic
// handle FLAGS reply after headers (AOL, Zimbra?)
if (preg_match('/\s+FLAGS \((.*)\)\)$/', $line, $matches)) {
- $flags_str = $matches[1];
+ $flags_a = $this->tokenizeResponse($matches[1]);
break;
}
@@ -1659,10 +1644,10 @@ class rcube_imap_generic
// create array with header field:data
while (list($lines_key, $str) = each($lines)) {
- list($field, $string) = $this->splitHeaderLine($str);
+ list($field, $string) = explode(':', $str, 2);
$field = strtolower($field);
- $string = preg_replace('/\n\s*/', ' ', $string);
+ $string = preg_replace('/\n[\t\s]*/', ' ', trim($string));
switch ($field) {
case 'date';
@@ -1726,28 +1711,31 @@ class rcube_imap_generic
}
// process flags
- if (!empty($flags_str)) {
- $flags_str = preg_replace('/[\\\"]/', '', $flags_str);
- $flags_a = explode(' ', $flags_str);
-
- if (is_array($flags_a)) {
- foreach($flags_a as $flag) {
- $flag = strtoupper($flag);
- if ($flag == 'SEEN') {
- $result[$id]->seen = true;
- } else if ($flag == 'DELETED') {
- $result[$id]->deleted = true;
- } else if ($flag == 'ANSWERED') {
- $result[$id]->answered = true;
- } else if ($flag == '$FORWARDED') {
- $result[$id]->forwarded = true;
- } else if ($flag == '$MDNSENT') {
- $result[$id]->mdn_sent = true;
- } else if ($flag == 'FLAGGED') {
- $result[$id]->flagged = true;
- }
+ if (!empty($flags_a)) {
+ foreach ($flags_a as $flag) {
+ $flag = str_replace('\\', '', $flag);
+ $result[$id]->flags[] = $flag;
+
+ switch (strtoupper($flag)) {
+ case 'SEEN':
+ $result[$id]->seen = true;
+ break;
+ case 'DELETED':
+ $result[$id]->deleted = true;
+ break;
+ case 'ANSWERED':
+ $result[$id]->answered = true;
+ break;
+ case '$FORWARDED':
+ $result[$id]->forwarded = true;
+ break;
+ case '$MDNSENT':
+ $result[$id]->mdn_sent = true;
+ break;
+ case 'FLAGGED':
+ $result[$id]->flagged = true;
+ break;
}
- $result[$id]->flags = $flags_a;
}
}
}
@@ -3278,21 +3266,23 @@ class rcube_imap_generic
*
* @return int Unix timestamp
*/
- private function strToTime($date)
+ static function strToTime($date)
{
- $ts = (int) rcube_strtotime($date);
- return $ts < 0 ? 0 : $ts;
- }
+ // support non-standard "GMTXXXX" literal
+ $date = preg_replace('/GMT\s*([+-][0-9]+)/', '\\1', $date);
- private function splitHeaderLine($string)
- {
- $pos = strpos($string, ':');
- if ($pos>0) {
- $res[0] = substr($string, 0, $pos);
- $res[1] = trim(substr($string, $pos+1));
- return $res;
+ // if date parsing fails, we have a date in non-rfc format
+ // remove token from the end and try again
+ while (($ts = intval(@strtotime($date))) <= 0) {
+ $d = explode(' ', $date);
+ array_pop($d);
+ if (empty($d)) {
+ break;
+ }
+ $date = implode(' ', $d);
}
- return $string;
+
+ return $ts < 0 ? 0 : $ts;
}
private function parseCapability($str, $trusted=false)