Bug: 14500 Ensure we only use the body of the html part.

horde · Nov 5, 2016 · c10fcc9 · c10fcc9
1 parent 13b8ff2
commit c10fcc9
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/framework/Core/lib/Horde/Core/ActiveSync/Mail.php b/framework/Core/lib/Horde/Core/ActiveSync/Mail.php
@@ -624,6 +624,19 @@ protected function _msgBody(array $body_data, Horde_Mime_Part $part, $html, $flo
                 $flowed = new Horde_Text_Flowed($msg, 'UTF-8');
                 $msg = $flowed->toFlowed(true);
             }
+        } else {
+            // This filter requires the tidy extenstion.
+            if (Horde_Util::extensionExists('tidy')) {
+                return Horde_Text_Filter::filter(
+                    $msg,
+                    'Cleanhtml',
+                    array('body_only' => true)
+                );
+            } else {
+                // If no tidy, use Horde_Dom.
+                $dom = new Horde_Domhtml($msg, 'UTF-8');
+                return $dom->returnBody();
+            }
         }
 
         return $msg;