diff --git a/lib/NGCP/Panel/Controller/API/PasswordRecovery.pm b/lib/NGCP/Panel/Controller/API/PasswordRecovery.pm index e74fe07877..9cbd915bf5 100644 --- a/lib/NGCP/Panel/Controller/API/PasswordRecovery.pm +++ b/lib/NGCP/Panel/Controller/API/PasswordRecovery.pm @@ -146,7 +146,7 @@ sub POST :Allow { $guard->commit; - $res = { success => 1, message => 'Password reset successfuly completed.' }; + $res = { success => 1, message => 'Password reset successfully completed.' }; $c->response->status(HTTP_OK); $c->response->body(JSON::to_json($res)); diff --git a/lib/NGCP/Panel/Controller/API/PbxDevices.pm b/lib/NGCP/Panel/Controller/API/PbxDevices.pm index 1c644ec7d0..274f201bee 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDevices.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDevices.pm @@ -68,7 +68,7 @@ sub query_params { }, { param => 'display_name', - description => 'Search for PBX devices matching a subscriber\'s diplay name pattern (wildcards possible)', + description => 'Search for PBX devices matching a subscriber\'s display name pattern (wildcards possible)', query => { first => sub { my $q = shift; diff --git a/lib/NGCP/Panel/Field/AliasNumber.pm b/lib/NGCP/Panel/Field/AliasNumber.pm index 70c1591f75..4bd9a959db 100644 --- a/lib/NGCP/Panel/Field/AliasNumber.pm +++ b/lib/NGCP/Panel/Field/AliasNumber.pm @@ -29,7 +29,7 @@ has_field 'is_devid' => ( order => 98, element_attr => { rel => ['tooltip'], - title => ['When selected, it is possible to register with the alias and recieve calls directed to the alias only'] + title => ['When selected, it is possible to register with the alias and receive calls directed to the alias only'] }, ); diff --git a/lib/NGCP/Panel/Field/E164Alias.pm b/lib/NGCP/Panel/Field/E164Alias.pm index 811463ba50..55f16b847d 100644 --- a/lib/NGCP/Panel/Field/E164Alias.pm +++ b/lib/NGCP/Panel/Field/E164Alias.pm @@ -13,7 +13,7 @@ has_field 'is_devid' => ( order => 98, element_attr => { rel => ['tooltip'], - title => ['When selected, it is possible to register with the alias and recieve calls directed to the alias only'] + title => ['When selected, it is possible to register with the alias and receive calls directed to the alias only'] }, ); diff --git a/lib/NGCP/Panel/Form/BillingFee.pm b/lib/NGCP/Panel/Form/BillingFee.pm index 62137ad80c..426dbb8244 100644 --- a/lib/NGCP/Panel/Form/BillingFee.pm +++ b/lib/NGCP/Panel/Form/BillingFee.pm @@ -24,7 +24,7 @@ has_field 'match_mode' => ( required => 1, element_attr => { rel => ['tooltip'], - title => ['The mode how the the fee\'s source/destination has to match a call\'s source/destination.'] + title => ['The mode how the fee\'s source/destination has to match a call\'s source/destination.'] }, ); diff --git a/lib/NGCP/Panel/Form/Number/SubadminAPI.pm b/lib/NGCP/Panel/Form/Number/SubadminAPI.pm index cd916739fc..3c8b1d371e 100644 --- a/lib/NGCP/Panel/Form/Number/SubadminAPI.pm +++ b/lib/NGCP/Panel/Form/Number/SubadminAPI.pm @@ -48,7 +48,7 @@ has_field 'is_devid' => ( type => 'Boolean', element_attr => { rel => ['tooltip'], - title => ['When selected, it is possible to register with the alias and recieve calls directed to the alias only'] + title => ['When selected, it is possible to register with the alias and receive calls directed to the alias only'] }, ); diff --git a/lib/NGCP/Panel/I18N/de.po b/lib/NGCP/Panel/I18N/de.po index 5fb6e23df8..e21d1897a2 100644 --- a/lib/NGCP/Panel/I18N/de.po +++ b/lib/NGCP/Panel/I18N/de.po @@ -10212,7 +10212,7 @@ msgid "Save SVG" msgstr "SVG speichern" #: lib/NGCP/Panel/Utils/DbStrings.pm -msgid "Search for partial match of user-provided number (UPN) to subscriber's primary E164 number and aliases. If it mathes, take UPN as valid wihout allowed_clis check and copy UPN to network-provided number (NPN)." +msgid "Search for partial match of user-provided number (UPN) to subscriber's primary E164 number and aliases. If it mathes, take UPN as valid without allowed_clis check and copy UPN to network-provided number (NPN)." msgstr "Suche nach einer teilweisen Übereinstimmung der User-Provided-Nummer (UPN) mit der E164-Hauptnummer und den Aliasen des Teilnehmers. Bei Übereinstimmung, wird die UPN ohne „allowed_clis“-Überprüfung und Kopieren der Network-Provided-Nummer (NPN) als gültig betrachtet." #: lib/NGCP/Panel/Utils/DbStrings.pm diff --git a/lib/NGCP/Panel/I18N/es.po b/lib/NGCP/Panel/I18N/es.po index 38909f8dc9..1627ebf75a 100644 --- a/lib/NGCP/Panel/I18N/es.po +++ b/lib/NGCP/Panel/I18N/es.po @@ -6912,7 +6912,7 @@ msgid "Save SVG" msgstr "" #: lib/NGCP/Panel/Utils/DbStrings.pm -msgid "Search for partial match of user-provided number (UPN) to subscriber's primary E164 number and aliases. If it mathes, take UPN as valid wihout allowed_clis check and copy UPN to network-provided number (NPN)." +msgid "Search for partial match of user-provided number (UPN) to subscriber's primary E164 number and aliases. If it mathes, take UPN as valid without allowed_clis check and copy UPN to network-provided number (NPN)." msgstr "" #: share/templates/subscriber/preferences.tt diff --git a/lib/NGCP/Panel/I18N/fr.po b/lib/NGCP/Panel/I18N/fr.po index 802db1f5e4..3b66b051da 100644 --- a/lib/NGCP/Panel/I18N/fr.po +++ b/lib/NGCP/Panel/I18N/fr.po @@ -6892,7 +6892,7 @@ msgid "Save SVG" msgstr "Sauvegarder SVG" #: lib/NGCP/Panel/Utils/DbStrings.pm -msgid "Search for partial match of user-provided number (UPN) to subscriber's primary E164 number and aliases. If it mathes, take UPN as valid wihout allowed_clis check and copy UPN to network-provided number (NPN)." +msgid "Search for partial match of user-provided number (UPN) to subscriber's primary E164 number and aliases. If it mathes, take UPN as valid without allowed_clis check and copy UPN to network-provided number (NPN)." msgstr "Rechercher une correspondance partielle du numéro fourni par l'utilisateur (UPN) avec le numéro E164 principal de l'abonné et les alias. S'il correspond, prendre l'UPN comme valide sans vérifier les allowed_clis et copier l'UPN dans le numéro fourni par le réseau (NPN)" #: share/templates/subscriber/preferences.tt diff --git a/lib/NGCP/Panel/I18N/it.po b/lib/NGCP/Panel/I18N/it.po index 0ed1e85457..93fbb737f3 100644 --- a/lib/NGCP/Panel/I18N/it.po +++ b/lib/NGCP/Panel/I18N/it.po @@ -6893,7 +6893,7 @@ msgid "Save SVG" msgstr "Salva SVG" #: lib/NGCP/Panel/Utils/DbStrings.pm -msgid "Search for partial match of user-provided number (UPN) to subscriber's primary E164 number and aliases. If it mathes, take UPN as valid wihout allowed_clis check and copy UPN to network-provided number (NPN)." +msgid "Search for partial match of user-provided number (UPN) to subscriber's primary E164 number and aliases. If it mathes, take UPN as valid without allowed_clis check and copy UPN to network-provided number (NPN)." msgstr "" #: share/templates/subscriber/preferences.tt diff --git a/lib/NGCP/Panel/I18N/messages.pot b/lib/NGCP/Panel/I18N/messages.pot index fc84133c03..0c608b91c3 100644 --- a/lib/NGCP/Panel/I18N/messages.pot +++ b/lib/NGCP/Panel/I18N/messages.pot @@ -10267,7 +10267,7 @@ msgid "Save SVG" msgstr "" #: lib/NGCP/Panel/Utils/DbStrings.pm -msgid "Search for partial match of user-provided number (UPN) to subscriber's primary E164 number and aliases. If it mathes, take UPN as valid wihout allowed_clis check and copy UPN to network-provided number (NPN)." +msgid "Search for partial match of user-provided number (UPN) to subscriber's primary E164 number and aliases. If it mathes, take UPN as valid without allowed_clis check and copy UPN to network-provided number (NPN)." msgstr "" #: lib/NGCP/Panel/Utils/DbStrings.pm diff --git a/lib/NGCP/Panel/I18N/ru.po b/lib/NGCP/Panel/I18N/ru.po index 13b024d3ac..780c385b08 100644 --- a/lib/NGCP/Panel/I18N/ru.po +++ b/lib/NGCP/Panel/I18N/ru.po @@ -10212,8 +10212,8 @@ msgid "Save SVG" msgstr "Сохранить SVG" #: lib/NGCP/Panel/Utils/DbStrings.pm -msgid "Search for partial match of user-provided number (UPN) to subscriber's primary E164 number and aliases. If it mathes, take UPN as valid wihout allowed_clis check and copy UPN to network-provided number (NPN)." -msgstr "Поиск по частичному совпадению предоставленного пользователем номера (UPN) для первичного абонента E164 номера и алиасов. Если допустимо, установите UPN в качестве допустимого wihout allowed_clis и скопируйте UPN на предоставленный номер сети (NPN)." +msgid "Search for partial match of user-provided number (UPN) to subscriber's primary E164 number and aliases. If it mathes, take UPN as valid without allowed_clis check and copy UPN to network-provided number (NPN)." +msgstr "Поиск по частичному совпадению предоставленного пользователем номера (UPN) для первичного абонента E164 номера и алиасов. Если допустимо, установите UPN в качестве допустимого without allowed_clis и скопируйте UPN на предоставленный номер сети (NPN)." #: lib/NGCP/Panel/Utils/DbStrings.pm msgid "Second" diff --git a/lib/NGCP/Panel/Role/API/Subscribers.pm b/lib/NGCP/Panel/Role/API/Subscribers.pm index 89d27d0b89..b1d03161ae 100644 --- a/lib/NGCP/Panel/Role/API/Subscribers.pm +++ b/lib/NGCP/Panel/Role/API/Subscribers.pm @@ -78,6 +78,20 @@ sub resource_from_item { } my $sippassword = $resource{password}; my $webpassword = $resource{webpassword}; + # if the webpassword length is 54 or 56 chars and it contains $, + # we assume that the password is encrypted, + # as we do not have an explicit flag for the password field + # whether it's encrypted or not, there is a chance that + # if somebody manages to create a 54 chars password containing + # '$', it will be detected as false positive, but + # - all webpasswords from mr8.5+ are meant to be encrypted + # - in case of the false positive result, the worse that happens + # the password is not returned to the user in plain-text + if ($change_passwords && + $resource{webpassword} && (length $resource{webpassword}) =~ /^(54|56)$/ && + $resource{webpassword} =~ /\$/) { + delete $resource{webpassword}; + } if(!$form){ ($form) = $self->get_form($c); } diff --git a/share/static/js/invoice_template.js b/share/static/js/invoice_template.js index 37c6d9c748..ff4782975f 100644 --- a/share/static/js/invoice_template.js +++ b/share/static/js/invoice_template.js @@ -111,7 +111,7 @@ function savePreviewed( data, callback ){ } //$('#load_previewed_control').css('display', 'inline' ); - //refresh list after saving - there is nothin that can be cahnged in templates list after preview refresh + //refresh list after saving - there is nothin that can be changed in templates list after preview refresh //refreshAjaxList( 'template', data ); } ); } @@ -129,7 +129,7 @@ function savePreviewedAndShowParsed( data ){ // //alert('savePreviewedAndShowParsed: httpResponse='+httpResponse+';'); // setSvgStringToPreview( httpResponse, q, data ) // //$('#load_previewed_control').css('display', 'inline' ); - // //refresh list after saving - there is nothin that can be cahnged in templates list after preview refresh + // //refresh list after saving - there is nothin that can be changed in templates list after preview refresh // //refreshAjaxList( 'template', data ); //} ); } diff --git a/share/templates/api/root/intro.tt b/share/templates/api/root/intro.tt index 5ddbae8566..c1465d1588 100644 --- a/share/templates/api/root/intro.tt +++ b/share/templates/api/root/intro.tt @@ -137,7 +137,7 @@ The server rejects a client request with the following response codes:
  • 403 Forbidden: The 403 code is sent in response to a request trying to access resources which require different privileges (typically a reseller accessing resources of other resellers or of the system), or if you try to create more subscribers than allowed within a customer, or if you try to authenticate with an SSL client certificate with an invalid serial number.
  • 404 Not Found: The 404 code is sent in response to a request trying to access an invalid URL on the system, or if it is trying to perform an operation on an item which does not exist or the user has no access to (e.g. a reseller trying to access items of a different reseller).
  • 415 Unsupported Media Type: The 415 code is sent in response to a PUT, POST or PATCH request which doesn't provide an acceptable Content-Type header. Content types are usually application/json or application/json-patch+json for POST/PUT and PATCH, respectively. However, some resources require different content types like audio/x-wav.
    • -
  • 422 Unprocessible Entity: The 422 code is sent in response to a syntactically valid request, which fails to meet semantical conditions, like missing or invalid fields in a JSON structure. The body of the response provides more information about the exact condition that failed.
    • +
  • 422 Unprocessable Entity: The 422 code is sent in response to a syntactically valid request, which fails to meet semantical conditions, like missing or invalid fields in a JSON structure. The body of the response provides more information about the exact condition that failed.
  • 423 Locked: The 423 code is sent if you try to delete an item which is still in use. This is typically the case when trying to delete system or customer contacts which are still bound to a contract.
    • diff --git a/tools_bin/ngcp-provisioning-template b/tools_bin/ngcp-provisioning-template index 68379b771f..db5803c431 100755 --- a/tools_bin/ngcp-provisioning-template +++ b/tools_bin/ngcp-provisioning-template @@ -359,11 +359,11 @@ The database user for the ngcp database to connect to. Only relevant if --db_hos =item B<--db_password=>I -The the database user password (if any) for the ngcp database to connect to. Only relevant if --db_host is specified. +The database user password (if any) for the ngcp database to connect to. Only relevant if --db_host is specified. =item B<--file=>I<.csv-filename> -Specify a .csv file to process. Each row repesent form values for one subscriber to create. +Specify a .csv file to process. Each row represents form values for one subscriber to create. =item B<--first_name=>I