From 4fd28056c37cd2770efdb5ee12c499db684e77f8 Mon Sep 17 00:00:00 2001
From: Marco Capetta <mcapetta@sipwise.com>
Date: Fri, 21 Apr 2023 17:20:25 +0200
Subject: [PATCH] MT#57240 Allow '+' char in device line number definition

Change-Id: I0234d7fd3a34d55cd1370a65f93171264eb7f44f
(cherry picked from commit b013f3560a8b85322c398cc458ba7890d8321eae)
---
 lib/NGCP/Panel/Role/API/PbxDevices.pm | 4 ++--
 share/templates/customer/details.tt   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/NGCP/Panel/Role/API/PbxDevices.pm b/lib/NGCP/Panel/Role/API/PbxDevices.pm
index 249e536fcc..db104e9ab0 100644
--- a/lib/NGCP/Panel/Role/API/PbxDevices.pm
+++ b/lib/NGCP/Panel/Role/API/PbxDevices.pm
@@ -217,8 +217,8 @@ sub update_item {
 
         $line->{line_type} = delete $line->{type};
 
-        if (defined $line->{target_number} && $line->{target_number} !~ /^[0-9#*]+$/) {
-            $self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid 'target_number' ($line->{target_number}), can contain only '0-9' numbers and '#','*' characters");
+        if (defined $line->{target_number} && $line->{target_number} !~ /^[0-9#*+]+$/) {
+            $self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid 'target_number' ($line->{target_number}), can contain only '0-9' numbers and '+','#','*' characters");
             return;
         }
 
diff --git a/share/templates/customer/details.tt b/share/templates/customer/details.tt
index 5581c0c3e4..d0e0937ce5 100644
--- a/share/templates/customer/details.tt
+++ b/share/templates/customer/details.tt
@@ -1107,7 +1107,7 @@ function create_ranges_annotations(id,type,ranges){
                 '<input type="checkbox" class="switch" ' + isSwitchOn + ' name="line.' + linecmt + '.switch" id="line.' + linecmt + '">' +
                 '<span class="slider round"></span>' +
                 '</label>' +
-                '<input type="text" class="subinput" oninput="this.value = this.value.replace(/[^0-9#*]/, \'\')" name="line.' + linecmt + '.target_number" id="line.' + linecmt + '.target_number" ' + targetNumber + '>' +
+                '<input type="text" class="subinput" oninput="this.value = this.value.replace(/[^0-9#*+]/, \'\')" name="line.' + linecmt + '.target_number" id="line.' + linecmt + '.target_number" ' + targetNumber + '>' +
                 '<select class="subselect" name="line.' + linecmt + '.subscriber_id" id="line.' + linecmt + '.subscriber_id">' +
                 '<option value="0">'+(linekeyCurrent ? '[% c.loc("Subscriber") %]' : '[% c.loc("None") %]' )+'</option>' +
 [% FOR sub IN subscribers.all -%]