nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Call Block: Fix the references to foreign keys and rename blocked_caller_uuid to call_block_uuid to conform to the naming convention.

Browse Source
This commit is contained in:
Mark Crane
2013-09-12 07:58:56 +00:00
parent 7241820246
commit 457b3c6c7e
6 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/call_block/app_config.php
View File

@@ -68,11 +68,15 @@
$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_domains';
$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'domain_uuid';
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'blocked_caller_uuid';
$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'call_block_uuid';
$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'blocked_caller_uuid';
$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
$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]['type'] = 'text';

4
app/call_block/call_block.php
View File

@@ -139,10 +139,10 @@ else {
echo " <td valign='top' class='".$row_style[$c]."'>".$row['block_call_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['blocked_caller_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>\n";
echo " <a href='call_block_edit.php?id=".$row['call_block_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>\n";
}
if (permission_exists('call_block_delete')) {
echo " <a href='call_block_delete.php?id=".$row['blocked_caller_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm(".$text['confirm-delete'].")\">$v_link_label_delete</a>\n";
echo " <a href='call_block_delete.php?id=".$row['call_block_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm(".$text['confirm-delete'].")\">$v_link_label_delete</a>\n";
};
echo "</tr>\n";
if ($c==0) { $c=1; } else { $c=0; }

2
app/call_block/call_block_cdr_add.php
View File

@@ -65,7 +65,7 @@ else {
$sql = "insert into v_call_block ";
$sql .= "(";
$sql .= "domain_uuid, ";
$sql .= "blocked_caller_uuid, ";
$sql .= "call_block_uuid, ";
$sql .= "blocked_caller_name, ";
$sql .= "blocked_caller_number, ";
$sql .= "blocked_call_count, ";

2
app/call_block/call_block_delete.php
View File

@@ -51,7 +51,7 @@ else {
if (strlen($id)>0) {
$sql = "delete from v_call_block ";
$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= "and blocked_caller_uuid = '$id' ";
$sql .= "and call_block_uuid = '$id' ";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
unset($prep_statement, $sql);

14
app/call_block/call_block_edit.php
View File

@@ -71,7 +71,7 @@ else {
//action add or update
if (isset($_REQUEST["id"])) {
$action = "update";
$blocked_caller_uuid = check_str($_REQUEST["id"]);
$call_block_uuid = check_str($_REQUEST["id"]);
}
else {
$action = "add";
@@ -89,7 +89,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$msg = '';
if ($action == "update") {
//$blocked_caller_uuid = check_str($_POST["blocked_caller_uuid"]);
//$call_block_uuid = check_str($_POST["call_block_uuid"]);
}
//check for all required data
@@ -117,7 +117,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql = "insert into v_call_block ";
$sql .= "(";
$sql .= "domain_uuid, ";
$sql .= "blocked_caller_uuid, ";
$sql .= "call_block_uuid, ";
$sql .= "blocked_caller_name, ";
$sql .= "blocked_caller_number, ";
$sql .= "blocked_call_count, ";
@@ -155,7 +155,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "blocked_call_action = '$blocked_call_action', ";
$sql .= "block_call_enabled = '$block_call_enabled' ";
$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= "and blocked_caller_uuid = '$blocked_caller_uuid'";
$sql .= "and call_block_uuid = '$call_block_uuid'";
$db->exec(check_sql($sql));
unset($sql);
@@ -172,10 +172,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
//pre-populate the form
if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
$blocked_caller_uuid = $_GET["id"];
$call_block_uuid = $_GET["id"];
$sql = "select * from v_call_block ";
$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= "and blocked_caller_uuid = '$blocked_caller_uuid' ";
$sql .= "and call_block_uuid = '$call_block_uuid' ";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
$result = $prep_statement->fetchAll();
@@ -367,7 +367,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo " <tr>\n";
echo " <td colspan='2' align='right'>\n";
if ($action == "update") {
echo " <input type='hidden' name='blocked_caller_uuid' value='$blocked_caller_uuid'>\n";
echo " <input type='hidden' name='call_block_uuid' value='$call_block_uuid'>\n";
}
echo " <input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
echo " </td>\n";

4
app/call_block/resources/switch/scripts/app/call_block/index.lua
View File

@@ -87,7 +87,7 @@ This method causes the script to get its manadatory arguments directly from the
sql = sql .. "WHERE c.blocked_caller_number = '" .. params["cid_num"] .. "' AND d.domain_name = '" .. params["domain"] .."'"
status = dbh:query(sql, function(rows)
found_cid_num = rows["blocked_caller_number"]
found_uuid = rows["blocked_caller_uuid"]
found_uuid = rows["call_block_uuid"]
found_enabled = rows["block_call_enabled"]
found_action = rows["blocked_call_action"]
found_count = rows["blocked_call_count"]
@@ -102,7 +102,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 blocked_caller_uuid = '" .. found_uuid .. "'")
dbh:query("UPDATE v_call_block SET blocked_call_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