From 382d7001e1217cf98167baeb5e44b0dc4e3d0294 Mon Sep 17 00:00:00 2001
From: Cipa <stefan@blackcatadvertising.com>
Date: Fri, 8 Dec 2017 07:17:07 -0800
Subject: [PATCH] email body detection improvments

---
 .devilbox/www/htdocs/mail.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.devilbox/www/htdocs/mail.php b/.devilbox/www/htdocs/mail.php
index 4b8dfccb..412b62d3 100644
--- a/.devilbox/www/htdocs/mail.php
+++ b/.devilbox/www/htdocs/mail.php
@@ -174,13 +174,17 @@ $messages = $MyMbox->get($sortOrderArr);
 								<tr id="mail-<?php echo $data['num'];?>" style="display:none">
 									<td></td>
 									<td colspan="4">
-										<?php
-										if (isset($structure->parts)) {
-											echo $structure->parts[0]->body;
-										}else{
-											echo $structure->body;
-										}
-										?>
+										<?php if (isset($structure->body)): ?>
+											<?php echo $structure->body ?>
+										<?php elseif(isset($structure->parts[1]->body)): ?>
+											<?php echo $structure->parts[1]->body ?>
+										<?php elseif(isset($structure->parts[0]->body)): ?>
+											<?php echo htmlentities($structure->parts[0]->body) ?>
+										<?php else: ?>
+											<?php echo '<div class="alert alert-warning" role="alert">
+												No valid body found
+											</div>' ?>
+										<?php endif; ?>
 										<hr>
 										<p><a class="btn btn-primary" data-toggle="collapse" href="#email-<?php echo $data['num'];?>" aria-expanded="false" aria-controls="email-<?php echo $data['num'];?>">Raw source</a></p>
 										<div class="collapse" id="email-<?php echo $data['num'];?>"><pre><?php echo $message;?></pre></div>