From 5c25055ed1fab7620495dec5ef2021374fa8b1e1 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Sat, 20 Apr 2019 13:25:15 -0600
Subject: [PATCH] Update email_log_view.php

---
 app/email_logs/email_log_view.php | 39 +++++++++++++++----------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/app/email_logs/email_log_view.php b/app/email_logs/email_log_view.php
index 2575107960..4c2a09a56f 100644
--- a/app/email_logs/email_log_view.php
+++ b/app/email_logs/email_log_view.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Copyright (C) 2008-2015
+	Copyright (C) 2008-2019
 	All Rights Reserved.
 
 	Contributor(s):
@@ -47,23 +47,22 @@
 
 	$msg_found = false;
 
-	if ($email_log_uuid != '') {
+	if (is_uuid($email_log_uuid)) {
 		$sql = "select * from v_email_logs ";
-		$sql .= "where email_uuid = '".$email_log_uuid."' ";
+		$sql .= "where email_log_uuid = '".$email_log_uuid."' ";
 		$sql .= "and domain_uuid = '".$domain_uuid."' ";
 		$prep_statement = $db->prepare(check_sql($sql));
 		$prep_statement->execute();
-		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+		$email_logs = $prep_statement->fetchAll(PDO::FETCH_NAMED);
 		unset ($prep_statement, $sql);
 
-		if (is_array($result)) {
-			foreach($result as $row) {
+		if (is_array($email_logs)) {
+			foreach($email_logs as $row) {
 				$sent = $row['sent_date'];
 				$type = $row['type'];
 				$status = $row['status'];
 				$email = $row['email'];
 				$msg_found = true;
-				break;
 			}
 		}
 	}
@@ -136,16 +135,16 @@
 //show content
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "	<tr>";
-	echo "		<td valign='top' align='left' nowrap>";
+	echo "		<td valign='top' align='left' nowrap='nowrap'>";
 	echo "			<b>".$text['header-view_email']."</b>\n";
 	echo "		</td>";
-	echo "		<td valign='top' align='right' nowrap>";
-	echo "			<input type='button' class='btn' alt='".$text['button-back']."' onclick=\"document.location.href='emails.php';\" value='".$text['button-back']."'>";
+	echo "		<td valign='top' align='right' nowrap='nowrap'>";
+	echo "			<input type='button' class='btn' alt='".$text['button-back']."' onclick=\"document.location.href='email_logs.php';\" value='".$text['button-back']."'>";
 	if (permission_exists('email_download')) {
-		echo "		<input type='button' class='btn' alt='".$text['button-download']."' onclick=\"document.location.href='emails.php?id=".$email_log_uuid."&a=download';\" value='".$text['button-download']."'>";
+		echo "		<input type='button' class='btn' alt='".$text['button-download']."' onclick=\"document.location.href='email_logs.php?id=".$email_log_uuid."&a=download';\" value='".$text['button-download']."'>";
 	}
 	if (permission_exists('email_resend')) {
-		echo "		<input type='button' class='btn' alt='".$text['button-resend']."' onclick=\"document.location.href='emails.php?id=".$email_log_uuid."&a=resend';\" value='".$text['button-resend']."'>";
+		echo "		<input type='button' class='btn' alt='".$text['button-resend']."' onclick=\"document.location.href='email_logs.php?id=".$email_log_uuid."&a=resend';\" value='".$text['button-resend']."'>";
 	}
 	echo "		</td>";
 	echo "	</tr>";
@@ -155,37 +154,37 @@
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<tr>\n";
-	echo "<td width='30%' class='vncell' valign='top' align='left' nowrap>".$text['label-sent']."</td>\n";
+	echo "<td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>".$text['label-sent']."</td>\n";
 	echo "<td width='70%' class='vtable' align='left'>".$sent."</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap>".$text['label-type']."</td>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>".$text['label-type']."</td>\n";
 	echo "<td class='vtable' align='left'>".$text['label-type_'.$type]."</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap>".$text['label-status']."</td>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>".$text['label-status']."</td>\n";
 	echo "<td class='vtable' align='left'>".$text['label-status_'.$status]."</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap>".$text['label-from']."</td>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>".$text['label-from']."</td>\n";
 	echo "<td class='vtable' align='left'>".$from."</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap>".$text['label-to']."</td>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>".$text['label-to']."</td>\n";
 	echo "<td class='vtable' align='left'>".$to."</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap>".$text['label-subject']."</td>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>".$text['label-subject']."</td>\n";
 	echo "<td class='vtable' align='left'>".$subject."</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap>".$text['label-message']."</td>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>".$text['label-message']."</td>\n";
 	echo "<td class='vtable' align='left'>";
 	echo "	<iframe id='msg_display' width='100%' height='250' scrolling='auto' cellspacing='0' style='border: 1px solid #c5d1e5; overflow: scroll;'></iframe>\n";
 	echo "	<textarea id='msg' width='1' height='1' style='width: 1px; height: 1px; display: none;'>".$body."</textarea>\n";
@@ -198,7 +197,7 @@
 	echo "</tr>\n";
 
 	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap>".$text['label-attachment']."</td>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>".$text['label-attachment']."</td>\n";
 	echo "<td class='vtable' align='left'>".$file_name." (".round($file_size/1024,2)." KB)</td>\n";
 	echo "</tr>\n";