[mms] Fix saving attachments to sent-mail message in smartmobile view…

… (Bug #13257). Conflicts: imp/package.xml
horde · Jun 11, 2014 · ca11828 · ca11828
1 parent 18af89d
commit ca11828
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
@@ -2,6 +2,14 @@
 v6.2.0-git
 ----------
 
+
+
+------
+v6.2.0
+------
+
+[mms] Fix saving attachments to sent-mail message in smartmobile view (Bug
+      #13257).
 [mms] Remove the 'default_msg_charset' preference.
 [mms] Rewritten folder list code for dynamic view.
 [mms] Fix saving expanded state when expanding all mailboxes when all mailboxes

diff --git a/imp/lib/Ajax/Application/Handler/Common.php b/imp/lib/Ajax/Application/Handler/Common.php
@@ -538,19 +538,19 @@ public function sendMessage()
                 $headers,
                 $identity,
                 array(
-                    'signature' => $this->vars->signature,
                     'encrypt' => ($prefs->isLocked('default_encrypt') ? $prefs->getValue('default_encrypt') : $this->vars->encrypt),
                     'html' => $this->vars->html,
                     'pgp_attach_pubkey' => $this->vars->pgp_attach_pubkey,
                     'priority' => $this->vars->priority,
                     'readreceipt' => $this->vars->request_read_receipt,
-                    'save_attachments' => $this->vars->save_attachments_select,
                     'save_sent' => ($sm_displayed
                                     ? (bool)$this->vars->save_sent_mail
                                     : $identity->getValue('save_sent_mail')),
                     'sent_mail' => ($sm_displayed
                                       ? (isset($this->vars->save_sent_mail_mbox) ? IMP_Mailbox::formFrom($this->vars->save_sent_mail_mbox) : $identity->getValue(IMP_Mailbox::MBOX_SENT))
                                       : $identity->getValue(IMP_Mailbox::MBOX_SENT)),
+                    'signature' => $this->vars->signature,
+                    'strip_attachments' => (isset($this->vars->save_attachments_select) && !$this->vars->save_attachments_select),
                     'vcard_attach' => ($this->vars->vcard_attach ? $identity->getValue('fullname') : null)
                 )
             );

diff --git a/imp/lib/Basic/Compose.php b/imp/lib/Basic/Compose.php
@@ -532,14 +532,14 @@ protected function _init()
                         $header,
                         $identity,
                         array(
-                            'signature' => $this->vars->signature,
                             'encrypt' => $prefs->isLocked('default_encrypt') ? $prefs->getValue('default_encrypt') : $this->vars->encrypt_options,
                             'html' => $rtemode,
                             'pgp_attach_pubkey' => $this->vars->pgp_attach_pubkey,
                             'priority' => $priority,
                             'save_sent' => $save_sent_mail,
                             'sent_mail' => $sent_mail,
-                            'save_attachments' => $this->vars->save_attachments_select,
+                            'signature' => $this->vars->signature,
+                            'strip_attachments' => !$this->vars->save_attachments_select,
                             'readreceipt' => $request_read_receipt,
                             'vcard_attach' => $this->vars->vcard ? $identity->getValue('fullname') : null
                         )

diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
@@ -711,7 +711,7 @@ public function hasDrafts()
      *  - priority: (string) The message priority ('high', 'normal', 'low').
      *  - save_sent: (boolean) Save sent mail?
      *  - sent_mail: (IMP_Mailbox) The sent-mail mailbox (UTF-8).
-     *  - save_attachments: (bool) Save attachments with the message?
+     *  - strip_attachments: (bool) Strip attachments from the message?
      *  - signature: (string) The message signature.
      *  - readreceipt: (boolean) Add return receipt headers?
      *  - useragent: (string) The User-Agent string to use.
@@ -975,7 +975,7 @@ public function buildAndSendMessage(
             }
 
             /* Strip attachments if requested. */
-            if (empty($opts['save_attachments'])) {
+            if (!empty($opts['strip_attachments'])) {
                 $save_msg->buildMimeIds();
 
                 /* Don't strip any part if this is a text message with both

diff --git a/imp/package.xml b/imp/package.xml
@@ -3643,6 +3643,7 @@
    <date>2014-06-04</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [mms] Fix saving attachments to sent-mail message in smartmobile view (Bug #13257).
 * [mms] Remove the &apos;default_msg_charset&apos; preference.
 * [mms] Rewritten folder list code for dynamic view.
 * [mms] Fix saving expanded state when expanding all mailboxes when all mailboxes are already cached in the browser.