Changeset d5ff9276 in github

Timestamp:

Feb 12, 2008 1:44:58 PM (5 years ago)

Author:

till <till@…>

Branches:

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

Children:

a9a8ef2

Parents:

a8d23d8

Message:

• attempted to revise the fix from #1484577 to streamline IMAP communication
• not a 100% working, checking in for thomasb

File:

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

program/lib/imap.inc

@@ -756 +756 @@
         
         //strip off day of week
-        $pos=strpos($str, ' ');
+        $pos = strpos($str, ' ');
         if (!is_numeric(substr($str, 0, $pos))) {
             $str = substr($str, $pos+1);
@@ -916 +916 @@
                                 $received = 0;
                                 do {
-                                        $line = iil_ReadLine($fp, 0);
-                                        $received+=strlen($line);
-                                        $line = chop($line);
+                                        $line      = iil_ReadLine($fp, 0);
+                                        $received += strlen($line);
+                                        $line      = chop($line);
                                         
-                                        if ($received>$bytes) break;
-                                        else if (!$line) continue;
+                                        if ($received>$bytes) {
+                        break;
+                                        } else if (!$line) {
+                        continue;
+                                        }
+
+                                        list($field, $string) = explode(': ', $line);
                                         
-                                        list($field,$string)=explode(": ", $line);
-                                        
-                                        if (strcasecmp($field, "date") == 0)
+                                        if (strcasecmp($field, 'date') == 0) {
                                                 $result[$id] = iil_StrToTime($string);
-                                        else if ($index_field!="DATE")
+                                        } else if ($index_field != 'DATE') {
                                                 $result[$id]=strtoupper(str_replace('"', '', $string));
-                                } while ($line[0]!=")");
+                    }
+                                } while ($line[0] != ')');
                         }Â else {
                                 //one line response, not expected so ignore                             
@@ -935 +939 @@
                         */
                 } while (!iil_StartsWith($line, $key));
+
         }else if ($mode == 6) {
+
                 $key     = 'fhi' . ($c++);
                 $request = $key." FETCH $message_set (INTERNALDATE)\r\n";
@@ -1473 +1479 @@
 }
 
-function iil_C_FetchHeaders(&$conn, $mailbox, $message_set, $uidfetch=false) {
+function iil_C_FetchHeaders(&$conn, $mailbox, $message_set, $uidfetch=false)
+{
         global $IMAP_USE_INTERNAL_DATE;
         
@@ -1521 +1528 @@
     $request .= "(DATE FROM TO SUBJECT REPLY-TO IN-REPLY-TO CC BCC ";
     $request .= "CONTENT-TRANSFER-ENCODING CONTENT-TYPE MESSAGE-ID ";
-    $request .= "REFERENCES RECEIVED DISPOSITION-NOTIFICATION-TO X-PRIORITY)])\r\n";
+    $request .= "REFERENCES DISPOSITION-NOTIFICATION-TO X-PRIORITY)])\r\n";
 
         if (!fputs($fp, $request)) {
@@ -1536 +1543 @@
                         $result[$id]->subject   = '';
                         $result[$id]->messageID = 'mid:' . $id;
+
                         /*
                                 Start parsing headers.  The problem is, some header "lines" take up multiple lines.
@@ -1562 +1570 @@
                                         however, unsure how well this would work with all imap clients.
                                 */
-                                if (preg_match("/^\s*UID [0-9]+\)$/",$line)) {
+                                if (preg_match("/^\s*UID [0-9]+\)$/", $line)) {
                                     break;
                 }
@@ -1589 +1597 @@
                                                 $result[$id]->timestamp = iil_StrToTime($string);
                                                 break;
-                    case 'received':
-                        if (!isset($result[$id]->date)) {
-                            $_received = substr(strstr(str_replace("\n",
-                                '', $string), '; '), 2);
-    
-                            $result[$id]->date      = str_replace("\n", '', $_received);
-                            $result[$id]->timestamp = iil_StrToTime($_received);
-                        }
-                        break;
                                         case 'from':
                                                 $result[$id]->from = $string;
@@ -1650 +1649 @@
                         } // end while ()
                     } else {
-                            $a=explode(' ', $line);
+                            $a = explode(' ', $line);
                     }
-                }
-        } while (strcmp($a[0], $key)!=0);
-                
+
+            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);
+                }
+        } while (strcmp($a[0], $key) != 0);
+
         /* 
                 FETCH uid, size, flags
@@ -1670 +1717 @@
                 //$a = explode(' ', $line);
                 //if (($line[0]=="*") && ($a[2]=="FETCH")) {
-                if ($line[0]=="*") {
+                if ($line[0] == '*') {
                         //echo "<!-- $line //-->\n";
                         //get outter most parens
@@ -1763 +1810 @@
 }
 
-
 function iil_C_FetchHeader(&$conn, $mailbox, $id, $uidfetch=false) {
         $fp = $conn->fp;
@@ -1818 +1864 @@
                 
                 // sort index
-                $i=0;
+                $i = 0;
                 if ($flag == 'ASC') {
                     asort($index);
@@ -1844 +1890 @@
                 do {
                         $line=chop(iil_ReadLine($fp, 100));
-                        if ($line[0]=="*") $c++;
+                        if ($line[0] == '*') {
+                $c++;
+            }
                 } while (!iil_StartsWith($line, 'exp1'));
                 
@@ -1940 +1988 @@
         $month  = (int) $month;
     $months = $GLOBALS['IMAP_MONTHS'];
-        /* $months=array(
-                        1=>"Jan", 2=>"Feb", 3=>"Mar", 4=>"Apr", 
-                        5=>"May", 6=>"Jun", 7=>"Jul", 8=>"Aug", 
-                        9=>"Sep", 10=>"Oct", 11=>"Nov", 12=>"Dec"
-                        );
-    */
         return $day . '-' . $months[$month] . '-' . $year;
 }