Changeset 90a6aff in github

Timestamp:

Sep 27, 2011 2:59:59 AM (20 months ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

0c1cb2f

Parents:

00d4242

Message:

• Fix bug where when replying always the last identity is used (#1488101)

Location:

program

Files:

• js/common.js (modified) (1 diff)
• steps/mail/compose.inc (modified) (6 diffs)

program/js/common.js

@@ -618 +618 @@
   }
   else {
-    begin += 2;  
-  }
-
-  var end = document.cookie.indexOf(";", begin);
+    begin += 2;
+  }
+
+  var end = dc.indexOf(";", begin);
   if (end == -1)
     end = dc.length;

program/steps/mail/compose.inc

@@ -47 +47 @@
     'mailbox' => $IMAP->get_mailbox_name(),
   );
-  
+
   // process values like "mailto:foo@bar.com?subject=new+message&cc=another"
   if ($_SESSION['compose']['param']['to']) {
@@ -60 +60 @@
     }
   }
-  
+
   // select folder where to save the sent message
   $_SESSION['compose']['param']['sent_mbox'] = $RCMAIL->config->get('sent_mbox');
-  
+
   // pipe compose parameters thru plugins
   $plugin = $RCMAIL->plugins->exec_hook('message_compose', $_SESSION['compose']);
@@ -85 +85 @@
         );
       }
-      
+
       // save attachment if valid
       if (($attachment['data'] && $attachment['name']) || ($attachment['path'] && file_exists($attachment['path']))) {
         $attachment = rcmail::get_instance()->plugins->exec_hook('attachment_save', $attachment);
       }
-      
+
       if ($attachment['status'] && !$attachment['abort']) {
         unset($attachment['data'], $attachment['status'], $attachment['abort']);
@@ -243 +243 @@
 }
 else if (count($MESSAGE->identities)) {
+  $a_recipients = array();
+  $a_names      = array();
+
   // extract all recipients of the reply-message
-  $a_recipients = array();
   if (is_object($MESSAGE->headers) && in_array($compose_mode, array(RCUBE_COMPOSE_REPLY, RCUBE_COMPOSE_FORWARD)))
   {
     $a_to = $IMAP->decode_address_list($MESSAGE->headers->to);
     foreach ($a_to as $addr) {
-      if (!empty($addr['mailto']))
+      if (!empty($addr['mailto'])) {
         $a_recipients[] = strtolower($addr['mailto']);
+        $a_names[]      = $addr['name'];
+      }
     }
 
@@ -256 +260 @@
       $a_cc = $IMAP->decode_address_list($MESSAGE->headers->cc);
       foreach ($a_cc as $addr) {
-        if (!empty($addr['mailto']))
+        if (!empty($addr['mailto'])) {
           $a_recipients[] = strtolower($addr['mailto']);
+          $a_names[]      = $addr['name'];
+        }
       }
     }
@@ -286 +292 @@
     }
     // use replied message recipients
-    else if (in_array($ident['email_ascii'], $a_recipients)) {
-      $from_idx = $idx;
+    else if (($found = array_search($ident['email_ascii'], $a_recipients)) !== false) {
+      // match identity name, prefer default identity
+      if ($from_idx === null || ($a_names[$found] && $ident['name'] && $a_names[$found] == $ident['name'])) {
+        $from_idx = $idx;
+      }
     }
   }