From 669e66f0f417997f70a3c0104a37bc9a2e7a4902 Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Sat, 29 Nov 2014 15:29:49 +0000 Subject: [PATCH] Fax Server: Included check typo, and pull contact email from contact_emails table. --- app/fax/fax_send.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php index fa95abbccd..b508963867 100644 --- a/app/fax/fax_send.php +++ b/app/fax/fax_send.php @@ -503,24 +503,24 @@ if (!$included) { $result = $prep_statement->fetch(PDO::FETCH_NAMED); $mailto_address_fax = $result["fax_email"]; - if (!included) { + if (!$included) { $sql = "select contact_uuid from v_users where user_uuid = '".$_SESSION['user_uuid']."'; "; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); $result = $prep_statement->fetch(PDO::FETCH_NAMED); - $sql = "select contact_email from v_contacts where contact_uuid = '".$result["contact_uuid"]."'; "; + $sql = "select email_address from v_contact_emails where contact_uuid = '".$result["contact_uuid"]."' order by email_primary desc;"; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); $result = $prep_statement->fetch(PDO::FETCH_NAMED); - $mailto_address_user = $result["contact_email"]; + $mailto_address_user = $result["email_address"]; } else { //use email-to-fax from address } if ($mailto_address_fax != '' && $mailto_address_user != $mailto_address_fax) { - $mailto_address = "'".$mailto_address_fax."\,".$mailto_address_user."'"; + $mailto_address = $mailto_address_fax.",".$mailto_address_user; } else { $mailto_address = $mailto_address_user;