dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove contact_email from v_contacts table as this was replaced by the v_contact_emails table.

This commit is contained in:
markjcrane 2016-04-14 10:40:25 -06:00
parent 43e15018f0
commit c630449636
3 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/contacts/app_config.php
View File

@ -285,10 +285,6 @@
$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the category."; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the category.";
$z++; $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]['name'] = "contact_url";
$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the website address."; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the website address.";

6
app/contacts/contact_import.php
View File

@ -91,7 +91,7 @@ else {
$contact_name_given = $data['FirstName']; $contact_name_given = $data['FirstName'];
$contact_name_family = $data['LastName']; $contact_name_family = $data['LastName'];
$contact_organization = $data['Company']; $contact_organization = $data['Company'];
$contact_email = $data['EmailAddress']; //$contact_email = $data['EmailAddress'];
$contact_note = $data['Notes']; $contact_note = $data['Notes'];
$contact_url = $data['Web Page']; $contact_url = $data['Web Page'];
@ -108,7 +108,6 @@ else {
//$sql .= "contact_nickname, "; //$sql .= "contact_nickname, ";
$sql .= "contact_title, "; $sql .= "contact_title, ";
//$sql .= "contact_role, "; //$sql .= "contact_role, ";
$sql .= "contact_email, ";
$sql .= "contact_url, "; $sql .= "contact_url, ";
//$sql .= "contact_time_zone, "; //$sql .= "contact_time_zone, ";
$sql .= "contact_note "; $sql .= "contact_note ";
@ -124,7 +123,6 @@ else {
//$sql .= "'$contact_nickname', "; //$sql .= "'$contact_nickname', ";
$sql .= "'$contact_title', "; $sql .= "'$contact_title', ";
//$sql .= "'$contact_role', "; //$sql .= "'$contact_role', ";
$sql .= "'$contact_email', ";
$sql .= "'$contact_url', "; $sql .= "'$contact_url', ";
//$sql .= "'$contact_time_zone', "; //$sql .= "'$contact_time_zone', ";
$sql .= "'$contact_note' "; $sql .= "'$contact_note' ";
@ -340,7 +338,7 @@ else {
echo "<tr>\n"; echo "<tr>\n";
echo " <th>".$text['label-contact_name']."</th>\n"; echo " <th>".$text['label-contact_name']."</th>\n";
echo " <th>".$text['label-contact_organization']."</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 " <th>".$text['label-contact_url']."</th>\n";
echo "</tr>\n"; echo "</tr>\n";
foreach($results as $row) { foreach($results as $row) {

42
resources/install/scripts/app/conference_center/index.lua
View File

@ -290,27 +290,27 @@
--end --end
end end
--send the email addresses --send the email addresses
sql = [[SELECT c.contact_email FROM v_users as u, v_meeting_users as m, v_contacts as c --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 ..[[' -- WHERE m.domain_uuid = ']] .. domain_uuid ..[['
AND u.user_uuid = m.user_uuid -- AND u.user_uuid = m.user_uuid
AND m.meeting_uuid = ']] .. meeting_uuid ..[[' -- AND m.meeting_uuid = ']] .. meeting_uuid ..[['
and u.contact_uuid = c.contact_uuid]]; -- and u.contact_uuid = c.contact_uuid]];
if (debug["sql"]) then --if (debug["sql"]) then
freeswitch.consoleLog("notice", "[conference center] <email> SQL: " .. sql .. "\n"); -- freeswitch.consoleLog("notice", "[conference center] <email> SQL: " .. sql .. "\n");
end --end
status = dbh:query(sql, function(row) --status = dbh:query(sql, function(row)
if (row["contact_email"] ~= nil) then -- if (row["contact_email"] ~= nil) then
contact_email = string.lower(row["contact_email"]); -- contact_email = string.lower(row["contact_email"]);
if (string.len(contact_email) > 3) then -- if (string.len(contact_email) > 3) then
freeswitch.consoleLog("notice", "[conference center] contact_email: " .. contact_email .. "\n"); -- freeswitch.consoleLog("notice", "[conference center] contact_email: " .. contact_email .. "\n");
if (record == "true") then -- if (record == "true") then
if (file_exists(conference_recording..".wav")) then -- if (file_exists(conference_recording..".wav")) then
send_email(contact_email, "", default_language, default_dialect); -- send_email(contact_email, "", default_language, default_dialect);
end -- end
end -- end
end -- end
end -- end
end); --end);
end end
end end