Changeset a9a8ef2 in github

Timestamp:

Feb 12, 2008 2:20:14 PM (5 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

a0ce2f0

Parents:

d5ff9276

Message:

Use INTERNALDATE if Date: header is missing; convert some spaces back to tabs

File:

• program/lib/imap.inc (modified) (10 diffs)

program/lib/imap.inc

@@ -792 +792 @@
     }
         $fields = array('ARRIVAL'=>1,'CC'=>1,'DATE'=>1,'FROM'=>1,'SIZE'=>1,
-        'SUBJECT'=>1,'TO'=>1);
+ 'SUBJECT'=>1,'TO'=>1);
         
         if (!$fields[$field]) {
@@ -1489 +1489 @@
         list($from_idx, $to_idx) = explode(':', $message_set);
         if (empty($message_set) || (isset($to_idx)
-        && (int)$from_idx > (int)$to_idx)) {
+                && (int)$from_idx > (int)$to_idx)) {
                 return false;
-    }
+        }
                 
         /*  Do "SELECT" command */
@@ -1510 +1510 @@
                                 } else {
                                     $needed_set.=($needed_set ? ',': '') . $id;
-                }
+                                }
                         }
                         //echo "<!-- iil_C_FetchHeader\nMessage Set: $message_set\nNeeded Set:$needed_set\n//-->\n";
                         if ($needed_set) {
-                            $message_set = iil_CompressMessageSet($needed_set);
-            } else {
-                return $result;
-            }
+                                $message_set = iil_CompressMessageSet($needed_set);
+                        } else {
+                                return $result;
+                        }
                 }
         }
 
         /* FETCH date,from,subject headers */
-        $key      = 'fh' . ($c++);
-        $prefix   = $uidfetch?' UID':'';
+        $key      = 'fh' . ($c++);
+        $prefix   = $uidfetch?' UID':'';
         $request  = $key . $prefix;
-    $request .= " FETCH $message_set (BODY.PEEK[HEADER.FIELDS ";
-    $request .= "(DATE FROM TO SUBJECT REPLY-TO IN-REPLY-TO CC BCC ";
-    $request .= "CONTENT-TRANSFER-ENCODING CONTENT-TYPE MESSAGE-ID ";
-    $request .= "REFERENCES DISPOSITION-NOTIFICATION-TO X-PRIORITY)])\r\n";
+        $request .= " FETCH $message_set (BODY.PEEK[HEADER.FIELDS ";
+        $request .= "(DATE FROM TO SUBJECT REPLY-TO IN-REPLY-TO CC BCC ";
+        $request .= "CONTENT-TRANSFER-ENCODING CONTENT-TYPE MESSAGE-ID ";
+        $request .= "REFERENCES DISPOSITION-NOTIFICATION-TO X-PRIORITY)])\r\n";
 
         if (!fputs($fp, $request)) {
-            return false;
-    }
+                return false;
+        }
         do {
                 $line = chop(iil_ReadLine($fp, 200));
@@ -1572 +1572 @@
                                 if (preg_match("/^\s*UID [0-9]+\)$/", $line)) {
                                     break;
-                }
-            // patch from "Maksim Rubis" <siburny@hotmail.com>
+                                }
+                        // patch from "Maksim Rubis" <siburny@hotmail.com>
                         } while (trim($line[0]) != ')' && strncmp($line, $key, strlen($key)));
                         
