diff --git a/app/call_block/app_config.php b/app/call_block/app_config.php index 6fa8ca0712..2489d6b610 100644 --- a/app/call_block/app_config.php +++ b/app/call_block/app_config.php @@ -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++; diff --git a/app/call_block/call_block.php b/app/call_block/call_block.php index cc8f8249d7..17c3dd0b5a 100644 --- a/app/call_block/call_block.php +++ b/app/call_block/call_block.php @@ -110,12 +110,12 @@ else { echo "
\n"; echo "\n"; echo "\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 "\n"; - echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; + echo " \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 " \n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; echo " \n"; echo "\n"; @@ -304,7 +304,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo " Name:\n"; echo "\n"; echo "\n"; @@ -315,9 +315,9 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo " Action:\n"; echo "\n"; echo "\n"; echo "
\n"; if (permission_exists('call_block_add')) { echo " $v_link_label_add\n"; @@ -126,17 +126,17 @@ else { if ($result_count > 0) { foreach($result as $row) { echo "
".$row['blocked_caller_number']." ".$row['blocked_caller_name']." ".$row['blocked_call_count']." ".$row['call_block_number']." ".$row['call_block_name']." ".$row['call_block_count']." ".$tmp_date_added." ".$row['blocked_call_action']." ".$row['block_call_enabled']." ".$row['call_block_action']." ".$row['call_block_enabled']." \n"; if (permission_exists('call_block_edit')) { echo " $v_link_label_edit\n"; diff --git a/app/call_block/call_block_cdr_add.php b/app/call_block/call_block_cdr_add.php index 4ff53d53f9..a2df79186b 100644 --- a/app/call_block/call_block_cdr_add.php +++ b/app/call_block/call_block_cdr_add.php @@ -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)); diff --git a/app/call_block/call_block_edit.php b/app/call_block/call_block_edit.php index 2a529758bd..155998c046 100644 --- a/app/call_block/call_block_edit.php +++ b/app/call_block/call_block_edit.php @@ -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']."
\n"; } + if (strlen($call_block_name) == 0) { $msg .= $text['label-provide-name']."
\n"; } if ($action == "add") { - if (strlen($blocked_caller_number) == 0) { $msg .= $text['label-provide-number']."
\n"; } + if (strlen($call_block_number) == 0) { $msg .= $text['label-provide-number']."
\n"; } } - if (strlen($block_call_enabled) == 0) { $msg .= $text['label-provide-enabled']."
\n"; } + if (strlen($call_block_enabled) == 0) { $msg .= $text['label-provide-enabled']."
\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 "		\n"; if ($action == "add") { - echo " \n"; + echo " \n"; echo "
\n"; echo $text['label-exact-number']."\n"; } else { - echo $blocked_caller_number; + echo $call_block_number; } echo "
\n"; echo "		\n"; - echo " \n"; + echo " \n"; echo "
\n"; echo "Enter the name.\n"; echo "		\n"; - echo " \n"; echo " \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 "\n"; - echo " \n"; echo " \n"; - if ($block_call_enabled == "true") { + if ($call_block_enabled == "true") { echo " \n"; } else { echo " \n"; } - if ($block_call_enabled == "false") { + if ($call_block_enabled == "false") { echo " \n"; } else { diff --git a/resources/install/scripts/app/call_block/index.lua b/resources/install/scripts/app/call_block/index.lua index cdf8d73175..8a47b67ad7 100644 --- a/resources/install/scripts/app/call_block/index.lua +++ b/resources/install/scripts/app/call_block/index.lua @@ -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