[mms] Send linked attachment download notification message in languag…

…e of the sending user (Bug #12783).
horde · Oct 23, 2013 · 3880c56 · 3880c56
1 parent ff08362
commit 3880c56
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
@@ -4,6 +4,8 @@ v6.1.5-git
 
 [mms] SECURITY: Fix XSS in message and search screens resulting from a
       user-defined flag label (João Machado <geral@jpaulo.eu>).
+[mms] Send linked attachment download notification message in language of the
+      sending user (Bug #12783).
 [mms] Fix populating search fields when editing an advanced search query.
 [mms] Trigger auto save draft in dynamic view if attachments have changed.
 [mms] Improved UI for dropping attachments on dynamic compose screen.

diff --git a/imp/lib/Compose/LinkedAttachment.php b/imp/lib/Compose/LinkedAttachment.php
@@ -177,7 +177,7 @@ public function convert($ts, $file)
      */
     public function sendNotification()
     {
-        global $conf, $injector;
+        global $conf, $injector, $registry;
 
         if (empty($conf['compose']['link_attachments_notify'])) {
             return;
@@ -194,6 +194,13 @@ public function sendNotification()
 
             $address_full = $identity->getDefaultFromAddress(true);
 
+            /* Load user prefs to correctly translate gettext strings. */
+            if (!$registry->getAuth()) {
+                $registry->setAuth($this->_user, array(), array(
+                    'app' => 'imp'
+                ));
+            }
+
             $h = new Horde_Mime_Headers();
             $h->addReceivedHeader(array(
                 'dns' => $injector->getInstance('Net_DNS2_Resolver'),

diff --git a/imp/package.xml b/imp/package.xml
@@ -34,6 +34,7 @@
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
 * [mms] SECURITY: Fix XSS in message and search screens resulting from a user-defined flag label (João Machado &lt;geral@jpaulo.eu&gt;).
+* [mms] Send linked attachment download notification message in language of the sending user (Bug #12783).
 * [mms] Fix populating search fields when editing an advanced search query.
 * [mms] Trigger auto save draft in dynamic view if attachments have changed.
 * [mms] Improved UI for dropping attachments on dynamic compose screen.
@@ -3297,6 +3298,7 @@
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
 * [mms] SECURITY: Fix XSS in message and search screens resulting from a user-defined flag label (João Machado &lt;geral@jpaulo.eu&gt;).
+* [mms] Send linked attachment download notification message in language of the sending user (Bug #12783).
 * [mms] Fix populating search fields when editing an advanced search query.
 * [mms] Trigger auto save draft in dynamic view if attachments have changed.
 * [mms] Improved UI for dropping attachments on dynamic compose screen.