From f748a754ad58f2faf8146a624dcda18d7caf5af0 Mon Sep 17 00:00:00 2001
From: Nate <github@najo.com>
Date: Mon, 2 Nov 2020 10:55:31 -0700
Subject: [PATCH] Call Block: UI Adjustments for Country Code.

---
 app/call_block/app_languages.php                |  4 ++--
 app/call_block/call_block_edit.php              | 12 +-----------
 app/call_block/resources/classes/call_block.php |  7 ++-----
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/app/call_block/app_languages.php b/app/call_block/app_languages.php
index d7495285c7..95d5faff28 100644
--- a/app/call_block/app_languages.php
+++ b/app/call_block/app_languages.php
@@ -637,8 +637,8 @@ $text['description-country_code']['ru-ru'] = "";
 $text['description-country_code']['sv-se'] = "";
 $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-gb'] = "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 Country Code and Caller ID Number to block.";
 $text['description-call_block_number']['ar-eg'] = "";
 $text['description-call_block_number']['de-at'] = "";
 $text['description-call_block_number']['de-ch'] = "";
diff --git a/app/call_block/call_block_edit.php b/app/call_block/call_block_edit.php
index ba94d7b06d..c8232c6076 100644
--- a/app/call_block/call_block_edit.php
+++ b/app/call_block/call_block_edit.php
@@ -355,22 +355,12 @@
 	echo "</td>\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 "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-number']."\n";
 	echo "</td>\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 "<br />\n";
 	echo $text['description-call_block_number']."\n";
diff --git a/app/call_block/resources/classes/call_block.php b/app/call_block/resources/classes/call_block.php
index cbb3c419a5..fcb61a6555 100644
--- a/app/call_block/resources/classes/call_block.php
+++ b/app/call_block/resources/classes/call_block.php
@@ -318,9 +318,6 @@ if (!class_exists('call_block')) {
 							if (is_array($rows) && @sizeof($rows) != 0) {
 								foreach ($rows as $x => $row) {
 
-									//trim plus and any spaces
-										$row["caller_id_number"] = trim($row["caller_id_number"], '+ ');
-
 									//build insert array
 										if (permission_exists('call_block_all')) {
 											$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]['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_app'] = $this->call_block_app;
 											$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]['extension_uuid'] = $field['extension_uuid'];
 														$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_app'] = $this->call_block_app;
 														$array['call_block'][$x]['call_block_data'] = $this->call_block_data;