Changeset c9ca6ad in github

Timestamp:

Oct 24, 2008 8:01:45 PM (5 years ago)

Author:

svncommit <devs@…>

Branches:

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

Children:

072fdef

Parents:

1971ddc

Message:

added obscure ASCII encoding aliases, added more error checking to RFC2822 date parsing

Files:

• index.php (modified) (2 diffs)
• program/include/main.inc (modified) (4 diffs)
• program/include/rcube_imap.php (modified) (1 diff)
• program/include/rcube_message.php (modified) (1 diff)
• program/lib/Mail/mime.php (modified) (1 diff)
• program/steps/mail/show.inc (modified) (2 diffs)

index.php

@@ -50 +50 @@
 }
 
-
 // check if config files had errors
 if ($err_str = $RCMAIL->config->get_error()) {
@@ -66 +65 @@
     'message' => $err_str), FALSE, TRUE);
 }
-
 
 // error steps

program/include/main.inc

@@ -189 +189 @@
     
   $aliases = array(
-    'US-ASCII'       => 'ISO-8859-1',
-    'UNKNOWN-8BIT'   => 'ISO-8859-15',
-    'X-UNKNOWN'      => 'ISO-8859-15',
-    'X-USER-DEFINED' => 'ISO-8859-15',
-    'ISO-8859-8-I'   => 'ISO-8859-8',
-    'KS_C_5601-1987' => 'EUC-KR',
+    'US-ASCII'         => 'ISO-8859-1',
+    'ANSI_X3.110-1983' => 'ISO-8859-1',
+    'ANSI_X3.4-1968'   => 'ISO-8859-1',
+    'UNKNOWN-8BIT'     => 'ISO-8859-15',
+    'X-UNKNOWN'        => 'ISO-8859-15',
+    'X-USER-DEFINED'   => 'ISO-8859-15',
+    'ISO-8859-8-I'     => 'ISO-8859-8',
+    'KS_C_5601-1987'   => 'EUC-KR',
   );
 
@@ -685 +687 @@
   else if (!empty($date))
     {
-    while (($ts = @strtotime($date))===false)
+    // if date parsing fails, we have a date in non-rfc format.
+    // remove token from the end and try again
+    while ((($ts = @strtotime($date))===false) || ($ts < 0))
       {
-        // if we have a date in non-rfc format
-        // remove token from the end and try again
         $d = explode(' ', $date);
         array_pop($d);
@@ -826 +828 @@
                  date("d-M-Y H:i:s O", mktime()),
                  $line);
-                 
+
   if ($CONFIG['log_driver'] == 'syslog') {
     if ($name == 'errors')
@@ -837 +839 @@
     if (empty($CONFIG['log_dir']))
       $CONFIG['log_dir'] = INSTALL_PATH.'logs';
-      
+
     // try to open specific log file for writing
     if ($fp = @fopen($CONFIG['log_dir'].'/'.$name, 'a')) {
       fwrite($fp, $log_entry);
+      fflush($fp);
       fclose($fp);
     }

program/include/rcube_imap.php

@@ -1026 +1026 @@
 
     // return cached message structure
-    if (is_object($headers) && is_object($headers->structure))
+    if (is_object($headers) && is_object($headers->structure)) {
       return $headers->structure;
-    
+    }
+
     // resolve message sequence number
-    if (!($msg_id = $this->_uid2id($uid)))
+    if (!($msg_id = $this->_uid2id($uid))) {
       return FALSE;
-
-    $structure_str = iil_C_FetchStructureString($this->conn, $this->mailbox, $msg_id); 
+    }
+
+    $structure_str = iil_C_FetchStructureString($this->conn, $this->mailbox, $msg_id);
     $structure = iml_GetRawStructureArray($structure_str);
     $struct = false;

program/include/rcube_message.php

@@ -64 +64 @@
       'get_url' => rcmail_url('get', array('_mbox' => $this->imap->get_mailbox_name(), '_uid' => $uid))
     );
-    
+
     if ($this->structure = $this->imap->get_structure($uid)) {
       $this->get_mime_numbers($this->structure);

program/lib/Mail/mime.php

@@ -1069 +1069 @@
                     $hdr_value = $quotePrefix . $hdr_value . $quoteSuffix;
                     
-
                     $hdr_value_out = $hdr_value;
                     $realMax = $maxLength1stLine + strlen($prefix . $suffix);

program/steps/mail/show.inc

@@ -25 +25 @@
 if ($_GET['_uid']) {
   $MESSAGE = new rcube_message(get_input_value('_uid', RCUBE_INPUT_GET));
-  
+
   // set message charset as default
   if (!empty($MESSAGE->headers->charset))
@@ -218 +218 @@
   $OUTPUT->send('printmessage');
 else if ($RCMAIL->action=='preview' && $OUTPUT->template_exists('messagepreview'))
-    $OUTPUT->send('messagepreview');
+  $OUTPUT->send('messagepreview');
 else
   $OUTPUT->send('message');