Merge branch 'FRAMEWORK_5_2' of ssh://dev.horde.org/horde/git/horde i…

…nto FRAMEWORK_5_2
horde · Feb 11, 2016 · e68c4ef · e68c4ef
2 parents bf18d65 + b36217d
commit e68c4ef
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 14 deletions.
diff --git a/ansel/package.xml b/ansel/package.xml
@@ -52,9 +52,7 @@
     <file name="ansel-garbage-collection" role="script">
      <tasks:replace from="/usr/bin/env php" to="php_bin" type="pear-config" />
     </file>
-    <file name="AnselPublish.scpt" role="script">
-     <tasks:replace from="/usr/bin/env php" to="php_bin" type="pear-config" />
-    </file>
+    <file name="AnselPublish.scpt" role="script"/>
    </dir> <!-- /bin -->
    <dir name="config">
     <file name=".htaccess" role="horde" />

diff --git a/bundles/groupware/package.xml b/bundles/groupware/package.xml
@@ -26,7 +26,9 @@
  <contents>
   <dir baseinstalldir="/" name="/">
    <dir name="bin">
-    <file name="groupware-install" role="script" />
+    <file name="groupware-install" role="script">
+     <tasks:replace from="/usr/bin/env php" to="php_bin" type="pear-config" />
+    </file>
    </dir> <!-- /bin -->
    <dir name="config">
     <dir name="prefs.d">

diff --git a/bundles/kolab_webmail/package.xml b/bundles/kolab_webmail/package.xml
@@ -27,7 +27,9 @@
  <contents>
   <dir baseinstalldir="/" name="/">
    <dir name="bin">
-    <file name="kolab-webmail-install" role="script" />
+    <file name="kolab-webmail-install" role="script">
+     <tasks:replace from="/usr/bin/env php" to="php_bin" type="pear-config" />
+    </file>
    </dir> <!-- /bin -->
    <dir name="config">
     <dir name="conf.d">

diff --git a/bundles/webmail/package.xml b/bundles/webmail/package.xml
@@ -26,7 +26,9 @@
  <contents>
   <dir baseinstalldir="/" name="/">
    <dir name="bin">
-    <file name="webmail-install" role="script" />
+    <file name="webmail-install" role="script">
+     <tasks:replace from="/usr/bin/env php" to="php_bin" type="pear-config" />
+    </file>
    </dir> <!-- /bin -->
    <dir name="config">
     <dir name="prefs.d">

diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
@@ -2,6 +2,8 @@
 v6.2.13-git
 -----------
 
+[jan] Fix finding reply or forward text from signed or encrypted messages with
+      HTML content.
 
 
 -------

diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
@@ -2983,6 +2983,12 @@ protected function _getMessageText($contents, array $options = array())
             $session->get('imp', 'rteavail') &&
             (($body_id = $contents->findBody('html')) !== null)) {
             $mime_message = $contents->getMIMEMessage();
+            if ($mime_message->getType() == 'multipart/encrypted' ||
+                $mime_message->getType() == 'multipart/signed') {
+                $mime_message = $mime_message->getPart(1);
+                $mime_message->buildMimeIds();
+                $body_id = $mime_message->findBody('html');
+            }
 
             switch ($mime_message->getPrimaryType()) {
             case 'multipart':

diff --git a/imp/package.xml b/imp/package.xml
@@ -33,7 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
-* 
+* [jan] Fix finding reply or forward text from signed or encrypted messages with HTML content.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -3912,7 +3912,7 @@
    <date>2016-02-02</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
-* 
+* [jan] Fix finding reply or forward text from signed or encrypted messages with HTML content.
    </notes>
   </release>
  </changelog>

diff --git a/whups/package.xml b/whups/package.xml
@@ -50,9 +50,7 @@
     <file name="whups-git-hook" role="script">
      <tasks:replace from="/usr/bin/env php" to="php_bin" type="pear-config" />
     </file>
-    <file name="whups-git-hook-conf.php.dist" role="script">
-     <tasks:replace from="/usr/bin/env php" to="php_bin" type="pear-config" />
-    </file>
+    <file name="whups-git-hook-conf.php.dist" role="script"/>
     <file name="whups-mail-filter" role="script">
      <tasks:replace from="/usr/bin/env php" to="php_bin" type="pear-config" />
     </file>
@@ -65,9 +63,7 @@
     <file name="whups-svn-hook" role="script">
      <tasks:replace from="/usr/bin/env php" to="php_bin" type="pear-config" />
     </file>
-    <file name="whups-svn-hook-conf.php.dist" role="script">
-     <tasks:replace from="/usr/bin/env php" to="php_bin" type="pear-config" />
-    </file>
+    <file name="whups-svn-hook-conf.php.dist" role="script"/>
    </dir> <!-- /bin -->
    <dir name="config">
     <file name=".htaccess" role="horde" />