From c630449636aadc8f2d33d3d72d485f12f0bcd6d4 Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Thu, 14 Apr 2016 10:40:25 -0600
Subject: [PATCH] Remove contact_email from v_contacts table as this was
 replaced by the v_contact_emails table.

---
 app/contacts/app_config.php                   |  4 --
 app/contacts/contact_import.php               |  6 +--
 .../scripts/app/conference_center/index.lua   | 42 +++++++++----------
 3 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/app/contacts/app_config.php b/app/contacts/app_config.php
index 0d2323ec06..074d198837 100644
--- a/app/contacts/app_config.php
+++ b/app/contacts/app_config.php
@@ -285,10 +285,6 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the category.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "contact_email";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the email address.";
-		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "contact_url";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the website address.";
diff --git a/app/contacts/contact_import.php b/app/contacts/contact_import.php
index c7ffe35bf5..4567254552 100644
--- a/app/contacts/contact_import.php
+++ b/app/contacts/contact_import.php
@@ -91,7 +91,7 @@ else {
 							$contact_name_given = $data['FirstName'];
 							$contact_name_family = $data['LastName'];
 							$contact_organization = $data['Company'];
-							$contact_email = $data['EmailAddress'];
+							//$contact_email = $data['EmailAddress'];
 							$contact_note = $data['Notes'];
 							$contact_url = $data['Web Page'];
 
@@ -108,7 +108,6 @@ else {
 							//$sql .= "contact_nickname, ";
 							$sql .= "contact_title, ";
 							//$sql .= "contact_role, ";
-							$sql .= "contact_email, ";
 							$sql .= "contact_url, ";
 							//$sql .= "contact_time_zone, ";
 							$sql .= "contact_note ";
@@ -124,7 +123,6 @@ else {
 							//$sql .= "'$contact_nickname', ";
 							$sql .= "'$contact_title', ";
 							//$sql .= "'$contact_role', ";
-							$sql .= "'$contact_email', ";
 							$sql .= "'$contact_url', ";
 							//$sql .= "'$contact_time_zone', ";
 							$sql .= "'$contact_note' ";
@@ -340,7 +338,7 @@ else {
 			echo "<tr>\n";
 			echo "	<th>".$text['label-contact_name']."</th>\n";
 			echo "	<th>".$text['label-contact_organization']."</th>\n";
-			echo "	<th>".$text['label-contact_email']."</th>\n";
+			//echo "	<th>".$text['label-contact_email']."</th>\n";
 			echo "	<th>".$text['label-contact_url']."</th>\n";
 			echo "</tr>\n";
 			foreach($results as $row) {
diff --git a/resources/install/scripts/app/conference_center/index.lua b/resources/install/scripts/app/conference_center/index.lua
index 6f25bb5628..4f62a1d5e3 100644
--- a/resources/install/scripts/app/conference_center/index.lua
+++ b/resources/install/scripts/app/conference_center/index.lua
@@ -290,27 +290,27 @@
 							--end
 						end
 					--send the email addresses
-						sql = [[SELECT c.contact_email FROM v_users as u, v_meeting_users as m, v_contacts as c
-							WHERE m.domain_uuid = ']] .. domain_uuid ..[['
-							AND u.user_uuid = m.user_uuid
-							AND m.meeting_uuid = ']] .. meeting_uuid ..[['
-							and u.contact_uuid = c.contact_uuid]];
-						if (debug["sql"]) then
-							freeswitch.consoleLog("notice", "[conference center] <email> SQL: " .. sql .. "\n");
-						end
-						status = dbh:query(sql, function(row)
-							if (row["contact_email"] ~= nil) then
-								contact_email = string.lower(row["contact_email"]);
-								if (string.len(contact_email) > 3) then
-									freeswitch.consoleLog("notice", "[conference center] contact_email: " .. contact_email .. "\n");
-									if (record == "true") then
-										if (file_exists(conference_recording..".wav")) then
-											send_email(contact_email, "", default_language, default_dialect);
-										end
-									end
-								end
-							end
-						end);
+						--sql = [[SELECT c.contact_email FROM v_users as u, v_meeting_users as m, v_contacts as c
+						--	WHERE m.domain_uuid = ']] .. domain_uuid ..[['
+						--	AND u.user_uuid = m.user_uuid
+						--	AND m.meeting_uuid = ']] .. meeting_uuid ..[['
+						--	and u.contact_uuid = c.contact_uuid]];
+						--if (debug["sql"]) then
+						--	freeswitch.consoleLog("notice", "[conference center] <email> SQL: " .. sql .. "\n");
+						--end
+						--status = dbh:query(sql, function(row)
+						--	if (row["contact_email"] ~= nil) then
+						--		contact_email = string.lower(row["contact_email"]);
+						--		if (string.len(contact_email) > 3) then
+						--			freeswitch.consoleLog("notice", "[conference center] contact_email: " .. contact_email .. "\n");
+						--			if (record == "true") then
+						--				if (file_exists(conference_recording..".wav")) then
+						--					send_email(contact_email, "", default_language, default_dialect);
+						--				end
+						--			end
+						--		end
+						--	end
+						--end);
 				end
 			end