Improve HTML input to avoid unexpected end tag "p" exception in some cases

Author: xaviqv

src/Traits/Attachments.php

@@ -12,7 +12,7 @@
 
 trait Attachments
 {
-	/**
+    /**
 	 * Generate attachment from any embbeded image within $html that exceeds any of the max dimensions (hardcoded 380 x 300 max)
 	 *
 	 * @Param $html string
@@ -21,19 +21,35 @@ trait Attachments
 	*/
 	protected function createAttachmentsFrom($html, $ticket, $comment = false, $count = 0)
 	{
-		
-		// Html field without embedded image <img> tags
+	    // Html field without embedded image <img> tags
 		if (!preg_match('/src="data:image\/(png|jpeg|gif);base64,/', $html)){
 			return [
 				'html' => $html,
 				'count' => 0
 			];
 		}
-		
-		$dom = new \DomDocument();
-		
+
+        $dom = new \DomDocument();
+
+        if (@!$dom->loadHtml( mb_convert_encoding('<div>' . $html . '</div>', 'HTML-ENTITIES', "UTF-8"), LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD)){
+            return [
+                'html' => $html,
+                'count' => 0
+            ];
+        }
+
+        $container = $dom->getElementsByTagName('div')->item(0);
+        $container = $container->parentNode->removeChild($container);
+        while ($dom->firstChild) {
+            $dom->removeChild($dom->firstChild);
+        }
+
+        while ($container->firstChild ) {
+            $dom->appendChild($container->firstChild);
+        }
+
 		// Exit when loadHtml doesn't process correctly
-        if (@!$dom->loadHtml( mb_convert_encoding($html, 'HTML-ENTITIES', "UTF-8"), LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD)){
+        if (!$dom){
 			\Log::info('ticket '.$ticket->id.' loadHtml error');
 			return [
 				'html' => $html,

src/Views/emails/partial/both_html_fields.blade.php

@@ -1,10 +1,10 @@
 <b>{{ trans('panichd::lang.description') }}</b>
 <table border="0" cellpadding="10" cellspacing="0" style="border: 1px solid #ddd; border-radius: 5px;"><tr>
-	<td>@include('panichd::emails.partial.html_field', ['html_field' => $ticket->html])</td>
+	<td>@include('panichd::emails.partial.html_field', ['html_field' => $ticket->html, 'ticket' => $ticket, 'field' => 'description'])</td>
 </tr></table><br /><br />
 @if ($ticket->intervention_html)
 	<b>{{ trans('panichd::lang.intervention') }}</b>
 	<table border="0" cellpadding="10" cellspacing="0" style="border: 1px solid #ddd; border-radius: 5px;"><tr>
-		<td>@include('panichd::emails.partial.html_field', ['html_field' => $ticket->intervention_html])</td>
+		<td>@include('panichd::emails.partial.html_field', ['html_field' => $ticket->intervention_html, 'ticket' => $ticket, 'field' => 'intervention'])</td>
 	</tr></table><br /><br />
 @endif

src/Views/emails/partial/html_field.blade.php

@@ -1,24 +1,40 @@
 <?php
-	$dom = new DomDocument();
-	$dom->loadHtml( mb_convert_encoding($html_field, 'HTML-ENTITIES', "UTF-8"), LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
-
-	$images = $dom->getElementsByTagName('img');	
-	
-	// foreach <img> in the email html
-	$i = 0;
-	foreach($images as $img){
-		$src = $img->getAttribute('src');
-		
-		// if the img source is 'data-url'
-		if(preg_match('/data:image\/png;base64,/', $src)){
-			
-			$src = str_replace('data:image/png;base64,', '', $src);			
-			$img->removeAttribute('src');
-			$img->setAttribute('src', $message->embedData(base64_decode($src), "embed".$i.".png"));
-					
-			$i++;
-		}
-	}
-	
-	echo $dom->saveHTML();	
+    $dom = new \DomDocument();
+
+    if ($dom->loadHtml( mb_convert_encoding('<div>' . $html_field . '</div>', 'HTML-ENTITIES', "UTF-8"), LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD)){
+
+        $container = $dom->getElementsByTagName('div')->item(0);
+        $container = $container->parentNode->removeChild($container);
+        while ($dom->firstChild) {
+            $dom->removeChild($dom->firstChild);
+        }
+
+        while ($container->firstChild ) {
+            $dom->appendChild($container->firstChild);
+        }
+
+        $images = $dom->getElementsByTagName('img');
+
+        // foreach <img> in the email html
+        $i = 0;
+        foreach($images as $img){
+            $src = $img->getAttribute('src');
+
+            // if the img source is 'data-url'
+            if(preg_match('/data:image\/png;base64,/', $src)){
+
+                $src = str_replace('data:image/png;base64,', '', $src);
+                $img->removeAttribute('src');
+                $img->setAttribute('src', $message->embedData(base64_decode($src), "embed".$i.".png"));
+
+                $i++;
+            }
+        }
+
+        echo $dom->saveHTML();
+
+    }else{
+        \Log::warning('HMTL could not be processed for ' . $field . ' field in ticket #' . $ticket->id);
+        echo $html_field;
+    }
 ?>