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

Call Block: UI Adjustments for Country Code.

Browse Source
This commit is contained in:
Nate
2020-11-02 10:55:31 -07:00
parent a7e12aa5da
commit f748a754ad
3 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/call_block/app_languages.php
+2 -2
View File
@@ -637,8 +637,8 @@ $text['description-country_code']['ru-ru'] = "";
$text['description-country_code']['sv-se'] = ""; $text['description-country_code']['sv-se'] = "";
$text['description-country_code']['uk-ua'] = ""; $text['description-country_code']['uk-ua'] = "";
$text['description-call_block_number']['en-us'] = "Enter the Caller ID Number to block."; $text['description-call_block_number']['en-us'] = "Enter the Country Code and Caller ID Number to block.";
$text['description-call_block_number']['en-gb'] = "Enter the Caller ID Number to block."; $text['description-call_block_number']['en-gb'] = "Enter the Country Code and Caller ID Number to block.";
$text['description-call_block_number']['ar-eg'] = ""; $text['description-call_block_number']['ar-eg'] = "";
$text['description-call_block_number']['de-at'] = ""; $text['description-call_block_number']['de-at'] = "";
$text['description-call_block_number']['de-ch'] = ""; $text['description-call_block_number']['de-ch'] = "";
app/call_block/call_block_edit.php
+1 -11
View File
@@ -355,22 +355,12 @@
echo "</td>\n"; echo "</td>\n";
echo "</tr>\n"; echo "</tr>\n";
echo "<tr>\n";
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['label-country_code']."\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo " <input class='formfld' type='text' name='call_block_country_code' maxlength='6' value=\"".escape($call_block_country_code)."\">\n";
echo "<br />\n";
echo $text['description-country_code']."\n";
echo "</td>\n";
echo "</tr>\n";
echo "<tr>\n"; echo "<tr>\n";
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n"; echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['label-number']."\n"; echo " ".$text['label-number']."\n";
echo "</td>\n"; echo "</td>\n";
echo "<td class='vtable' align='left'>\n"; echo "<td class='vtable' align='left'>\n";
echo " <input class='formfld' type='text' name='call_block_country_code' maxlength='6' style='width: 60px;' value=\"".escape($call_block_country_code)."\">\n";
echo " <input class='formfld' type='text' name='call_block_number' maxlength='255' value=\"".escape($call_block_number)."\">\n"; echo " <input class='formfld' type='text' name='call_block_number' maxlength='255' value=\"".escape($call_block_number)."\">\n";
echo "<br />\n"; echo "<br />\n";
echo $text['description-call_block_number']."\n"; echo $text['description-call_block_number']."\n";
app/call_block/resources/classes/call_block.php
+2 -5
View File
@@ -318,9 +318,6 @@ if (!class_exists('call_block')) {
if (is_array($rows) && @sizeof($rows) != 0) { if (is_array($rows) && @sizeof($rows) != 0) {
foreach ($rows as $x => $row) { foreach ($rows as $x => $row) {
//trim plus and any spaces
$row["caller_id_number"] = trim($row["caller_id_number"], '+ ');
//build insert array //build insert array
if (permission_exists('call_block_all')) { if (permission_exists('call_block_all')) {
$array['call_block'][$x]['call_block_uuid'] = uuid(); $array['call_block'][$x]['call_block_uuid'] = uuid();
@@ -329,7 +326,7 @@ if (!class_exists('call_block')) {
$array['call_block'][$x]['extension_uuid'] = $this->extension_uuid; $array['call_block'][$x]['extension_uuid'] = $this->extension_uuid;
} }
$array['call_block'][$x]['call_block_name'] = trim($row["caller_id_name"]); $array['call_block'][$x]['call_block_name'] = trim($row["caller_id_name"]);
$array['call_block'][$x]['call_block_number'] = $row["caller_id_number"]; $array['call_block'][$x]['call_block_number'] = trim($row["caller_id_number"]);
$array['call_block'][$x]['call_block_count'] = 0; $array['call_block'][$x]['call_block_count'] = 0;
$array['call_block'][$x]['call_block_app'] = $this->call_block_app; $array['call_block'][$x]['call_block_app'] = $this->call_block_app;
$array['call_block'][$x]['call_block_data'] = $this->call_block_data; $array['call_block'][$x]['call_block_data'] = $this->call_block_data;
@@ -345,7 +342,7 @@ if (!class_exists('call_block')) {
$array['call_block'][$x]['domain_uuid'] = $_SESSION['domain_uuid']; $array['call_block'][$x]['domain_uuid'] = $_SESSION['domain_uuid'];
$array['call_block'][$x]['extension_uuid'] = $field['extension_uuid']; $array['call_block'][$x]['extension_uuid'] = $field['extension_uuid'];
$array['call_block'][$x]['call_block_name'] = trim($row["caller_id_name"]); $array['call_block'][$x]['call_block_name'] = trim($row["caller_id_name"]);
$array['call_block'][$x]['call_block_number'] = $row["caller_id_number"]; $array['call_block'][$x]['call_block_number'] = trim($row["caller_id_number"]);
$array['call_block'][$x]['call_block_count'] = 0; $array['call_block'][$x]['call_block_count'] = 0;
$array['call_block'][$x]['call_block_app'] = $this->call_block_app; $array['call_block'][$x]['call_block_app'] = $this->call_block_app;
$array['call_block'][$x]['call_block_data'] = $this->call_block_data; $array['call_block'][$x]['call_block_data'] = $this->call_block_data;