Changeset 90180ef in github

Timestamp:

Feb 11, 2008 7:03:43 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:

ddc34f9

Parents:

6f99263

Message:

• added bad_date_display.patch from #1484577

File:

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

program/lib/imap.inc

@@ -1521 +1521 @@
     $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 .= "REFERENCES RECEIVED DISPOSITION-NOTIFICATION-TO X-PRIORITY)])\r\n";
 
         if (!fputs($fp, $request)) {
@@ -1548 +1548 @@
                                 if (ord($line[0])<=32) {
                                     $lines[$i] .= (empty($lines[$i])?'':"\n").trim(chop($line));
-                                } else{
+                                } else {
                                         $i++;
                                         $lines[$i] = trim(chop($line));
@@ -1565 +1565 @@
                                     break;
                 }
-                        } while (trim($line[0]) != ')' && strncmp($line, $key, strlen($key)));  // 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))) { 
@@ -1572 +1573 @@
                         if (is_array($headers)) {
                                 reset($headers);
-                                while ( list($k, $bar) = each($headers) ) $headers[$k] = '';
+                                while (list($k, $bar) = each($headers)) {
+                        $headers[$k] = '';
+                    }
                         }
     
@@ -1586 +1589 @@
                                                 $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;