nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename the fields in call_block to conform with the database naming convention and to match the table name.

Browse Source
This commit is contained in:
Mark Crane
2013-09-27 10:21:43 +00:00
parent ba5c2b6a6d
commit fdb9589245
5 changed files with 70 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/call_block/app_config.php
View File

@@ -79,19 +79,23 @@
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'blocked_caller_name';
$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'call_block_name';
$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'blocked_caller_name';
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the name.';
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'blocked_caller_number';
$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'call_block_number';
$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'blocked_caller_number';
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the full phone number.';
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'blocked_call_count';
$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'call_block_count';
$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'blocked_call_count';
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric';
$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Number of calls.';
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'blocked_call_action';
$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'call_block_action';
$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'blocked_call_action';
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Action for call.';
$z++;
@@ -99,7 +103,8 @@
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Date/Time number was added.';
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'block_call_enabled';
$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'call_block_enabled';
$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'block_call_enabled';
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enable/disable blocking the call.';
$z++;

20
app/call_block/call_block.php
View File

@@ -110,12 +110,12 @@ else {
echo "<div align='center'>\n";
echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<tr>\n";
echo th_order_by('blocked_caller_number', $text['label-number'], $order_by, $order);
echo th_order_by('blocked_caller_name', $text['label-name'], $order_by, $order);
echo th_order_by('blocked_call_count', $text['label-count'], $order_by, $order);
echo th_order_by('call_block_number', $text['label-number'], $order_by, $order);
echo th_order_by('call_block_name', $text['label-name'], $order_by, $order);
echo th_order_by('call_block_count', $text['label-count'], $order_by, $order);
echo th_order_by('date_added', $text['label-date-added'], $order_by, $order);
echo th_order_by('blocked_call_action', $text['label-action'], $order_by, $order);
echo th_order_by('block_call_enabled', $text['label-enabled'], $order_by, $order);
echo th_order_by('call_block_action', $text['label-action'], $order_by, $order);
echo th_order_by('call_block_enabled', $text['label-enabled'], $order_by, $order);
echo "<td align='right' width='42'>\n";
if (permission_exists('call_block_add')) {
echo " <a href='call_block_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
@@ -126,17 +126,17 @@ else {
if ($result_count > 0) {
foreach($result as $row) {
echo "<tr >\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['blocked_caller_number']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['blocked_caller_name']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['blocked_call_count']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['call_block_number']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['call_block_name']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['call_block_count']."&nbsp;</td>\n";
if (defined('TIME_24HR') && TIME_24HR == 1) {
$tmp_date_added = date("j M Y H:i:s", $row['date_added']);
} else {
$tmp_date_added = date("j M Y h:i:sa", $row['date_added']);
}
echo " <td valign='top' class='".$row_style[$c]."'>".$tmp_date_added."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['blocked_call_action']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['block_call_enabled']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['call_block_action']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['call_block_enabled']."&nbsp;</td>\n";
echo " <td valign='top' align='right'>\n";
if (permission_exists('call_block_edit')) {
echo " <a href='call_block_edit.php?id=".$row['call_block_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>\n";

22
app/call_block/call_block_cdr_add.php
View File

@@ -57,31 +57,31 @@ else {
$result = $prep_statement->fetch();
unset ($prep_statement);
$blocked_caller_name = $result["caller_id_name"];
$blocked_caller_number = $result["caller_id_number"];
$block_call_enabled = "true";
$call_block_name = $result["caller_id_name"];
$call_block_number = $result["caller_id_number"];
$call_block_enabled = "true";
$block_call_action = "Reject";
$sql = "insert into v_call_block ";
$sql .= "(";
$sql .= "domain_uuid, ";
$sql .= "call_block_uuid, ";
$sql .= "blocked_caller_name, ";
$sql .= "blocked_caller_number, ";
$sql .= "blocked_call_count, ";
$sql .= "blocked_call_action, ";
$sql .= "block_call_enabled, ";
$sql .= "call_block_name, ";
$sql .= "call_block_number, ";
$sql .= "call_block_count, ";
$sql .= "call_block_action, ";
$sql .= "call_block_enabled, ";
$sql .= "date_added ";
$sql .= ") ";
$sql .= "values ";
$sql .= "(";
$sql .= "'".$_SESSION['domain_uuid']."', ";
$sql .= "'".uuid()."', ";
$sql .= "'$blocked_caller_name', ";
$sql .= "'$blocked_caller_number', ";
$sql .= "'$call_block_name', ";
$sql .= "'$call_block_number', ";
$sql .= "0, ";
$sql .= "'$block_call_action', ";
$sql .= "'$block_call_enabled', ";
$sql .= "'$call_block_enabled', ";
$sql .= "'".time()."' ";
$sql .= ")";
$db->exec(check_sql($sql));

64
app/call_block/call_block_edit.php
View File

@@ -79,10 +79,10 @@ else {
//get http post variables and set them to php variables
if (count($_POST)>0) {
$blocked_caller_name = check_str($_POST["blocked_caller_name"]);
$blocked_caller_number = check_str($_POST["blocked_caller_number"]);
$blocked_call_action = check_str($_POST["blocked_call_action"]);
$block_call_enabled = check_str($_POST["block_call_enabled"]);
$call_block_name = check_str($_POST["call_block_name"]);
$call_block_number = check_str($_POST["call_block_number"]);
$call_block_action = check_str($_POST["call_block_action"]);
$call_block_enabled = check_str($_POST["call_block_enabled"]);
}
if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
@@ -93,11 +93,11 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
}
//check for all required data
if (strlen($blocked_caller_name) == 0) { $msg .= $text['label-provide-name']."<br>\n"; }
if (strlen($call_block_name) == 0) { $msg .= $text['label-provide-name']."<br>\n"; }
if ($action == "add") {
if (strlen($blocked_caller_number) == 0) { $msg .= $text['label-provide-number']."<br>\n"; }
if (strlen($call_block_number) == 0) { $msg .= $text['label-provide-number']."<br>\n"; }
}
if (strlen($block_call_enabled) == 0) { $msg .= $text['label-provide-enabled']."<br>\n"; }
if (strlen($call_block_enabled) == 0) { $msg .= $text['label-provide-enabled']."<br>\n"; }
if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
require_once "resources/header.php";
require_once "resources/persist_form_var.php";
@@ -118,22 +118,22 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "(";
$sql .= "domain_uuid, ";
$sql .= "call_block_uuid, ";
$sql .= "blocked_caller_name, ";
$sql .= "blocked_caller_number, ";
$sql .= "blocked_call_count, ";
$sql .= "blocked_call_action, ";
$sql .= "block_call_enabled, ";
$sql .= "call_block_name, ";
$sql .= "call_block_number, ";
$sql .= "call_block_count, ";
$sql .= "call_block_action, ";
$sql .= "call_block_enabled, ";
$sql .= "date_added ";
$sql .= ") ";
$sql .= "values ";
$sql .= "(";
$sql .= "'".$_SESSION['domain_uuid']."', ";
$sql .= "'".uuid()."', ";
$sql .= "'$blocked_caller_name', ";
$sql .= "'$blocked_caller_number', ";
$sql .= "'$call_block_name', ";
$sql .= "'$call_block_number', ";
$sql .= "0, ";
$sql .= "'$blocked_call_action', ";
$sql .= "'$block_call_enabled', ";
$sql .= "'$call_block_action', ";
$sql .= "'$call_block_enabled', ";
$sql .= "'".time()."' ";
$sql .= ")";
$db->exec(check_sql($sql));
@@ -150,10 +150,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
if ($action == "update") {
$sql = "update v_call_block set ";
$sql .= "blocked_caller_name = '$blocked_caller_name', ";
//$sql .= "blocked_caller_number = '$blocked_caller_number', ";
$sql .= "blocked_call_action = '$blocked_call_action', ";
$sql .= "block_call_enabled = '$block_call_enabled' ";
$sql .= "call_block_name = '$call_block_name', ";
//$sql .= "call_block_number = '$call_block_number', ";
$sql .= "call_block_action = '$call_block_action', ";
$sql .= "call_block_enabled = '$call_block_enabled' ";
$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= "and call_block_uuid = '$call_block_uuid'";
$db->exec(check_sql($sql));
@@ -180,11 +180,11 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$prep_statement->execute();
$result = $prep_statement->fetchAll();
foreach ($result as &$row) {
$blocked_caller_name = $row["blocked_caller_name"];
$blocked_caller_number = $row["blocked_caller_number"];
$blocked_call_action = $row["blocked_call_action"];
$call_block_name = $row["call_block_name"];
$call_block_number = $row["call_block_number"];
$call_block_action = $row["call_block_action"];
$blocked_call_destination = $row["blocked_call_destination"];
$block_call_enabled = $row["block_call_enabled"];
$call_block_enabled = $row["call_block_enabled"];
break; //limit to 1 row
}
unset ($prep_statement, $sql);
@@ -288,12 +288,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
if ($action == "add") {
echo " <input class='formfld' type='text' name='blocked_caller_number' maxlength='255' value=\"$blocked_caller_number\">\n";
echo " <input class='formfld' type='text' name='call_block_number' maxlength='255' value=\"$call_block_number\">\n";
echo "<br />\n";
echo $text['label-exact-number']."\n";
}
else {
echo $blocked_caller_number;
echo $call_block_number;
}
echo "<br />\n";
echo "</td>\n";
@@ -304,7 +304,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo " Name:\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo " <input class='formfld' type='text' name='blocked_caller_name' maxlength='255' value=\"$blocked_caller_name\">\n";
echo " <input class='formfld' type='text' name='call_block_name' maxlength='255' value=\"$call_block_name\">\n";
echo "<br />\n";
echo "Enter the name.\n";
echo "</td>\n";
@@ -315,9 +315,9 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo " Action:\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo " <select class='formfld' name='blocked_call_action'>\n";
echo " <select class='formfld' name='call_block_action'>\n";
echo " <option value=''></option>\n";
$pieces = explode(" ", $blocked_call_action);
$pieces = explode(" ", $call_block_action);
$action = $pieces[0];
$extension = $pieces[2];
if ($action == "Reject") {
@@ -343,15 +343,15 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo " Enabled:\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo " <select class='formfld' name='block_call_enabled'>\n";
echo " <select class='formfld' name='call_block_enabled'>\n";
echo " <option value=''></option>\n";
if ($block_call_enabled == "true") {
if ($call_block_enabled == "true") {
echo " <option value='true' SELECTED >true</option>\n";
}
else {
echo " <option value='true'>true</option>\n";
}
if ($block_call_enabled == "false") {
if ($call_block_enabled == "false") {
echo " <option value='false' SELECTED >".$text['label-true']."</option>\n";
}
else {

13
resources/install/scripts/app/call_block/index.lua
View File

@@ -36,6 +36,7 @@ This method causes the script to get its manadatory arguments directly from the
4 May, 2012: added per_tenant capability (domain based)
12 Jun, 2013: update the database connection, change table name from v_callblock to v_call_block
14 Jun, 2013: Change Voicemail option to use Transfer, avoids mod_voicemail dependency
27 Sep, 2013: Changed the name of the fields to conform with the table name
]]
-- Command line parameters
@@ -84,13 +85,13 @@ This method causes the script to get its manadatory arguments directly from the
if (params["cmd"] == "C") then
sql = "SELECT * FROM v_call_block as c "
sql = sql .. "JOIN v_domains as d ON c.domain_uuid=d.domain_uuid "
sql = sql .. "WHERE c.blocked_caller_number = '" .. params["cid_num"] .. "' AND d.domain_name = '" .. params["domain"] .."'"
sql = sql .. "WHERE c.call_block_number = '" .. params["cid_num"] .. "' AND d.domain_name = '" .. params["domain"] .."'"
status = dbh:query(sql, function(rows)
found_cid_num = rows["blocked_caller_number"]
found_cid_num = rows["call_block_number"]
found_uuid = rows["call_block_uuid"]
found_enabled = rows["block_call_enabled"]
found_action = rows["blocked_call_action"]
found_count = rows["blocked_call_count"]
found_enabled = rows["call_block_enabled"]
found_action = rows["call_block_action"]
found_count = rows["call_block_count"]
end)
-- dbh:affected_rows() doesn't do anything if using core:db so this is the workaround:
if found_cid_num then -- caller id exists
@@ -102,7 +103,7 @@ This method causes the script to get its manadatory arguments directly from the
--logger("W", "INFO", "Details: " .. details[k])
k = k + 1
end
dbh:query("UPDATE v_call_block SET blocked_call_count = " .. found_count + 1 .. " WHERE call_block_uuid = '" .. found_uuid .. "'")
dbh:query("UPDATE v_call_block SET call_block_count = " .. found_count + 1 .. " WHERE call_block_uuid = '" .. found_uuid .. "'")
session:setVariable("call_block", "block")
logger("W", "NOTICE", "number " .. params["cid_num"] .. " blocked with " .. found_count .. " previous hits, domain: " .. params["domain"])
if (found_action == "Reject") then