-            if (strncmp($line, $key, strlen($key))) { 
-                        //process header, fill iilBasicHeader obj.
-                        //      initialize
-                        if (is_array($headers)) {
-                                reset($headers);
-                                while (list($k, $bar) = each($headers)) {
-                        $headers[$k] = '';
-                    }
-                        }
-    
-                        //      create array with header field:data
-                        while ( list($lines_key, $str) = each($lines) ) {
-                                list($field, $string) = iil_SplitHeaderLine($str);
-                    
-                                $field = strtolower($field);
-                                
-                                switch ($field) {
+                        if (strncmp($line, $key, strlen($key))) { 
+                                //process header, fill iilBasicHeader obj.
+                                //      initialize
+                                if (is_array($headers)) {
+                                        reset($headers);
+                                        while (list($k, $bar) = each($headers)) {
+                                                $headers[$k] = '';
+                                        }
+                                }
+        
+                                //      create array with header field:data
+                                while ( list($lines_key, $str) = each($lines) ) {
+                                        list($field, $string) = iil_SplitHeaderLine($str);
+                                        
+                                        $field = strtolower($field);
+                                        
+                                        switch ($field) {
                                         case 'date';
-                                                $result[$id]->date      = $string;
+                                                $result[$id]->date = $string;
                                                 $result[$id]->timestamp = iil_StrToTime($string);
                                                 break;
@@ -1619 +1619 @@
                                                 break;
                                         case 'content-type':
-                                                $ctype_parts = explode(";", $string);
+                                                $ctype_parts = explode(";", $string);
                                                 $result[$id]->ctype = array_shift($ctype_parts);
                                                 foreach ($ctype_parts as $ctype_add) {
-                            if (preg_match('/charset="?([a-z0-9\-\.\_]+)"?/i',
-                                $ctype_add, $regs)) {
-                                $result[$id]->charset = $regs[1];
+                                                        if (preg_match('/charset="?([a-z0-9\-\.\_]+)"?/i',
+                                                                $ctype_add, $regs)) {
+                                                                $result[$id]->charset = $regs[1];
                                                         }
-                        }
-                        break;
+                                                }
+                                                break;
                                         case 'in-reply-to':
                                                 $result[$id]->in_reply_to = ereg_replace("[\n<>]", '', $string);
@@ -1646 +1646 @@
                                                         $result[$id]->priority = intval($matches[1]);
                                                 break;
-                                } // end switch ()
-                        } // end while ()
-                    } else {
-                            $a = explode(' ', $line);
-                    }
-
-            if (!isset($result[$id]->date)) {
-                $result[$id]->date = '';
-            }
-            $result[$id]->date = trim($result[$id]->date);
-
-            $before = true;
-
-            if ($result[$id]->date == '') {
-
-                $before = false;
-
-                /* FETCH RECEIVED header */
-                $key      = 'fh' . ($c++);
-                $request  = $key;
-                $request .= " UID FETCH $id (BODY.PEEK[HEADER.FIELDS ";
-                $request .= "(RECEIVED)])\r\n";
-
-                if (fputs($fp, $request)) {
-                    $_received = '';
-                    while ($line = chop(iil_ReadLine($fp, 200))) {
-                        $line = trim($line);
-                        if (preg_match('/for <(.*)>;(.*)/', $line)) {
-                            $_received .= trim($line);
-                            break;
-                        }
-                    }
-                    if ($_received != '') {
-                        $_received = trim(str_replace(';', '',
-                            substr($_received, strpos($_received, ';')) ));
-
-                        if ($_received != '') {
-                            $result[$id]->date      = $_received;
-                            $result[$id]->timestamp = iil_StrToTime($_received);
-                            //trigger_error("Date: {$result[$id]->timestamp}", E_USER_WARNING);
-                        }
-                    }
-                    $result[$id]->date = trim($result[$id]->date);
-                }
-                /**
-                 * This is  hack to display something.
-                 */
-                if ($result[$id]->date == '') {
-                    $result[$id]->date      = date('r');
-                    $result[$id]->timestamp = time();
-                }
-            }
-            trigger_error("set before? {$before}, ID {$id}: {$result[$id]->date} / {$result[$id]->timestamp}", E_USER_WARNING);
+                                        } // end switch ()
+                                } // end while ()
+                        } else {
+                                $a = explode(' ', $line);
+                        }
                 }
         } while (strcmp($a[0], $key) != 0);
@@ -1707 +1659 @@
         */
         $command_key = 'fh' . ($c++);
-    
         $request  = $command_key . $prefix;
-    $request .= " FETCH $message_set (UID RFC822.SIZE FLAGS INTERNALDATE)\r\n";
+        $request .= " FETCH $message_set (UID RFC822.SIZE FLAGS INTERNALDATE)\r\n";
+        
         if (!fputs($fp, $request)) {
             return false;
         }
     do {
-                $line=chop(iil_ReadLine($fp, 200));
+                $line = chop(iil_ReadLine($fp, 200));
                 //$a = explode(' ', $line);
                 //if (($line[0]=="*") && ($a[2]=="FETCH")) {
@@ -1780 +1732 @@
                                             $time_zone += 0.5;  //handle half hour offset
                                         }
-                    if ($time_zone_str[0] == '-') {
-                        $time_zone = $time_zone * -1.0; //minus?
+                                        if ($time_zone_str[0] == '-') {
+                                                $time_zone = $time_zone * -1.0; //minus?
                                         }
-                    $result[$id]->internaldate = $time_str;
+                                        $result[$id]->internaldate = $time_str;
                                         
-                                        if ($IMAP_USE_INTERNAL_DATE) {
+                                        if ($IMAP_USE_INTERNAL_DATE || empty($result[$id]->date)) {
                                                 //calculate timestamp
                                                 $timestamp     = strtotime($time_str); //return's server's time
@@ -1792 +1744 @@
                                                 
                                                 $result[$id]->timestamp = $timestamp;
+                                                $result[$id]->date = $time_str;
                                         }
                                                 
@@ -1814 +1767 @@
         $a  = iil_C_FetchHeaders($conn, $mailbox, $id, $uidfetch);
         if (is_array($a)) {
-            return array_shift($a);
-    }
+                return array_shift($a);
+        }
         return false;
 }