diff --git a/lib/NGCP/Panel/AuthenticationStore/RoleFromRealm.pm b/lib/NGCP/Panel/AuthenticationStore/RoleFromRealm.pm index 7da774a257..9355a9996c 100644 --- a/lib/NGCP/Panel/AuthenticationStore/RoleFromRealm.pm +++ b/lib/NGCP/Panel/AuthenticationStore/RoleFromRealm.pm @@ -1,6 +1,6 @@ package NGCP::Panel::AuthenticationStore::RoleFromRealm; use Sipwise::Base; -extends 'Catalyst::Authentication::Store::DBIx::Class::User'; +use base 'Catalyst::Authentication::Store::DBIx::Class::User'; sub roles { my ($self) = @_; @@ -21,4 +21,5 @@ sub roles { } return "invalid"; } +1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/ApplyRewrites.pm b/lib/NGCP/Panel/Controller/API/ApplyRewrites.pm index c8af5490d8..0097d92f96 100644 --- a/lib/NGCP/Panel/Controller/API/ApplyRewrites.pm +++ b/lib/NGCP/Panel/Controller/API/ApplyRewrites.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::ApplyRewrites; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -61,7 +63,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -136,4 +138,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/AutoAttendants.pm b/lib/NGCP/Panel/Controller/API/AutoAttendants.pm index 2c8e960ad5..007c6d410e 100644 --- a/lib/NGCP/Panel/Controller/API/AutoAttendants.pm +++ b/lib/NGCP/Panel/Controller/API/AutoAttendants.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::AutoAttendants; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -119,7 +121,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -134,4 +136,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/AutoAttendantsItem.pm b/lib/NGCP/Panel/Controller/API/AutoAttendantsItem.pm index b63097bc71..4ab8884d16 100644 --- a/lib/NGCP/Panel/Controller/API/AutoAttendantsItem.pm +++ b/lib/NGCP/Panel/Controller/API/AutoAttendantsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::AutoAttendantsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -84,7 +86,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -225,4 +227,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/BalanceIntervals.pm b/lib/NGCP/Panel/Controller/API/BalanceIntervals.pm index 3ad2edf77e..8102f9ac80 100644 --- a/lib/NGCP/Panel/Controller/API/BalanceIntervals.pm +++ b/lib/NGCP/Panel/Controller/API/BalanceIntervals.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::BalanceIntervals; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -172,7 +174,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -187,4 +189,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/BalanceIntervalsItem.pm b/lib/NGCP/Panel/Controller/API/BalanceIntervalsItem.pm index f22f58b1f0..c59b556365 100644 --- a/lib/NGCP/Panel/Controller/API/BalanceIntervalsItem.pm +++ b/lib/NGCP/Panel/Controller/API/BalanceIntervalsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::BalanceIntervalsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use HTTP::Headers qw(); use HTTP::Status qw(:constants); @@ -162,7 +164,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -211,7 +213,7 @@ sub item_options { my ($self, $c, $id) = @_; my $allowed_methods = [ 'GET', 'HEAD', 'OPTIONS' ]; $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -231,3 +233,6 @@ sub end : Private { $self->log_response($c); } + +no Moose; +1; diff --git a/lib/NGCP/Panel/Controller/API/BillingFees.pm b/lib/NGCP/Panel/Controller/API/BillingFees.pm index a95c57d3a9..64b22cf014 100644 --- a/lib/NGCP/Panel/Controller/API/BillingFees.pm +++ b/lib/NGCP/Panel/Controller/API/BillingFees.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::BillingFees; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -131,7 +133,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -248,4 +250,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/BillingFeesItem.pm b/lib/NGCP/Panel/Controller/API/BillingFeesItem.pm index 46bc283b9a..fc194e4618 100644 --- a/lib/NGCP/Panel/Controller/API/BillingFeesItem.pm +++ b/lib/NGCP/Panel/Controller/API/BillingFeesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::BillingFeesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -75,7 +77,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -195,4 +197,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/BillingNetworks.pm b/lib/NGCP/Panel/Controller/API/BillingNetworks.pm index 28ef37c454..f33c76c2b7 100644 --- a/lib/NGCP/Panel/Controller/API/BillingNetworks.pm +++ b/lib/NGCP/Panel/Controller/API/BillingNetworks.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::BillingNetworks; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -148,7 +150,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -224,4 +226,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/BillingNetworksItem.pm b/lib/NGCP/Panel/Controller/API/BillingNetworksItem.pm index d723e90789..194937919a 100644 --- a/lib/NGCP/Panel/Controller/API/BillingNetworksItem.pm +++ b/lib/NGCP/Panel/Controller/API/BillingNetworksItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::BillingNetworksItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -84,7 +86,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -249,4 +251,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/BillingProfiles.pm b/lib/NGCP/Panel/Controller/API/BillingProfiles.pm index 0e713ed03f..aae0f340ad 100644 --- a/lib/NGCP/Panel/Controller/API/BillingProfiles.pm +++ b/lib/NGCP/Panel/Controller/API/BillingProfiles.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::BillingProfiles; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -139,7 +141,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -209,4 +211,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/BillingProfilesItem.pm b/lib/NGCP/Panel/Controller/API/BillingProfilesItem.pm index 6c9c1d8dd3..f1332b1140 100644 --- a/lib/NGCP/Panel/Controller/API/BillingProfilesItem.pm +++ b/lib/NGCP/Panel/Controller/API/BillingProfilesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::BillingProfilesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -82,7 +84,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -222,4 +224,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/BillingZones.pm b/lib/NGCP/Panel/Controller/API/BillingZones.pm index 6def1a3d37..b36a3cb18d 100644 --- a/lib/NGCP/Panel/Controller/API/BillingZones.pm +++ b/lib/NGCP/Panel/Controller/API/BillingZones.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::BillingZones; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -138,7 +140,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -214,4 +216,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/BillingZonesItem.pm b/lib/NGCP/Panel/Controller/API/BillingZonesItem.pm index e8d27804e7..606b8de362 100644 --- a/lib/NGCP/Panel/Controller/API/BillingZonesItem.pm +++ b/lib/NGCP/Panel/Controller/API/BillingZonesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::BillingZonesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -82,7 +84,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -249,4 +251,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CCMapEntries.pm b/lib/NGCP/Panel/Controller/API/CCMapEntries.pm index f30b8ad412..ac6ebf3910 100644 --- a/lib/NGCP/Panel/Controller/API/CCMapEntries.pm +++ b/lib/NGCP/Panel/Controller/API/CCMapEntries.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CCMapEntries; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -119,7 +121,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -134,4 +136,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CCMapEntriesItem.pm b/lib/NGCP/Panel/Controller/API/CCMapEntriesItem.pm index b8168307be..babe9033ff 100644 --- a/lib/NGCP/Panel/Controller/API/CCMapEntriesItem.pm +++ b/lib/NGCP/Panel/Controller/API/CCMapEntriesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CCMapEntriesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -84,7 +86,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -254,4 +256,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CFDestinationSets.pm b/lib/NGCP/Panel/Controller/API/CFDestinationSets.pm index afe5bc1ad9..3af9fb92e1 100644 --- a/lib/NGCP/Panel/Controller/API/CFDestinationSets.pm +++ b/lib/NGCP/Panel/Controller/API/CFDestinationSets.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CFDestinationSets; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -141,7 +143,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -248,4 +250,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CFDestinationSetsItem.pm b/lib/NGCP/Panel/Controller/API/CFDestinationSetsItem.pm index 14e3453250..07671252f7 100644 --- a/lib/NGCP/Panel/Controller/API/CFDestinationSetsItem.pm +++ b/lib/NGCP/Panel/Controller/API/CFDestinationSetsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CFDestinationSetsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -84,7 +86,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -251,4 +253,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CFMappings.pm b/lib/NGCP/Panel/Controller/API/CFMappings.pm index 24cc20df2f..1f76227dc5 100644 --- a/lib/NGCP/Panel/Controller/API/CFMappings.pm +++ b/lib/NGCP/Panel/Controller/API/CFMappings.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CFMappings; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -131,7 +133,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -146,4 +148,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CFMappingsItem.pm b/lib/NGCP/Panel/Controller/API/CFMappingsItem.pm index 3a3fc3b1c7..424946520e 100644 --- a/lib/NGCP/Panel/Controller/API/CFMappingsItem.pm +++ b/lib/NGCP/Panel/Controller/API/CFMappingsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CFMappingsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -84,7 +86,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -224,4 +226,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CFTimeSets.pm b/lib/NGCP/Panel/Controller/API/CFTimeSets.pm index aabe700666..16bc95bdb8 100644 --- a/lib/NGCP/Panel/Controller/API/CFTimeSets.pm +++ b/lib/NGCP/Panel/Controller/API/CFTimeSets.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CFTimeSets; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -141,7 +143,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -231,4 +233,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CFTimeSetsItem.pm b/lib/NGCP/Panel/Controller/API/CFTimeSetsItem.pm index b5ba4c07ef..4327f72656 100644 --- a/lib/NGCP/Panel/Controller/API/CFTimeSetsItem.pm +++ b/lib/NGCP/Panel/Controller/API/CFTimeSetsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CFTimeSetsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -84,7 +86,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -251,4 +253,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CallControls.pm b/lib/NGCP/Panel/Controller/API/CallControls.pm index fec9ed9ff3..9928d8d128 100644 --- a/lib/NGCP/Panel/Controller/API/CallControls.pm +++ b/lib/NGCP/Panel/Controller/API/CallControls.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CallControls; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -64,7 +66,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -135,4 +137,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CallForwards.pm b/lib/NGCP/Panel/Controller/API/CallForwards.pm index 380bde4eae..0eb274cbb3 100644 --- a/lib/NGCP/Panel/Controller/API/CallForwards.pm +++ b/lib/NGCP/Panel/Controller/API/CallForwards.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CallForwards; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -135,7 +137,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -150,4 +152,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CallForwardsItem.pm b/lib/NGCP/Panel/Controller/API/CallForwardsItem.pm index 33c0a85900..829993e1e6 100644 --- a/lib/NGCP/Panel/Controller/API/CallForwardsItem.pm +++ b/lib/NGCP/Panel/Controller/API/CallForwardsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CallForwardsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -84,7 +86,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -261,4 +263,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CallLists.pm b/lib/NGCP/Panel/Controller/API/CallLists.pm index 3e5106e300..49ffbd8359 100644 --- a/lib/NGCP/Panel/Controller/API/CallLists.pm +++ b/lib/NGCP/Panel/Controller/API/CallLists.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CallLists; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -296,7 +298,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -310,5 +312,6 @@ sub end : Private { $self->log_response($c); return; } +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CallListsItem.pm b/lib/NGCP/Panel/Controller/API/CallListsItem.pm index 087d332b8f..00d0e5f42b 100644 --- a/lib/NGCP/Panel/Controller/API/CallListsItem.pm +++ b/lib/NGCP/Panel/Controller/API/CallListsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CallListsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -82,7 +84,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -96,4 +98,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/Calls.pm b/lib/NGCP/Panel/Controller/API/Calls.pm index 79a9a036d1..7ddf9e03d1 100644 --- a/lib/NGCP/Panel/Controller/API/Calls.pm +++ b/lib/NGCP/Panel/Controller/API/Calls.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::Calls; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +#use namespace::sweep; +use Moose; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -149,7 +151,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -163,4 +165,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CallsItem.pm b/lib/NGCP/Panel/Controller/API/CallsItem.pm index a2e52ac1fb..d2d32bf6cf 100644 --- a/lib/NGCP/Panel/Controller/API/CallsItem.pm +++ b/lib/NGCP/Panel/Controller/API/CallsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CallsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -74,7 +76,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -88,4 +90,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/Contracts.pm b/lib/NGCP/Panel/Controller/API/Contracts.pm index 95b6d89f92..5abde8226a 100644 --- a/lib/NGCP/Panel/Controller/API/Contracts.pm +++ b/lib/NGCP/Panel/Controller/API/Contracts.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::Contracts; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -164,7 +166,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -273,4 +275,7 @@ sub end : Private { return; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/ContractsItem.pm b/lib/NGCP/Panel/Controller/API/ContractsItem.pm index 338fd51412..9f9b6eb9ca 100644 --- a/lib/NGCP/Panel/Controller/API/ContractsItem.pm +++ b/lib/NGCP/Panel/Controller/API/ContractsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::ContractsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -89,7 +91,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -277,4 +279,7 @@ sub end : Private { return; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CustomerBalances.pm b/lib/NGCP/Panel/Controller/API/CustomerBalances.pm index 1f17fb3cdb..0e3a2f484e 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerBalances.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerBalances.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CustomerBalances; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -174,7 +176,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -189,4 +191,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CustomerBalancesItem.pm b/lib/NGCP/Panel/Controller/API/CustomerBalancesItem.pm index 4877b5c67e..78fd0446e6 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerBalancesItem.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerBalancesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CustomerBalancesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -85,7 +87,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -228,4 +230,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CustomerContacts.pm b/lib/NGCP/Panel/Controller/API/CustomerContacts.pm index 2722b9c25c..2e5608ead9 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerContacts.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerContacts.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CustomerContacts; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -139,7 +141,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -217,4 +219,7 @@ sub end : Private { return; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CustomerContactsItem.pm b/lib/NGCP/Panel/Controller/API/CustomerContactsItem.pm index 6da481ddb6..c357554fa3 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerContactsItem.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerContactsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CustomerContactsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -82,7 +84,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -252,4 +254,7 @@ sub end : Private { return; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CustomerPreferenceDefs.pm b/lib/NGCP/Panel/Controller/API/CustomerPreferenceDefs.pm index c757c4a585..580ab6ff5b 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerPreferenceDefs.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerPreferenceDefs.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CustomerPreferenceDefs; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -113,7 +115,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -127,4 +129,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CustomerPreferences.pm b/lib/NGCP/Panel/Controller/API/CustomerPreferences.pm index 30b4573ac9..285d32b149 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerPreferences.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerPreferences.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CustomerPreferences; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -108,7 +110,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -122,4 +124,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CustomerPreferencesItem.pm b/lib/NGCP/Panel/Controller/API/CustomerPreferencesItem.pm index 498e876236..fa008af812 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerPreferencesItem.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerPreferencesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CustomerPreferencesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -84,7 +86,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -226,4 +228,7 @@ sub end : Private { return; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CustomerZoneCosts.pm b/lib/NGCP/Panel/Controller/API/CustomerZoneCosts.pm index 9bf80338de..d99086f06b 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerZoneCosts.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerZoneCosts.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CustomerZoneCosts; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -145,7 +147,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -160,4 +162,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CustomerZoneCostsItem.pm b/lib/NGCP/Panel/Controller/API/CustomerZoneCostsItem.pm index 01e32f620b..22eb1c3788 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerZoneCostsItem.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerZoneCostsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CustomerZoneCostsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -78,7 +80,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -93,4 +95,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/Customers.pm b/lib/NGCP/Panel/Controller/API/Customers.pm index fcb7b6f4fd..674739c536 100644 --- a/lib/NGCP/Panel/Controller/API/Customers.pm +++ b/lib/NGCP/Panel/Controller/API/Customers.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::Customers; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -202,7 +204,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -332,4 +334,7 @@ sub end : Private { return; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/CustomersItem.pm b/lib/NGCP/Panel/Controller/API/CustomersItem.pm index 93b220ac1e..7f4f528d67 100644 --- a/lib/NGCP/Panel/Controller/API/CustomersItem.pm +++ b/lib/NGCP/Panel/Controller/API/CustomersItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::CustomersItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -89,7 +91,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -275,4 +277,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/DomainPreferenceDefs.pm b/lib/NGCP/Panel/Controller/API/DomainPreferenceDefs.pm index 2a8d4905bf..4962cd341d 100644 --- a/lib/NGCP/Panel/Controller/API/DomainPreferenceDefs.pm +++ b/lib/NGCP/Panel/Controller/API/DomainPreferenceDefs.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::DomainPreferenceDefs; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -113,7 +115,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -127,4 +129,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/DomainPreferences.pm b/lib/NGCP/Panel/Controller/API/DomainPreferences.pm index 2cad4ae61a..f309876ed4 100644 --- a/lib/NGCP/Panel/Controller/API/DomainPreferences.pm +++ b/lib/NGCP/Panel/Controller/API/DomainPreferences.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::DomainPreferences; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -108,7 +110,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -122,4 +124,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/DomainPreferencesItem.pm b/lib/NGCP/Panel/Controller/API/DomainPreferencesItem.pm index 35903e0891..d1619ac26f 100644 --- a/lib/NGCP/Panel/Controller/API/DomainPreferencesItem.pm +++ b/lib/NGCP/Panel/Controller/API/DomainPreferencesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::DomainPreferencesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -77,7 +79,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -177,4 +179,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/Domains.pm b/lib/NGCP/Panel/Controller/API/Domains.pm index 8fccfacda5..22553a10eb 100644 --- a/lib/NGCP/Panel/Controller/API/Domains.pm +++ b/lib/NGCP/Panel/Controller/API/Domains.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::Domains; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -143,7 +145,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -245,4 +247,7 @@ sub end : Private { return; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/DomainsItem.pm b/lib/NGCP/Panel/Controller/API/DomainsItem.pm index 56a2203fc0..2e12962706 100644 --- a/lib/NGCP/Panel/Controller/API/DomainsItem.pm +++ b/lib/NGCP/Panel/Controller/API/DomainsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::DomainsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -84,7 +86,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -183,4 +185,7 @@ sub end : Private { return; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/EmailTemplates.pm b/lib/NGCP/Panel/Controller/API/EmailTemplates.pm index 32d636a10b..29b4825414 100644 --- a/lib/NGCP/Panel/Controller/API/EmailTemplates.pm +++ b/lib/NGCP/Panel/Controller/API/EmailTemplates.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::EmailTemplates; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -127,7 +129,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -191,4 +193,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/EmailTemplatesItem.pm b/lib/NGCP/Panel/Controller/API/EmailTemplatesItem.pm index 55ad162b3e..2dff558917 100644 --- a/lib/NGCP/Panel/Controller/API/EmailTemplatesItem.pm +++ b/lib/NGCP/Panel/Controller/API/EmailTemplatesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::EmailTemplatesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -74,7 +76,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -196,4 +198,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/FaxRecordings.pm b/lib/NGCP/Panel/Controller/API/FaxRecordings.pm index 3daed0d363..c9ae91d29e 100644 --- a/lib/NGCP/Panel/Controller/API/FaxRecordings.pm +++ b/lib/NGCP/Panel/Controller/API/FaxRecordings.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::FaxRecordings; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -55,7 +57,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -70,4 +72,7 @@ sub end : Private { return; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/FaxRecordingsItem.pm b/lib/NGCP/Panel/Controller/API/FaxRecordingsItem.pm index 34660d7b3c..410497fd4a 100644 --- a/lib/NGCP/Panel/Controller/API/FaxRecordingsItem.pm +++ b/lib/NGCP/Panel/Controller/API/FaxRecordingsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::FaxRecordingsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -71,7 +73,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -85,4 +87,7 @@ sub end : Private { #$self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/Faxes.pm b/lib/NGCP/Panel/Controller/API/Faxes.pm index 7867bc1149..0a0a4cec41 100644 --- a/lib/NGCP/Panel/Controller/API/Faxes.pm +++ b/lib/NGCP/Panel/Controller/API/Faxes.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::Faxes; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +#use namespace::sweep; +use Moose; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -136,7 +138,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -205,4 +207,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/FaxesItem.pm b/lib/NGCP/Panel/Controller/API/FaxesItem.pm index 1b3ad2ccc7..c55c7d07d3 100644 --- a/lib/NGCP/Panel/Controller/API/FaxesItem.pm +++ b/lib/NGCP/Panel/Controller/API/FaxesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::FaxesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -75,7 +77,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -109,4 +111,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/FaxserverSettings.pm b/lib/NGCP/Panel/Controller/API/FaxserverSettings.pm index c4bffebe8d..e87ffdafda 100644 --- a/lib/NGCP/Panel/Controller/API/FaxserverSettings.pm +++ b/lib/NGCP/Panel/Controller/API/FaxserverSettings.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::FaxserverSettings; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -151,7 +153,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -166,4 +168,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/FaxserverSettingsItem.pm b/lib/NGCP/Panel/Controller/API/FaxserverSettingsItem.pm index ec387e135b..61a5156046 100644 --- a/lib/NGCP/Panel/Controller/API/FaxserverSettingsItem.pm +++ b/lib/NGCP/Panel/Controller/API/FaxserverSettingsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::FaxserverSettingsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -85,7 +87,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -226,4 +228,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/Interceptions.pm b/lib/NGCP/Panel/Controller/API/Interceptions.pm index 3a845289a6..6118b2ecc8 100644 --- a/lib/NGCP/Panel/Controller/API/Interceptions.pm +++ b/lib/NGCP/Panel/Controller/API/Interceptions.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::Interceptions; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -145,7 +147,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -229,4 +231,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/InterceptionsItem.pm b/lib/NGCP/Panel/Controller/API/InterceptionsItem.pm index ed74f3f8f0..9a9b891267 100644 --- a/lib/NGCP/Panel/Controller/API/InterceptionsItem.pm +++ b/lib/NGCP/Panel/Controller/API/InterceptionsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::InterceptionsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -74,7 +76,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -203,4 +205,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/InvoiceTemplates.pm b/lib/NGCP/Panel/Controller/API/InvoiceTemplates.pm index eab3ae5536..a59af666e2 100644 --- a/lib/NGCP/Panel/Controller/API/InvoiceTemplates.pm +++ b/lib/NGCP/Panel/Controller/API/InvoiceTemplates.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::InvoiceTemplates; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -127,7 +129,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -141,4 +143,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/InvoiceTemplatesItem.pm b/lib/NGCP/Panel/Controller/API/InvoiceTemplatesItem.pm index e67e7a12e4..819da058b2 100644 --- a/lib/NGCP/Panel/Controller/API/InvoiceTemplatesItem.pm +++ b/lib/NGCP/Panel/Controller/API/InvoiceTemplatesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::InvoiceTemplatesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -74,7 +76,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -88,4 +90,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/Invoices.pm b/lib/NGCP/Panel/Controller/API/Invoices.pm index afae4ebd20..7f8fd4d63a 100644 --- a/lib/NGCP/Panel/Controller/API/Invoices.pm +++ b/lib/NGCP/Panel/Controller/API/Invoices.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::Invoices; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -173,7 +175,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -187,4 +189,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/InvoicesItem.pm b/lib/NGCP/Panel/Controller/API/InvoicesItem.pm index 2e7e5fc1a6..c144294efe 100644 --- a/lib/NGCP/Panel/Controller/API/InvoicesItem.pm +++ b/lib/NGCP/Panel/Controller/API/InvoicesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::InvoicesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -74,7 +76,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -88,4 +90,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/MaliciousCalls.pm b/lib/NGCP/Panel/Controller/API/MaliciousCalls.pm index 583b2197ad..464511b94a 100644 --- a/lib/NGCP/Panel/Controller/API/MaliciousCalls.pm +++ b/lib/NGCP/Panel/Controller/API/MaliciousCalls.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::MaliciousCalls; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -131,7 +133,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -145,4 +147,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/MaliciousCallsItem.pm b/lib/NGCP/Panel/Controller/API/MaliciousCallsItem.pm index 5e82689da9..271818009f 100644 --- a/lib/NGCP/Panel/Controller/API/MaliciousCallsItem.pm +++ b/lib/NGCP/Panel/Controller/API/MaliciousCallsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::MaliciousCallsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -74,7 +76,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -105,4 +107,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/NcosLevels.pm b/lib/NGCP/Panel/Controller/API/NcosLevels.pm index c1ddf04071..d35e12f761 100644 --- a/lib/NGCP/Panel/Controller/API/NcosLevels.pm +++ b/lib/NGCP/Panel/Controller/API/NcosLevels.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::NcosLevels; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -127,7 +129,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -191,4 +193,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/NcosLevelsItem.pm b/lib/NGCP/Panel/Controller/API/NcosLevelsItem.pm index e4ea52704c..d54e1a0c80 100644 --- a/lib/NGCP/Panel/Controller/API/NcosLevelsItem.pm +++ b/lib/NGCP/Panel/Controller/API/NcosLevelsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::NcosLevelsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -74,7 +76,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -200,4 +202,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/NcosPatterns.pm b/lib/NGCP/Panel/Controller/API/NcosPatterns.pm index a0ea6f8476..1fb66ba6ec 100644 --- a/lib/NGCP/Panel/Controller/API/NcosPatterns.pm +++ b/lib/NGCP/Panel/Controller/API/NcosPatterns.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::NcosPatterns; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -127,7 +129,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -203,4 +205,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/NcosPatternsItem.pm b/lib/NGCP/Panel/Controller/API/NcosPatternsItem.pm index e8d88ab2ba..f81336ff65 100644 --- a/lib/NGCP/Panel/Controller/API/NcosPatternsItem.pm +++ b/lib/NGCP/Panel/Controller/API/NcosPatternsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::NcosPatternsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -74,7 +76,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -189,4 +191,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFiles.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFiles.pm index 07bd580637..4eec6cf060 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFiles.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFiles.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::PbxDeviceConfigFiles; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -62,7 +64,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -77,4 +79,7 @@ sub end : Private { return; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFilesItem.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFilesItem.pm index 992ca6c89e..f53e976e01 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFilesItem.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFilesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::PbxDeviceConfigFilesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -68,7 +70,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -82,4 +84,7 @@ sub end : Private { #$self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigs.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigs.pm index 392c28959c..b103b6a6b1 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigs.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigs.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::PbxDeviceConfigs; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -149,7 +151,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -220,4 +222,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigsItem.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigsItem.pm index 434920c371..c38a7124ca 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigsItem.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::PbxDeviceConfigsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -74,7 +76,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -149,4 +151,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinaries.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinaries.pm index 4457e2d1d6..de0b04f578 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinaries.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinaries.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::PbxDeviceFirmwareBinaries; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -62,7 +64,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -77,4 +79,7 @@ sub end : Private { return; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinariesItem.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinariesItem.pm index 71de883091..3cc1225a3b 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinariesItem.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinariesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::PbxDeviceFirmwareBinariesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -68,7 +70,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -82,4 +84,7 @@ sub end : Private { #$self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwares.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwares.pm index 6c067ab4f1..a1aa0dc1f8 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwares.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwares.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::PbxDeviceFirmwares; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -149,7 +151,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -220,4 +222,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwaresItem.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwaresItem.pm index 62564fea9a..7fbd896b6a 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwaresItem.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwaresItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::PbxDeviceFirmwaresItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -74,7 +76,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -149,4 +151,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceModelImages.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceModelImages.pm index 065b6f625f..bb83e78c98 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceModelImages.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceModelImages.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::PbxDeviceModelImages; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -72,7 +74,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -87,4 +89,7 @@ sub end : Private { return; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceModelImagesItem.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceModelImagesItem.pm index 4e01ac4702..79e3836a96 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceModelImagesItem.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceModelImagesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::PbxDeviceModelImagesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -83,7 +85,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -97,4 +99,7 @@ sub end : Private { #$self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceModels.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceModels.pm index 6696926763..23f54a41ef 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceModels.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceModels.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::PbxDeviceModels; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -186,7 +188,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -326,4 +328,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceModelsItem.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceModelsItem.pm index 806d6f68d2..a973e6bb6e 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceModelsItem.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceModelsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::PbxDeviceModelsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -78,7 +80,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -210,4 +212,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceProfiles.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceProfiles.pm index dda432fd8b..4a4d6fa7c1 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceProfiles.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceProfiles.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::PbxDeviceProfiles; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -138,7 +140,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -217,4 +219,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceProfilesItem.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceProfilesItem.pm index e0b8564f08..8a2e7af067 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceProfilesItem.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceProfilesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::PbxDeviceProfilesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -77,7 +79,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -202,4 +204,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/PbxDevices.pm b/lib/NGCP/Panel/Controller/API/PbxDevices.pm index 708e6add77..94cb390043 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDevices.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDevices.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::PbxDevices; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -150,7 +152,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -283,4 +285,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/PbxDevicesItem.pm b/lib/NGCP/Panel/Controller/API/PbxDevicesItem.pm index 153dd7fc28..869765bbc3 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDevicesItem.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDevicesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::PbxDevicesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -77,7 +79,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -198,4 +200,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/ProfilePackages.pm b/lib/NGCP/Panel/Controller/API/ProfilePackages.pm index a3325f5363..b91c540bd3 100644 --- a/lib/NGCP/Panel/Controller/API/ProfilePackages.pm +++ b/lib/NGCP/Panel/Controller/API/ProfilePackages.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::ProfilePackages; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -161,7 +163,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -244,4 +246,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/ProfilePackagesItem.pm b/lib/NGCP/Panel/Controller/API/ProfilePackagesItem.pm index 316a454588..3b52cf6d17 100644 --- a/lib/NGCP/Panel/Controller/API/ProfilePackagesItem.pm +++ b/lib/NGCP/Panel/Controller/API/ProfilePackagesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::ProfilePackagesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -81,7 +83,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -251,4 +253,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/ProfilePreferenceDefs.pm b/lib/NGCP/Panel/Controller/API/ProfilePreferenceDefs.pm index e5698dd7fc..a9b20961b9 100644 --- a/lib/NGCP/Panel/Controller/API/ProfilePreferenceDefs.pm +++ b/lib/NGCP/Panel/Controller/API/ProfilePreferenceDefs.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::ProfilePreferenceDefs; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -113,7 +115,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -127,4 +129,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/ProfilePreferences.pm b/lib/NGCP/Panel/Controller/API/ProfilePreferences.pm index e422097d50..71615aee22 100644 --- a/lib/NGCP/Panel/Controller/API/ProfilePreferences.pm +++ b/lib/NGCP/Panel/Controller/API/ProfilePreferences.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::ProfilePreferences; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -108,7 +110,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -122,4 +124,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/ProfilePreferencesItem.pm b/lib/NGCP/Panel/Controller/API/ProfilePreferencesItem.pm index ef145a0feb..8fd05cb885 100644 --- a/lib/NGCP/Panel/Controller/API/ProfilePreferencesItem.pm +++ b/lib/NGCP/Panel/Controller/API/ProfilePreferencesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::ProfilePreferencesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -84,7 +86,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -226,4 +228,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/Reminders.pm b/lib/NGCP/Panel/Controller/API/Reminders.pm index 7963f81b36..4dfdcc4c5f 100644 --- a/lib/NGCP/Panel/Controller/API/Reminders.pm +++ b/lib/NGCP/Panel/Controller/API/Reminders.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::Reminders; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -131,7 +133,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -219,4 +221,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/RemindersItem.pm b/lib/NGCP/Panel/Controller/API/RemindersItem.pm index d8dfdae0a9..c0e7ea9895 100644 --- a/lib/NGCP/Panel/Controller/API/RemindersItem.pm +++ b/lib/NGCP/Panel/Controller/API/RemindersItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::RemindersItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -81,7 +83,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -243,4 +245,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/Resellers.pm b/lib/NGCP/Panel/Controller/API/Resellers.pm index ba1aade165..53656338cb 100644 --- a/lib/NGCP/Panel/Controller/API/Resellers.pm +++ b/lib/NGCP/Panel/Controller/API/Resellers.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::Resellers; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -128,7 +130,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -209,4 +211,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/ResellersItem.pm b/lib/NGCP/Panel/Controller/API/ResellersItem.pm index d9ba510665..40e56f08f6 100644 --- a/lib/NGCP/Panel/Controller/API/ResellersItem.pm +++ b/lib/NGCP/Panel/Controller/API/ResellersItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::ResellersItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -82,7 +84,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -222,4 +224,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/RewriteRuleSets.pm b/lib/NGCP/Panel/Controller/API/RewriteRuleSets.pm index eb17bc22cc..26fd1ce655 100644 --- a/lib/NGCP/Panel/Controller/API/RewriteRuleSets.pm +++ b/lib/NGCP/Panel/Controller/API/RewriteRuleSets.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::RewriteRuleSets; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -149,7 +151,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -254,4 +256,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/RewriteRuleSetsItem.pm b/lib/NGCP/Panel/Controller/API/RewriteRuleSetsItem.pm index 0cb263e675..c5362d1d91 100644 --- a/lib/NGCP/Panel/Controller/API/RewriteRuleSetsItem.pm +++ b/lib/NGCP/Panel/Controller/API/RewriteRuleSetsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::RewriteRuleSetsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -77,7 +79,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -198,4 +200,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/RewriteRules.pm b/lib/NGCP/Panel/Controller/API/RewriteRules.pm index 816da9362a..bf7095a9b6 100644 --- a/lib/NGCP/Panel/Controller/API/RewriteRules.pm +++ b/lib/NGCP/Panel/Controller/API/RewriteRules.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::RewriteRules; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -138,7 +140,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -212,4 +214,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/RewriteRulesItem.pm b/lib/NGCP/Panel/Controller/API/RewriteRulesItem.pm index 5b3e56f869..501c6671a9 100644 --- a/lib/NGCP/Panel/Controller/API/RewriteRulesItem.pm +++ b/lib/NGCP/Panel/Controller/API/RewriteRulesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::RewriteRulesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -77,7 +79,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -197,4 +199,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/Root.pm b/lib/NGCP/Panel/Controller/API/Root.pm index bfb14a1236..27b1027940 100644 --- a/lib/NGCP/Panel/Controller/API/Root.pm +++ b/lib/NGCP/Panel/Controller/API/Root.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::Root; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +#use namespace::sweep; +use Moose; use Encode qw(encode); use Clone qw/clone/; use HTTP::Headers qw(); @@ -190,7 +192,7 @@ sub OPTIONS : Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), $self->collections_link_headers, )); $c->response->content_type('application/json'); @@ -379,4 +381,6 @@ sub end : Private { return 1; } +no Moose; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SoundFileRecordings.pm b/lib/NGCP/Panel/Controller/API/SoundFileRecordings.pm index 6de818d2b6..660069c15f 100644 --- a/lib/NGCP/Panel/Controller/API/SoundFileRecordings.pm +++ b/lib/NGCP/Panel/Controller/API/SoundFileRecordings.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SoundFileRecordings; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -62,7 +64,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -77,4 +79,7 @@ sub end : Private { return; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SoundFileRecordingsItem.pm b/lib/NGCP/Panel/Controller/API/SoundFileRecordingsItem.pm index 901772204a..76900db53a 100644 --- a/lib/NGCP/Panel/Controller/API/SoundFileRecordingsItem.pm +++ b/lib/NGCP/Panel/Controller/API/SoundFileRecordingsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SoundFileRecordingsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -74,7 +76,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -88,4 +90,7 @@ sub end : Private { #$self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SoundFiles.pm b/lib/NGCP/Panel/Controller/API/SoundFiles.pm index 1a93b01f90..630bdaab93 100644 --- a/lib/NGCP/Panel/Controller/API/SoundFiles.pm +++ b/lib/NGCP/Panel/Controller/API/SoundFiles.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SoundFiles; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -129,7 +131,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -177,4 +179,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SoundFilesItem.pm b/lib/NGCP/Panel/Controller/API/SoundFilesItem.pm index e5f7389b0b..839d9a10da 100644 --- a/lib/NGCP/Panel/Controller/API/SoundFilesItem.pm +++ b/lib/NGCP/Panel/Controller/API/SoundFilesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SoundFilesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -74,7 +76,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -156,4 +158,7 @@ sub end : Private { return; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SoundHandles.pm b/lib/NGCP/Panel/Controller/API/SoundHandles.pm index 340b94fc16..abd0004e0b 100644 --- a/lib/NGCP/Panel/Controller/API/SoundHandles.pm +++ b/lib/NGCP/Panel/Controller/API/SoundHandles.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SoundHandles; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -129,7 +131,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -143,4 +145,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SoundHandlesItem.pm b/lib/NGCP/Panel/Controller/API/SoundHandlesItem.pm index 2201c8195f..5a0797dcbb 100644 --- a/lib/NGCP/Panel/Controller/API/SoundHandlesItem.pm +++ b/lib/NGCP/Panel/Controller/API/SoundHandlesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SoundHandlesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -74,7 +76,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -88,4 +90,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SoundSets.pm b/lib/NGCP/Panel/Controller/API/SoundSets.pm index 2631a5f12f..c37ab3f5ca 100644 --- a/lib/NGCP/Panel/Controller/API/SoundSets.pm +++ b/lib/NGCP/Panel/Controller/API/SoundSets.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SoundSets; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -149,7 +151,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -255,4 +257,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SoundSetsItem.pm b/lib/NGCP/Panel/Controller/API/SoundSetsItem.pm index d701fb15c4..abb97f7918 100644 --- a/lib/NGCP/Panel/Controller/API/SoundSetsItem.pm +++ b/lib/NGCP/Panel/Controller/API/SoundSetsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SoundSetsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -81,7 +83,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -259,4 +261,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SpeedDials.pm b/lib/NGCP/Panel/Controller/API/SpeedDials.pm index 06133f4170..b20224c584 100644 --- a/lib/NGCP/Panel/Controller/API/SpeedDials.pm +++ b/lib/NGCP/Panel/Controller/API/SpeedDials.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SpeedDials; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -133,7 +135,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -148,4 +150,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SpeedDialsItem.pm b/lib/NGCP/Panel/Controller/API/SpeedDialsItem.pm index 290cab0da6..3050e3c6dc 100644 --- a/lib/NGCP/Panel/Controller/API/SpeedDialsItem.pm +++ b/lib/NGCP/Panel/Controller/API/SpeedDialsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SpeedDialsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -84,7 +86,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -225,4 +227,7 @@ sub end : Private { return 1; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SubscriberPreferenceDefs.pm b/lib/NGCP/Panel/Controller/API/SubscriberPreferenceDefs.pm index f5a3c2c7d1..7eb11578d8 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberPreferenceDefs.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberPreferenceDefs.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SubscriberPreferenceDefs; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -113,7 +115,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -127,4 +129,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SubscriberPreferences.pm b/lib/NGCP/Panel/Controller/API/SubscriberPreferences.pm index b98dca1c09..1abd0d767b 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberPreferences.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberPreferences.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SubscriberPreferences; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -153,7 +155,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -167,4 +169,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SubscriberPreferencesItem.pm b/lib/NGCP/Panel/Controller/API/SubscriberPreferencesItem.pm index a8ca1b8b99..cdadd511ac 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberPreferencesItem.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberPreferencesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SubscriberPreferencesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -91,7 +93,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -242,4 +244,7 @@ sub end : Private { return; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm b/lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm index 31f3c95547..9281b4c23f 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SubscriberProfileSets; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -138,7 +140,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -215,4 +217,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SubscriberProfileSetsItem.pm b/lib/NGCP/Panel/Controller/API/SubscriberProfileSetsItem.pm index deab59733f..4dde136087 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberProfileSetsItem.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberProfileSetsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SubscriberProfileSetsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -81,7 +83,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -272,4 +274,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SubscriberProfiles.pm b/lib/NGCP/Panel/Controller/API/SubscriberProfiles.pm index 9b3fff03e1..085ae200bf 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberProfiles.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberProfiles.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SubscriberProfiles; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -138,7 +140,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -253,4 +255,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SubscriberProfilesItem.pm b/lib/NGCP/Panel/Controller/API/SubscriberProfilesItem.pm index 35151dccf0..ed92d2b6e0 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberProfilesItem.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberProfilesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SubscriberProfilesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -81,7 +83,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -266,4 +268,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SubscriberRegistrations.pm b/lib/NGCP/Panel/Controller/API/SubscriberRegistrations.pm index 229831aa35..1ceea85a9e 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberRegistrations.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberRegistrations.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SubscriberRegistrations; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -149,7 +151,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -185,4 +187,6 @@ sub end : Private { $self->log_response($c); } +no Moose; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SubscriberRegistrationsItem.pm b/lib/NGCP/Panel/Controller/API/SubscriberRegistrationsItem.pm index 64482311d9..78bd56ac70 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberRegistrationsItem.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberRegistrationsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SubscriberRegistrationsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -78,7 +80,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -189,4 +191,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/Subscribers.pm b/lib/NGCP/Panel/Controller/API/Subscribers.pm index 359e556958..cc624a4b48 100644 --- a/lib/NGCP/Panel/Controller/API/Subscribers.pm +++ b/lib/NGCP/Panel/Controller/API/Subscribers.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::Subscribers; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -315,7 +317,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -420,4 +422,7 @@ sub end : Private { return; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SubscribersItem.pm b/lib/NGCP/Panel/Controller/API/SubscribersItem.pm index 9078be9286..dc12af116d 100644 --- a/lib/NGCP/Panel/Controller/API/SubscribersItem.pm +++ b/lib/NGCP/Panel/Controller/API/SubscribersItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SubscribersItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -95,7 +97,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -291,4 +293,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SystemContacts.pm b/lib/NGCP/Panel/Controller/API/SystemContacts.pm index 6d9dcff9cf..9b064e3694 100644 --- a/lib/NGCP/Panel/Controller/API/SystemContacts.pm +++ b/lib/NGCP/Panel/Controller/API/SystemContacts.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SystemContacts; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -127,7 +129,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -188,4 +190,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/SystemContactsItem.pm b/lib/NGCP/Panel/Controller/API/SystemContactsItem.pm index fd15e88e82..43ab8238d9 100644 --- a/lib/NGCP/Panel/Controller/API/SystemContactsItem.pm +++ b/lib/NGCP/Panel/Controller/API/SystemContactsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::SystemContactsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -82,7 +84,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -251,4 +253,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/TopupCash.pm b/lib/NGCP/Panel/Controller/API/TopupCash.pm index 63cde3a903..69be546df7 100644 --- a/lib/NGCP/Panel/Controller/API/TopupCash.pm +++ b/lib/NGCP/Panel/Controller/API/TopupCash.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::TopupCash; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -65,7 +67,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -174,4 +176,7 @@ sub get_form { return NGCP::Panel::Form::Topup::CashAPI->new(ctx => $c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/TopupLogs.pm b/lib/NGCP/Panel/Controller/API/TopupLogs.pm index d5b3fa09d5..079a3af246 100644 --- a/lib/NGCP/Panel/Controller/API/TopupLogs.pm +++ b/lib/NGCP/Panel/Controller/API/TopupLogs.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::TopupLogs; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -231,7 +233,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -244,3 +246,6 @@ sub end : Private { $self->log_response($c); } + +no Moose; +1; diff --git a/lib/NGCP/Panel/Controller/API/TopupLogsItem.pm b/lib/NGCP/Panel/Controller/API/TopupLogsItem.pm index 189ca32460..ca7d60825e 100644 --- a/lib/NGCP/Panel/Controller/API/TopupLogsItem.pm +++ b/lib/NGCP/Panel/Controller/API/TopupLogsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::TopupLogsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -74,7 +76,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -88,4 +90,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/TopupVouchers.pm b/lib/NGCP/Panel/Controller/API/TopupVouchers.pm index b6c22210a6..87d94692eb 100644 --- a/lib/NGCP/Panel/Controller/API/TopupVouchers.pm +++ b/lib/NGCP/Panel/Controller/API/TopupVouchers.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::TopupVouchers; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -65,7 +67,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -176,4 +178,7 @@ sub get_form { return NGCP::Panel::Form::Topup::VoucherAPI->new(ctx => $c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/TrustedSources.pm b/lib/NGCP/Panel/Controller/API/TrustedSources.pm index ab06b58800..fd80e1a2fb 100644 --- a/lib/NGCP/Panel/Controller/API/TrustedSources.pm +++ b/lib/NGCP/Panel/Controller/API/TrustedSources.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::TrustedSources; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -131,7 +133,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -207,4 +209,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/TrustedSourcesItem.pm b/lib/NGCP/Panel/Controller/API/TrustedSourcesItem.pm index d381ed6f45..d4d100a071 100644 --- a/lib/NGCP/Panel/Controller/API/TrustedSourcesItem.pm +++ b/lib/NGCP/Panel/Controller/API/TrustedSourcesItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::TrustedSourcesItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -81,7 +83,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -243,4 +245,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/VoicemailRecordings.pm b/lib/NGCP/Panel/Controller/API/VoicemailRecordings.pm index f0c10c4fb6..0b5aa49a81 100644 --- a/lib/NGCP/Panel/Controller/API/VoicemailRecordings.pm +++ b/lib/NGCP/Panel/Controller/API/VoicemailRecordings.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::VoicemailRecordings; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -55,7 +57,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -70,4 +72,7 @@ sub end : Private { return; } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/VoicemailRecordingsItem.pm b/lib/NGCP/Panel/Controller/API/VoicemailRecordingsItem.pm index 840d7e315e..2927e6c7dc 100644 --- a/lib/NGCP/Panel/Controller/API/VoicemailRecordingsItem.pm +++ b/lib/NGCP/Panel/Controller/API/VoicemailRecordingsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::VoicemailRecordingsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -66,7 +68,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -80,4 +82,6 @@ sub end : Private { #$self->log_response($c); } +no Moose; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/VoicemailSettings.pm b/lib/NGCP/Panel/Controller/API/VoicemailSettings.pm index 25006c9ad0..7979cf847f 100644 --- a/lib/NGCP/Panel/Controller/API/VoicemailSettings.pm +++ b/lib/NGCP/Panel/Controller/API/VoicemailSettings.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::VoicemailSettings; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -131,7 +133,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -145,4 +147,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/VoicemailSettingsItem.pm b/lib/NGCP/Panel/Controller/API/VoicemailSettingsItem.pm index 2d95150279..1bc709624f 100644 --- a/lib/NGCP/Panel/Controller/API/VoicemailSettingsItem.pm +++ b/lib/NGCP/Panel/Controller/API/VoicemailSettingsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::VoicemailSettingsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -81,7 +83,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -218,4 +220,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/Voicemails.pm b/lib/NGCP/Panel/Controller/API/Voicemails.pm index 1fd90d5681..af80830f40 100644 --- a/lib/NGCP/Panel/Controller/API/Voicemails.pm +++ b/lib/NGCP/Panel/Controller/API/Voicemails.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::Voicemails; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -139,7 +141,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -153,4 +155,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/VoicemailsItem.pm b/lib/NGCP/Panel/Controller/API/VoicemailsItem.pm index 828e65a19c..c0de3a190a 100644 --- a/lib/NGCP/Panel/Controller/API/VoicemailsItem.pm +++ b/lib/NGCP/Panel/Controller/API/VoicemailsItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::VoicemailsItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -75,7 +77,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -190,4 +192,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/Vouchers.pm b/lib/NGCP/Panel/Controller/API/Vouchers.pm index 20c027fb40..b1ab68c746 100644 --- a/lib/NGCP/Panel/Controller/API/Vouchers.pm +++ b/lib/NGCP/Panel/Controller/API/Vouchers.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::Vouchers; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use boolean qw(true); use Data::HAL qw(); use Data::HAL::Link qw(); @@ -138,7 +140,7 @@ sub OPTIONS :Allow { my ($self, $c) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Post => 'application/hal+json; profile=http://purl.org/sipwise/ngcp-api/#rel-'.$self->resource_name, )); $c->response->content_type('application/json'); @@ -212,4 +214,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/API/VouchersItem.pm b/lib/NGCP/Panel/Controller/API/VouchersItem.pm index eccd2d5aad..dced7e7c7b 100644 --- a/lib/NGCP/Panel/Controller/API/VouchersItem.pm +++ b/lib/NGCP/Panel/Controller/API/VouchersItem.pm @@ -1,6 +1,8 @@ package NGCP::Panel::Controller::API::VouchersItem; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; +use Moose; +#use namespace::sweep; use HTTP::Headers qw(); use HTTP::Status qw(:constants); use MooseX::ClassAttribute qw(class_has); @@ -74,7 +76,7 @@ sub OPTIONS :Allow { my ($self, $c, $id) = @_; my $allowed_methods = $self->allowed_methods_filtered($c); $c->response->headers(HTTP::Headers->new( - Allow => $allowed_methods->join(', '), + Allow => join(', ', @{ $allowed_methods }), Accept_Patch => 'application/json-patch+json', )); $c->response->content_type('application/json'); @@ -202,4 +204,7 @@ sub end : Private { $self->log_response($c); } +no Moose; +1; + # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Controller/Administrator.pm b/lib/NGCP/Panel/Controller/Administrator.pm index 12b8169987..199ba10906 100644 --- a/lib/NGCP/Panel/Controller/Administrator.pm +++ b/lib/NGCP/Panel/Controller/Administrator.pm @@ -1,7 +1,8 @@ package NGCP::Panel::Controller::Administrator; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; -BEGIN { extends 'Catalyst::Controller'; } +#use namespace::sweep; +BEGIN { use base 'Catalyst::Controller'; } use HTTP::Headers qw(); use NGCP::Panel::Form::Administrator::Reseller; use NGCP::Panel::Form::Administrator::Admin; @@ -80,7 +81,7 @@ sub create :Chained('list_admin') :PathPart('create') :Args(0) { my $form; my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); if($c->user->is_superuser) { $form = NGCP::Panel::Form::Administrator::Admin->new(ctx => $c); } else { @@ -109,12 +110,12 @@ sub create :Chained('list_admin') :PathPart('create') :Args(0) { } $c->stash->{admins}->create($form->values); delete $c->session->{created_objects}->{reseller}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Administrator successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create administrator'), @@ -135,8 +136,8 @@ sub base :Chained('list_admin') :PathPart('') :CaptureArgs(1) { $c->detach('/denied_page') unless($c->user->is_master); - unless ($administrator_id && $administrator_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless ($administrator_id && is_int($administrator_id)) { + NGCP::Panel::Utils::Message::error( c => $c, data => { id => $administrator_id }, desc => $c->loc('Invalid administrator id detected'), @@ -145,7 +146,7 @@ sub base :Chained('list_admin') :PathPart('') :CaptureArgs(1) { } $c->stash(administrator => $c->stash->{admins}->find($administrator_id)); unless($c->stash->{administrator}) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, desc => $c->loc('Administrator not found'), ); @@ -159,7 +160,7 @@ sub edit :Chained('base') :PathPart('edit') :Args(0) { my $form; my $params = { $c->stash->{administrator}->get_inflated_columns }; $params->{reseller}{id} = delete $params->{reseller_id}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); if($c->user->is_superuser) { $form = NGCP::Panel::Form::Administrator::Admin->new(ctx => $c); } else { @@ -195,13 +196,13 @@ sub edit :Chained('base') :PathPart('edit') :Args(0) { delete $form->values->{md5pass} unless length $form->values->{md5pass}; $c->stash->{administrator}->update($form->values); delete $c->session->{created_objects}->{reseller}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{administrator}->get_inflated_columns }, desc => $c->loc('Administrator successfully updated'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => { $c->stash->{administrator}->get_inflated_columns }, @@ -221,7 +222,7 @@ sub delete :Chained('base') :PathPart('delete') :Args(0) { my ($self, $c) = @_; if($c->stash->{administrator}->id == $c->user->id) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, data => { $c->stash->{administrator}->get_inflated_columns }, desc => $c->loc('Cannot delete myself'), @@ -230,13 +231,13 @@ sub delete :Chained('base') :PathPart('delete') :Args(0) { } try { $c->stash->{administrator}->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{administrator}->get_inflated_columns }, desc => $c->loc('Administrator successfully deleted'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => { $c->stash->{administrator}->get_inflated_columns }, @@ -255,7 +256,7 @@ sub api_key :Chained('base') :PathPart('api_key') :Args(0) { try { $cert = $c->model('CA')->make_client($c, $serial); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => { $c->stash->{administrator}->get_inflated_columns }, @@ -326,6 +327,7 @@ sub api_key :Chained('base') :PathPart('api_key') :Args(0) { } __PACKAGE__->meta->make_immutable; +1; __END__ diff --git a/lib/NGCP/Panel/Controller/Billing.pm b/lib/NGCP/Panel/Controller/Billing.pm index 8117ecf21d..a172ac1b56 100644 --- a/lib/NGCP/Panel/Controller/Billing.pm +++ b/lib/NGCP/Panel/Controller/Billing.pm @@ -1,8 +1,9 @@ package NGCP::Panel::Controller::Billing; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; use DateTime::Format::ISO8601; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use NGCP::Panel::Form::BillingProfile::Admin; use NGCP::Panel::Form::BillingProfile::Reseller; @@ -92,8 +93,8 @@ sub ajax_filter_reseller :Chained('profile_list') :PathPart('ajax/filter_reselle sub base :Chained('profile_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $profile_id) = @_; - unless($profile_id && $profile_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($profile_id && is_int($profile_id)) { + NGCP::Panel::Utils::Message::error( c => $c, data => { id => $profile_id }, desc => $c->loc('Invalid profile id detected!'), @@ -110,7 +111,7 @@ sub base :Chained('profile_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{profiles_rs}->find($profile_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, data => { id => $profile_id }, desc => $c->loc('Billing Profile does not exist!'), @@ -133,7 +134,7 @@ sub process_edit :Private { my $form; my $params = $c->stash->{profile}; $params->{reseller}{id} = delete $params->{reseller_id}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); if( $duplicate ) { NGCP::Panel::Utils::Billing::get_billing_profile_uniq_params( params => $params ); if($c->user->is_superuser) { @@ -185,12 +186,12 @@ sub process_edit :Private { }); delete $c->session->{created_objects}->{reseller}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Billing profile successfully updated'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update billing profile'), @@ -224,7 +225,7 @@ sub process_create :Private { my $form; my $params = {}; $params->{reseller}{id} = delete $params->{reseller_id}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); if($c->user->is_superuser && !$no_reseller) { $form = NGCP::Panel::Form::BillingProfile::Admin->new; } else { @@ -272,12 +273,12 @@ sub process_create :Private { $c->session->{created_objects}->{billing_profile} = { id => $profile->id }; delete $c->session->{created_objects}->{reseller}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Billing profile successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create billing profile'), @@ -301,7 +302,7 @@ sub terminate :Chained('base') :PathPart('terminate') :Args(0) { my $profile = $c->stash->{profile_result}; if ($profile->id == 1) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, desc => $c->loc('Cannot terminate default billing profile with the id 1'), ); @@ -320,13 +321,13 @@ sub terminate :Chained('base') :PathPart('terminate') :Args(0) { status => 'terminated', terminate_timestamp => NGCP::Panel::Utils::DateTime::current_local, }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => $c->stash->{profile}, desc => $c->loc('Billing profile successfully terminated'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => $c->stash->{profile}, @@ -356,9 +357,9 @@ sub fees :Chained('fees_list') :PathPart('') :Args(0) { sub fees_base :Chained('fees_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $fee_id) = @_; - unless($fee_id && $fee_id->is_integer) { + unless($fee_id && is_int($fee_id)) { $fee_id //= ''; - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, data => $c->stash->{profile}, log => $fee_id, @@ -372,7 +373,7 @@ sub fees_base :Chained('fees_list') :PathPart('') :CaptureArgs(1) { ->search(undef, {join => 'billing_zone',}) ->find($fee_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, data => $c->stash->{profile}, log => $fee_id, @@ -400,7 +401,7 @@ sub fees_create :Chained('fees_list') :PathPart('create') :Args(0) { my $posted = ($c->request->method eq 'POST'); my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); my $profile_id = $c->stash->{profile}->{id}; my $form = NGCP::Panel::Form::BillingFee->new; $form->process( @@ -418,7 +419,7 @@ sub fees_create :Chained('fees_list') :PathPart('create') :Args(0) { $c->stash->{'profile_result'} ->billing_fees->create($form->values); delete $c->session->{created_objects}->{billing_zone}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Billing Fee successfully created!'), ); @@ -446,7 +447,7 @@ sub fees_upload :Chained('fees_list') :PathPart('upload') :Args(0) { # TODO: check by formhandler? unless($upload) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, desc => $c->loc('No Billing Fee file specified!'), ); @@ -470,12 +471,12 @@ sub fees_upload :Chained('fees_list') :PathPart('upload') :Args(0) { ); }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $$text_success, ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to upload Billing Fees'), @@ -511,7 +512,7 @@ sub fees_edit :Chained('fees_base') :PathPart('edit') :Args(0) { my $posted = ($c->request->method eq 'POST'); my $params = $c->stash->{fee}; $params->{billing_zone}{id} = delete $params->{billing_zone_id}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); my $form = NGCP::Panel::Form::BillingFee->new; $form->field('billing_zone')->field('id')->ajax_src('../../zones/ajax'); $form->process( @@ -531,7 +532,7 @@ sub fees_edit :Chained('fees_base') :PathPart('edit') :Args(0) { $c->stash->{'fee_result'} ->update($form->values); delete $c->session->{created_objects}->{billing_zone}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Billing fee successfully changed!'), ); @@ -547,7 +548,7 @@ sub fees_delete :Chained('fees_base') :PathPart('delete') :Args(0) { my ($self, $c) = @_; unless ( defined($c->stash->{'fee_result'}) ) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, data => $c->stash->{profile}, desc => $c->loc('Billing fee not found!'), @@ -556,7 +557,7 @@ sub fees_delete :Chained('fees_base') :PathPart('delete') :Args(0) { } $c->stash->{'fee_result'}->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => $c->stash->{profile}, desc => $c->loc('Billing fee successfully deleted!'), @@ -601,12 +602,12 @@ sub zones_create :Chained('zones_list') :PathPart('create') :Args(0) { try { my $zone = $c->stash->{'profile_result'}->billing_zones->create($form->values); $c->session->{created_objects}->{billing_zone} = { id => $zone->id }; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Billing Zone successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create billing zone'), @@ -625,9 +626,9 @@ sub zones :Chained('zones_list') :PathPart('') :Args(0) { sub zones_base :Chained('zones_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $zone_id) = @_; - unless($zone_id && $zone_id->is_integer) { + unless($zone_id && is_int($zone_id)) { $zone_id //= ''; - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, data => $c->stash->{profile}, log => $zone_id, @@ -639,7 +640,7 @@ sub zones_base :Chained('zones_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{'profile_result'}->billing_zones ->find($zone_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, data => $c->stash->{profile}, log => $zone_id, @@ -656,13 +657,13 @@ sub zones_delete :Chained('zones_base') :PathPart('delete') :Args(0) { my $zone_info = { $c->stash->{zone_result}->get_inflated_columns }; try { $c->stash->{zone_result}->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => $zone_info, desc => $c->loc('Billing zone successfully deleted'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => $zone_info, @@ -700,7 +701,7 @@ sub peaktime_weekdays_base :Chained('peaktimes_list') :PathPart('weekday') :Capt my ($self, $c, $weekday_id) = @_; unless (defined $weekday_id && $weekday_id >= 0 && $weekday_id <= 6) { $weekday_id //= ''; - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, data => $c->stash->{profile}, log => $weekday_id, @@ -727,7 +728,7 @@ sub peaktime_weekdays_edit :Chained('peaktime_weekdays_base') :PathPart('edit') $form->values->{end} = '23:59:59' unless($form->values->{end}); $c->stash->{'weekdays_result'} ->create($form->values); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { %{$c->request->params}, billing_profile_id => $c->stash->{profile}{id}, }, @@ -740,7 +741,7 @@ sub peaktime_weekdays_edit :Chained('peaktime_weekdays_base') :PathPart('edit') my $rs = $c->stash->{weekdays_result} ->find($delete_param); unless ($rs) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, desc => $c->loc('The timerange you wanted to delete does not exist'), ); @@ -750,7 +751,7 @@ sub peaktime_weekdays_edit :Chained('peaktime_weekdays_base') :PathPart('edit') return; } $rs->delete(); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $rs->get_inflated_columns }, desc => $c->loc('Timerange has been successfully deleted'), @@ -811,9 +812,9 @@ sub peaktime_specials_ajax :Chained('peaktimes_list') :PathPart('ajax') :Args(0) sub peaktime_specials_base :Chained('peaktimes_list') :PathPart('date') :CaptureArgs(1) { my ($self, $c, $special_id) = @_; - unless($special_id && $special_id->is_integer) { + unless($special_id && is_int($special_id)) { $special_id //= ''; - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, desc => $c->loc('Invalid peaktime date id detected!'), ); @@ -824,7 +825,7 @@ sub peaktime_specials_base :Chained('peaktimes_list') :PathPart('date') :Capture my $res = $c->stash->{'profile_result'}->billing_peaktime_specials ->find($special_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, data => $c->stash->{profile}, log => $special_id, @@ -858,14 +859,14 @@ sub peaktime_specials_edit :Chained('peaktime_specials_base') :PathPart('edit') if($posted && $form->validated) { try { $c->stash->{special_result}->update($form->values); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { %{$c->request->params}, billing_profile_id => $c->stash->{profile}{id}, }, desc => $c->loc('Special offpeak entry successfully updated'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => { %{$c->request->params}, @@ -885,13 +886,13 @@ sub peaktime_specials_delete :Chained('peaktime_specials_base') :PathPart('delet my $special_result_info = { $c->stash->{special_result}->get_inflated_columns }; try { $c->stash->{special_result}->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => $special_result_info, desc => $c->loc('Special offpeak entry successfully deleted'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => $special_result_info, @@ -923,14 +924,14 @@ sub peaktime_specials_create :Chained('peaktimes_list') :PathPart('date/create') try { $c->stash->{'profile_result'}->billing_peaktime_specials ->create($form->values); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { %{$c->request->params}, billing_profile_id => $c->stash->{profile}{id}, }, desc => $c->loc('Special offpeak entry successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => { %{$c->request->params}, diff --git a/lib/NGCP/Panel/Controller/Callflow.pm b/lib/NGCP/Panel/Controller/Callflow.pm index a16079da93..ae2890f27f 100644 --- a/lib/NGCP/Panel/Controller/Callflow.pm +++ b/lib/NGCP/Panel/Controller/Callflow.pm @@ -1,7 +1,8 @@ package NGCP::Panel::Controller::Callflow; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use NGCP::Panel::Utils::Callflow; use NGCP::Panel::Utils::Navigation; diff --git a/lib/NGCP/Panel/Controller/Calls.pm b/lib/NGCP/Panel/Controller/Calls.pm index bd6d09fe20..7b19d188ee 100644 --- a/lib/NGCP/Panel/Controller/Calls.pm +++ b/lib/NGCP/Panel/Controller/Calls.pm @@ -1,8 +1,9 @@ package NGCP::Panel::Controller::Calls; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; use DateTime::Format::Strptime; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use NGCP::Panel::Utils::Navigation; use Number::Phone; diff --git a/lib/NGCP/Panel/Controller/Contact.pm b/lib/NGCP/Panel/Controller/Contact.pm index ec4557e227..2b4ca381a7 100644 --- a/lib/NGCP/Panel/Controller/Contact.pm +++ b/lib/NGCP/Panel/Controller/Contact.pm @@ -1,8 +1,9 @@ package NGCP::Panel::Controller::Contact; +use NGCP::Panel::Utils::Generic qw(:all); use Geography::Countries qw/countries country CNT_I_FLAG CNT_I_CODE2/; use Sipwise::Base; -use namespace::sweep; -BEGIN { extends 'Catalyst::Controller'; } +#use namespace::sweep; +BEGIN { use base 'Catalyst::Controller'; } use NGCP::Panel::Form::Contact::Reseller; use NGCP::Panel::Form::Contact::Admin; @@ -48,7 +49,7 @@ sub create :Chained('list_contact') :PathPart('create') :Args(0) { my $posted = ($c->request->method eq 'POST'); my $form; my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); if($c->user->is_superuser && $no_reseller) { $form = NGCP::Panel::Form::Contact::Reseller->new; $params->{reseller}{id} = $c->user->reseller_id; @@ -81,12 +82,12 @@ sub create :Chained('list_contact') :PathPart('create') :Args(0) { my $contact = $c->stash->{contacts}->create($form->values); delete $c->session->{created_objects}->{reseller}; $c->session->{created_objects}->{contact} = { id => $contact->id }; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Contact successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create contact'), @@ -108,9 +109,9 @@ sub create_without_reseller :Chained('list_contact') :PathPart('create/noreselle sub base :Chained('list_contact') :PathPart('') :CaptureArgs(1) { my ($self, $c, $contact_id) = @_; - unless($contact_id && $contact_id->is_int) { + unless($contact_id && is_int($contact_id)) { $contact_id ||= ''; - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, data => { id => $contact_id }, desc => $c->loc('Invalid contact id detected'), @@ -120,7 +121,7 @@ sub base :Chained('list_contact') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{contacts}; $c->stash(contact => $res->find($contact_id)); unless($c->stash->{contact}) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, data => { $c->stash->{contact}->get_inflated_columns }, desc => $c->loc('Contact not found'), @@ -135,7 +136,7 @@ sub edit :Chained('base') :PathPart('edit') :Args(0) { my $posted = ($c->request->method eq 'POST'); my $form; my $params = { $c->stash->{contact}->get_inflated_columns }; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); $params->{country}{id} = delete $params->{country}; if($c->user->is_superuser && $no_reseller) { $form = NGCP::Panel::Form::Contact::Reseller->new; @@ -170,13 +171,13 @@ sub edit :Chained('base') :PathPart('edit') :Args(0) { delete $form->values->{reseller}; $form->values->{country} = $form->values->{country}{id}; $c->stash->{contact}->update($form->values); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Contact successfully changed'), ); delete $c->session->{created_objects}->{reseller}; } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update contact'), @@ -202,13 +203,13 @@ sub delete :Chained('base') :PathPart('delete') :Args(0) { try { $c->stash->{contact}->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{contact}->get_inflated_columns }, desc => $c->loc('Contact successfully deleted'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => { $c->stash->{contact}->get_inflated_columns }, diff --git a/lib/NGCP/Panel/Controller/Contract.pm b/lib/NGCP/Panel/Controller/Contract.pm index d78c3aaf4a..575afb8f78 100644 --- a/lib/NGCP/Panel/Controller/Contract.pm +++ b/lib/NGCP/Panel/Controller/Contract.pm @@ -1,7 +1,8 @@ package NGCP::Panel::Controller::Contract; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use NGCP::Panel::Form::Contract::Contract; use NGCP::Panel::Form::Contract::PeeringReseller; use NGCP::Panel::Utils::Message; @@ -60,8 +61,8 @@ sub root :Chained('contract_list') :PathPart('') :Args(0) { sub base :Chained('contract_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $contract_id) = @_; - unless($contract_id && $contract_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($contract_id && is_int($contract_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid contract id detected!', desc => $c->loc('Invalid contract id detected!'), @@ -79,7 +80,7 @@ sub base :Chained('contract_list') :PathPart('') :CaptureArgs(1) { my $contract_first = $contract_rs->first; unless(defined($contract_first)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Contract does not exist', desc => $c->loc('Contract does not exist'), @@ -124,7 +125,7 @@ sub edit :Chained('base') :PathPart('edit') :Args(0) { $params->{external_id} = $contract->external_id; $params->{status} = $contract->status; } - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); my ($form, $is_peering_reseller); if (defined $billing_mapping->product && grep {$billing_mapping->product->handle eq $_} @@ -219,13 +220,13 @@ sub edit :Chained('base') :PathPart('edit') :Args(0) { delete $c->session->{created_objects}->{contact}; delete $c->session->{created_objects}->{billing_profile}; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $contract->get_inflated_columns }, desc => $c->loc('Contract successfully changed!'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => { $contract->get_inflated_columns }, @@ -244,7 +245,7 @@ sub terminate :Chained('base') :PathPart('terminate') :Args(0) { my $contract = $c->stash->{contract}; if ($contract->id == 1) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, desc => $c->loc('Cannot terminate contract with the id 1'), ); @@ -269,13 +270,13 @@ sub terminate :Chained('base') :PathPart('terminate') :Args(0) { ); } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $contract->get_inflated_columns }, desc => $c->loc('Contract successfully terminated'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => { $contract->get_inflated_columns }, @@ -321,7 +322,7 @@ sub peering_create :Chained('peering_list') :PathPart('create') :Args(0) { my $posted = ($c->request->method eq 'POST'); my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); unless ($self->is_valid_noreseller_contact($c, $params->{contact}{id})) { delete $params->{contact}; } @@ -391,14 +392,14 @@ sub peering_create :Chained('peering_list') :PathPart('create') :Args(0) { $c->session->{created_objects}->{contract} = { id => $contract->id }; delete $c->session->{created_objects}->{contact}; delete $c->session->{created_objects}->{billing_profile}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, cname => 'peering_create', desc => $c->loc('Contract #[_1] successfully created', $contract->id), ); }); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create contract'), @@ -437,9 +438,9 @@ sub reseller_ajax :Chained('reseller_list') :PathPart('ajax') :Args(0) { sub reseller_ajax_contract_filter :Chained('reseller_list') :PathPart('ajax/contract') :Args(1) { my ($self, $c, $contract_id) = @_; - unless($contract_id && $contract_id->is_int) { + unless($contract_id && is_int($contract_id)) { $contract_id //= ''; - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, data => { id => $contract_id }, desc => $c->loc('Invalid contract id detected'), @@ -469,7 +470,7 @@ sub reseller_create :Chained('reseller_list') :PathPart('create') :Args(0) { my $posted = ($c->request->method eq 'POST'); my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); unless ($self->is_valid_noreseller_contact($c, $params->{contact}{id})) { delete $params->{contact}; } @@ -540,14 +541,14 @@ sub reseller_create :Chained('reseller_list') :PathPart('create') :Args(0) { $c->session->{created_objects}->{contract} = { id => $contract->id }; delete $c->session->{created_objects}->{contact}; delete $c->session->{created_objects}->{billing_profile}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, cname => 'reseller_create', desc => $c->loc('Contract #[_1] successfully created', $contract->id), ); }); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create contract'), diff --git a/lib/NGCP/Panel/Controller/Customer.pm b/lib/NGCP/Panel/Controller/Customer.pm index 007d7ec120..df4a5ba942 100644 --- a/lib/NGCP/Panel/Controller/Customer.pm +++ b/lib/NGCP/Panel/Controller/Customer.pm @@ -1,7 +1,8 @@ package NGCP::Panel::Controller::Customer; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; -BEGIN { extends 'Catalyst::Controller'; } +#use namespace::sweep; +BEGIN { use base 'Catalyst::Controller'; } use JSON qw(decode_json encode_json); use IPC::System::Simple qw/capturex EXIT_ANY $EXITVAL/; use NGCP::Panel::Form::CustomerMonthlyFraud; @@ -87,8 +88,8 @@ sub ajax :Chained('list_customer') :PathPart('ajax') :Args(0) { sub ajax_reseller_filter :Chained('list_customer') :PathPart('ajax/reseller') :Args(1) { my ($self, $c, $reseller_id) = @_; - unless($reseller_id && $reseller_id->is_int) { - NGCP::Panel::Utils::Message->error( + unless($reseller_id && is_int($reseller_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid reseller id detected', desc => $c->loc('Invalid reseller id detected'), @@ -116,8 +117,8 @@ sub ajax_reseller_filter :Chained('list_customer') :PathPart('ajax/reseller') :A sub ajax_package_filter :Chained('list_customer') :PathPart('ajax/package') :Args(1) { my ($self, $c, $package_id) = @_; - unless($package_id && $package_id->is_int) { - NGCP::Panel::Utils::Message->error( + unless($package_id && is_int($package_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid profile package id detected', desc => $c->loc('Invalid profile package id detected'), @@ -145,7 +146,7 @@ sub create :Chained('list_customer') :PathPart('create') :Args(0) { my $posted = ($c->request->method eq 'POST'); my $form; my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); if($c->config->{features}->{cloudpbx}) { $form = NGCP::Panel::Form::Contract::ProductSelect->new(ctx => $c); } else { @@ -223,14 +224,14 @@ sub create :Chained('list_customer') :PathPart('create') :Args(0) { delete $c->session->{created_objects}->{billing_profile}; delete $c->session->{created_objects}->{network}; delete $c->session->{created_objects}->{profile_package}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, cname => 'create', desc => $c->loc('Customer #[_1] successfully created', $contract->id), ); }); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create customer contract'), @@ -245,8 +246,8 @@ sub create :Chained('list_customer') :PathPart('create') :Args(0) { sub base :Chained('list_customer') :PathPart('') :CaptureArgs(1) { my ($self, $c, $contract_id) = @_; - unless($contract_id && $contract_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($contract_id && is_int($contract_id)) { + NGCP::Panel::Utils::Message::error( c => $c, error => "customer contract id '$contract_id' is not valid", desc => $c->loc('Invalid customer contract id'), @@ -279,7 +280,7 @@ sub base :Chained('list_customer') :PathPart('') :CaptureArgs(1) { } } unless(defined($contract_rs->first)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Customer was not found', desc => $c->loc('Customer was not found'), @@ -302,7 +303,7 @@ sub base :Chained('list_customer') :PathPart('') :CaptureArgs(1) { now => $now); }); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to get contract balance.'), @@ -320,14 +321,14 @@ sub base :Chained('list_customer') :PathPart('') :CaptureArgs(1) { ]); my $product_id = $contract_rs->first->get_column('product_id'); - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "No product for customer contract id $contract_id found", desc => $c->loc('No product for this customer contract found.'), ) unless($product_id); my $product = $c->model('DB')->resultset('products')->find($product_id); - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "No product with id $product_id for customer contract id $contract_id found", desc => $c->loc('Invalid product id for this customer contract.'), @@ -446,7 +447,7 @@ sub edit :Chained('base_restricted') :PathPart('edit') :Args(0) { } $params->{billing_profiles} = [ map { { $_->get_inflated_columns }; } $c->stash->{future_billing_mappings}->all ]; $params->{billing_profile}->{id} = $billing_profile->id; - $params = $params->merge($c->session->{created_objects}); # TODO: created billing profiles/networks will not be pre-selected + $params = merge($params, $c->session->{created_objects}); # TODO: created billing profiles/networks will not be pre-selected #$c->log->debug('customer/edit'); if($c->config->{features}->{cloudpbx}) { #$c->log->debug('ProductSelect'); @@ -567,13 +568,13 @@ sub edit :Chained('base_restricted') :PathPart('edit') :Args(0) { delete $c->session->{created_objects}->{billing_profile}; delete $c->session->{created_objects}->{profile_package}; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $contract->get_inflated_columns }, desc => $c->loc('Customer #[_1] successfully updated', $contract->id), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => { $contract->get_inflated_columns }, @@ -593,7 +594,7 @@ sub terminate :Chained('base_restricted') :PathPart('terminate') :Args(0) { my $contract = $c->stash->{contract}; if ($contract->id == 1) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, desc => $c->loc('Cannot terminate contract with the id 1'), ); @@ -618,13 +619,13 @@ sub terminate :Chained('base_restricted') :PathPart('terminate') :Args(0) { ); } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $contract->get_inflated_columns }, desc => $c->loc('Customer successfully terminated'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => { $contract->get_inflated_columns }, @@ -654,7 +655,7 @@ sub subscriber_create :Chained('base') :PathPart('subscriber/create') :Args(0) { ->search({ status => { -not_in => ['terminated'] } }) ->count >= $c->stash->{contract}->max_subscribers) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "tried to exceed max number of subscribers of " . $c->stash->{contract}->max_subscribers, desc => $c->loc('Maximum number of subscribers for this customer reached'), @@ -704,7 +705,7 @@ sub subscriber_create :Chained('base') :PathPart('subscriber/create') :Args(0) { $form = NGCP::Panel::Form::Customer::Subscriber->new(ctx => $c); } - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); $form->process( posted => $posted, params => $c->request->params, @@ -813,12 +814,12 @@ sub subscriber_create :Chained('base') :PathPart('subscriber/create') :Args(0) { delete $c->session->{created_objects}->{domain}; delete $c->session->{created_objects}->{group}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Subscriber successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create subscriber'), @@ -844,7 +845,7 @@ sub edit_fraud :Chained('base_restricted') :PathPart('fraud/edit') :Args(1) { } elsif($type eq "day") { $form = NGCP::Panel::Form::CustomerDailyFraud->new; } else { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => "Invalid fraud interval '$type'!", desc => $c->loc("Invalid fraud interval '[_1]'!",$type), @@ -863,7 +864,7 @@ sub edit_fraud :Chained('base_restricted') :PathPart('fraud/edit') :Args(1) { item => $fraud_prefs, ); if($posted && $form->validated) { - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $fraud_prefs->get_inflated_columns }, desc => $c->loc('Fraud settings successfully changed!'), @@ -885,7 +886,7 @@ sub delete_fraud :Chained('base_restricted') :PathPart('fraud/delete') :Args(1) } elsif($type eq "day") { $type = "daily"; } else { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => "Invalid fraud interval '$type'!", desc => $c->loc("Invalid fraud interval '[_1]'!",$type), @@ -903,7 +904,7 @@ sub delete_fraud :Chained('base_restricted') :PathPart('fraud/delete') :Args(1) "fraud_".$type."_notify" => undef, }); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => { $fraud_prefs->get_inflated_columns }, @@ -913,7 +914,7 @@ sub delete_fraud :Chained('base_restricted') :PathPart('fraud/delete') :Args(1) return; } } - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $fraud_prefs->get_inflated_columns }, desc => $c->loc('Successfully cleared fraud interval!'), @@ -960,13 +961,13 @@ sub edit_balance :Chained('base_restricted') :PathPart('balance/edit') :Args(0) new_cash_balance => $form->values->{cash_balance} ); $balance->update($form->values); }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Account balance successfully changed!'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to change account balance!'), @@ -1037,13 +1038,13 @@ sub topup_cash :Chained('base_restricted') :PathPart('balance/topupcash') :Args( delete $c->session->{created_objects}->{package}; }); $success = 1; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Top-up using cash performed successfully!'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to top-up using cash!'), @@ -1133,13 +1134,13 @@ sub topup_voucher :Chained('base_restricted') :PathPart('balance/topupvoucher') }); $success = 1; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Top-up using voucher performed successfully!'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to top-up using voucher!'), @@ -1205,7 +1206,7 @@ sub pbx_group_ajax :Chained('base') :PathPart('pbx/group/ajax') :Args(0) { my $subscriber_id = $c->req->params->{subscriber_id} // 0; my $subscriber; - if($subscriber_id && $subscriber_id->is_integer) { + if($subscriber_id && is_int($subscriber_id)) { $subscriber = $c->model('DB')->resultset('voip_subscribers')->search({ 'me.status' => { '!=' => 'terminated' }, })->find( { id => $subscriber_id } ); @@ -1236,7 +1237,7 @@ sub pbx_group_create :Chained('base') :PathPart('pbx/group/create') :Args(0) { ->search({ status => { -not_in => ['terminated'] } }) ->count >= $c->stash->{contract}->max_subscribers) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "tried to exceed max number of subscribers of " . $c->stash->{contract}->max_subscribers, desc => $c->loc('Maximum number of subscribers for this customer reached'), @@ -1251,7 +1252,7 @@ sub pbx_group_create :Chained('base') :PathPart('pbx/group/create') :Args(0) { 'provisioning_voip_subscriber.is_pbx_pilot' => 1, })->first; unless($pilot) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => 'cannot create pbx group without having a pilot subscriber', desc => $c->loc("Can't create a PBX group without having a pilot subscriber."), @@ -1263,7 +1264,7 @@ sub pbx_group_create :Chained('base') :PathPart('pbx/group/create') :Args(0) { my $form; $form = NGCP::Panel::Form::Customer::PbxGroup->new(ctx => $c); my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); $form->process( posted => $posted, params => $c->request->params, @@ -1317,12 +1318,12 @@ sub pbx_group_create :Chained('base') :PathPart('pbx/group/create') :Args(0) { ); $c->session->{created_objects}->{group} = { id => $billing_subscriber->id }; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('PBX group successfully created'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create PBX group'), @@ -1346,7 +1347,7 @@ sub pbx_group_base :Chained('base') :PathPart('pbx/group') :CaptureArgs(1) { my $group = $c->stash->{pbx_groups}->find($group_id); unless($group) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "invalid voip pbx group id $group_id", desc => $c->loc('PBX group with id [_1] does not exist.',$group_id), @@ -1371,7 +1372,7 @@ sub pbx_group_edit :Chained('pbx_group_base') :PathPart('edit') :Args(0) { my $form; $form = NGCP::Panel::Form::Customer::PbxGroupEdit->new; my $params = { $c->stash->{pbx_group}->provisioning_voip_subscriber->get_inflated_columns }; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); unless ($posted) { NGCP::Panel::Utils::Subscriber::prepare_alias_select( @@ -1442,12 +1443,12 @@ sub pbx_group_edit :Chained('pbx_group_base') :PathPart('edit') :Args(0) { } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('PBX group successfully updated'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update PBX group'), @@ -1477,7 +1478,7 @@ sub pbx_device_create :Chained('base') :PathPart('pbx/device/create') :Args(0) { }); my $form = NGCP::Panel::Form::Customer::PbxFieldDevice->new(ctx => $c); my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); $form->process( posted => $posted, params => $c->request->params, @@ -1521,7 +1522,7 @@ sub pbx_device_create :Chained('base') :PathPart('pbx/device/create') :Args(0) { }); unless($err) { - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('PBX device successfully created'), ); @@ -1529,7 +1530,7 @@ sub pbx_device_create :Chained('base') :PathPart('pbx/device/create') :Args(0) { die $err; } } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create PBX device'), @@ -1554,7 +1555,7 @@ sub pbx_device_base :Chained('base') :PathPart('pbx/device') :CaptureArgs(1) { my $dev = $c->model('DB')->resultset('autoprov_field_devices')->find($dev_id); unless($dev) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "invalid voip pbx device id $dev_id", desc => $c->loc('PBX device with id [_1] does not exist.',$dev_id), @@ -1564,7 +1565,7 @@ sub pbx_device_base :Chained('base') :PathPart('pbx/device') :CaptureArgs(1) { ); } if($dev->contract->id != $c->stash->{contract}->id) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "invalid voip pbx device id $dev_id for customer id '".$c->stash->{contract}->id."'", desc => $c->loc('PBX device with id [_1] does not exist for this customer.',$dev_id), @@ -1600,7 +1601,7 @@ sub pbx_device_edit :Chained('pbx_device_base') :PathPart('edit') :Args(0) { }; } $params->{line} = \@lines; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); $form->process( posted => $posted, params => $c->request->params, @@ -1644,7 +1645,7 @@ sub pbx_device_edit :Chained('pbx_device_base') :PathPart('edit') :Args(0) { }); unless($err) { - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('PBX device successfully updated'), ); @@ -1652,7 +1653,7 @@ sub pbx_device_edit :Chained('pbx_device_base') :PathPart('edit') :Args(0) { die $err; } } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update PBX device'), @@ -1682,7 +1683,7 @@ sub pbx_device_lines_update :Private{ account_id => $c->stash->{contract}->id, }); unless($prov_subscriber) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "invalid provisioning subscriber_id '".$line->field('subscriber_id')->value. "' for contract id '".$c->stash->{contract}->id."'", @@ -1715,13 +1716,13 @@ sub pbx_device_delete :Chained('pbx_device_base') :PathPart('delete') :Args(0) { $c, 'unregister', $fdev, $fdev->identifier ); $fdev->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{pbx_device}->get_inflated_columns }, desc => $c->loc('PBX Device successfully deleted'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "failed to delete PBX device with id '".$c->stash->{pbx_device}->id."': $e", data => { $c->stash->{pbx_device}->get_inflated_columns }, @@ -1764,7 +1765,7 @@ sub pbx_device_sync :Chained('pbx_device_base') :PathPart('sync') :Args(0) { ->search_related('xmlhostgroups')->search_related('host'); my $proxy = $proxy_rs->first; unless($proxy) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, desc => $c->loc('Failed to trigger config reload via SIP'), error => 'Failed to load proxy from xmlhosts', @@ -1781,13 +1782,13 @@ sub pbx_device_sync :Chained('pbx_device_base') :PathPart('sync') :Args(0) { my @out = capturex(EXIT_ANY, "/bin/sh", @cmd_args); if($EXITVAL != 0) { use Data::Dumper; - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, desc => $c->loc('Failed to trigger config reload via SIP'), error => 'Result: ' . Dumper \@out, ); } else { - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully triggered config reload via SIP'), ); @@ -1809,7 +1810,7 @@ sub pbx_device_sync :Chained('pbx_device_base') :PathPart('sync') :Args(0) { ); if($posted && $form->validated) { - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully redirected request to device'), ); diff --git a/lib/NGCP/Panel/Controller/Dashboard.pm b/lib/NGCP/Panel/Controller/Dashboard.pm index 194a76611b..48050d1dc7 100644 --- a/lib/NGCP/Panel/Controller/Dashboard.pm +++ b/lib/NGCP/Panel/Controller/Dashboard.pm @@ -1,6 +1,7 @@ package NGCP::Panel::Controller::Dashboard; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use NGCP::Panel::Widget; =head1 NAME diff --git a/lib/NGCP/Panel/Controller/Device.pm b/lib/NGCP/Panel/Controller/Device.pm index 5a6af7ac35..5aadd78966 100644 --- a/lib/NGCP/Panel/Controller/Device.pm +++ b/lib/NGCP/Panel/Controller/Device.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Controller::Device; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; use Template; @@ -16,7 +17,7 @@ use NGCP::Panel::Utils::DeviceBootstrap; use NGCP::Panel::Utils::Device; use NGCP::Panel::Utils::DateTime; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } sub auto :Private { my ($self, $c) = @_; @@ -168,7 +169,7 @@ sub devmod_create :Chained('base') :PathPart('model/create') :Args(0) :Does(ACL) } my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); if($posted) { $c->req->params->{front_image} = $c->req->upload('front_image'); $c->req->params->{mac_image} = $c->req->upload('mac_image'); @@ -236,12 +237,12 @@ sub devmod_create :Chained('base') :PathPart('model/create') :Args(0) :Does(ACL) delete $c->session->{created_objects}->{reseller}; $c->session->{created_objects}->{device} = { id => $devmod->id }; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully created device model'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create device model'), @@ -271,8 +272,8 @@ sub prepare_connectable :Private{ sub devmod_base :Chained('base') :PathPart('model') :CaptureArgs(1) { my ($self, $c, $devmod_id) = @_; - unless($devmod_id->is_int) { - NGCP::Panel::Utils::Message->error( + unless(is_int($devmod_id)) { + NGCP::Panel::Utils::Message::error( c => $c, error => "invalid device model id '$devmod_id'", desc => $c->loc('Invalid device model id'), @@ -281,7 +282,7 @@ sub devmod_base :Chained('base') :PathPart('model') :CaptureArgs(1) { } my $devmod = $c->stash->{devmod_rs}->find($devmod_id,{'+columns' => [qw/mac_image front_image/]}); unless($devmod) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "device model with id '$devmod_id' not found", desc => $c->loc('Device model not found'), @@ -298,7 +299,7 @@ sub devmod_delete :Chained('devmod_base') :PathPart('delete') :Args(0) :Does(ACL try { $c->stash->{devmod}->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { id => $c->stash->{devmod}->id, model => $c->stash->{devmod}->model, @@ -306,7 +307,7 @@ sub devmod_delete :Chained('devmod_base') :PathPart('delete') :Args(0) :Does(ACL desc => $c->loc('Device model successfully deleted'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "failed to delete device model with id '".$c->stash->{devmod}->id."': $e", desc => $c->loc('Failed to delete device model'), @@ -350,7 +351,7 @@ sub devmod_edit :Chained('devmod_base') :PathPart('edit') :Args(0) :Does(ACL) :A ($params->{connectable_models}) = $self->prepare_connectable($c, $c->stash->{devmod}); $params->{reseller}{id} = delete $params->{reseller_id}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); $c->stash(edit_model => 1); # to make front_image optional if($c->user->is_superuser) { $form = NGCP::Panel::Form::Device::ModelAdmin->new(ctx => $c); @@ -470,7 +471,7 @@ sub devmod_edit :Chained('devmod_base') :PathPart('edit') :Args(0) :Does(ACL) :A })->delete_all; delete $c->session->{created_objects}->{reseller}; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { id => $c->stash->{devmod}->id, model => $c->stash->{devmod}->model, @@ -478,7 +479,7 @@ sub devmod_edit :Chained('devmod_base') :PathPart('edit') :Args(0) :Does(ACL) :A desc => $c->loc('Successfully updated device model'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update device model'), @@ -547,7 +548,7 @@ sub devfw_create :Chained('base') :PathPart('firmware/create') :Args(0) :Does(AC my $form = NGCP::Panel::Form::Device::Firmware->new; my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); if($posted) { $c->req->params->{data} = $c->req->upload('data'); } @@ -577,12 +578,12 @@ sub devfw_create :Chained('base') :PathPart('firmware/create') :Args(0) :Does(AC delete $c->session->{created_objects}->{device}; $c->session->{created_objects}->{firmware} = { id => $devfw->id }; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully created device firmware'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create device firmware'), @@ -600,8 +601,8 @@ sub devfw_create :Chained('base') :PathPart('firmware/create') :Args(0) :Does(AC sub devfw_base :Chained('base') :PathPart('firmware') :CaptureArgs(1) :Does(ACL) :ACLDetachTo('/denied_page') :AllowedRole(admin) :AllowedRole(reseller) { my ($self, $c, $devfw_id) = @_; - unless($devfw_id->is_int) { - NGCP::Panel::Utils::Message->error( + unless(is_int($devfw_id)) { + NGCP::Panel::Utils::Message::error( c => $c, error => "invalid device firmware id '$devfw_id'", desc => $c->loc('Invalid device firmware id'), @@ -611,7 +612,7 @@ sub devfw_base :Chained('base') :PathPart('firmware') :CaptureArgs(1) :Does(ACL) $c->stash->{devfw} = $c->stash->{devfw_rs}->find($devfw_id,{'+columns' => 'data'}); unless($c->stash->{devfw}) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "device firmware with id '$devfw_id' not found", desc => $c->loc('Device firmware not found'), @@ -625,13 +626,13 @@ sub devfw_delete :Chained('devfw_base') :PathPart('delete') :Args(0) { try { $c->stash->{devfw}->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{devfw}->get_inflated_columns }, desc => $c->loc('Device firmware successfully deleted'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "failed to delete device firmware with id '".$c->stash->{devfw}->id."': $e", desc => $c->loc('Failed to delete device firmware'), @@ -648,7 +649,7 @@ sub devfw_edit :Chained('devfw_base') :PathPart('edit') :Args(0) { my $form; my $params = { $c->stash->{devfw}->get_inflated_columns }; $params->{device}{id} = delete $params->{device_id}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); if($posted) { $c->req->params->{data} = $c->req->upload('data'); } @@ -681,12 +682,12 @@ sub devfw_edit :Chained('devfw_base') :PathPart('edit') :Args(0) { $c->stash->{devfw}->update($form->values); delete $c->session->{created_objects}->{device}; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully updated device firmware'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update device firmware'), @@ -726,7 +727,7 @@ sub devconf_create :Chained('base') :PathPart('config/create') :Args(0) :Does(AC my $form = NGCP::Panel::Form::Device::Config->new; my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); $form->process( posted => $posted, params => $c->request->params, @@ -750,12 +751,12 @@ sub devconf_create :Chained('base') :PathPart('config/create') :Args(0) :Does(AC delete $c->session->{created_objects}->{device}; $c->session->{created_objects}->{config} = { id => $devconf->id }; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully created device configuration'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create device configuration'), @@ -773,8 +774,8 @@ sub devconf_create :Chained('base') :PathPart('config/create') :Args(0) :Does(AC sub devconf_base :Chained('base') :PathPart('config') :CaptureArgs(1) :Does(ACL) :ACLDetachTo('/denied_page') :AllowedRole(admin) :AllowedRole(reseller) { my ($self, $c, $devconf_id) = @_; - unless($devconf_id->is_int) { - NGCP::Panel::Utils::Message->error( + unless(is_int($devconf_id)) { + NGCP::Panel::Utils::Message::error( c => $c, error => "invalid device config id '$devconf_id'", desc => $c->loc('Invalid device configuration id'), @@ -784,7 +785,7 @@ sub devconf_base :Chained('base') :PathPart('config') :CaptureArgs(1) :Does(ACL) $c->stash->{devconf} = $c->stash->{devconf_rs}->find($devconf_id,{'+columns' => 'data'}); unless($c->stash->{devconf}) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "device configuration with id '$devconf_id' not found", desc => $c->loc('Device configuration not found'), @@ -798,13 +799,13 @@ sub devconf_delete :Chained('devconf_base') :PathPart('delete') :Args(0) { try { $c->stash->{devconf}->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{devconf}->get_inflated_columns }, desc => $c->loc('Device configuration successfully deleted'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "failed to delete device configuration with id '".$c->stash->{devconf}->id."': $e", desc => $c->loc('Failed to delete device configuration'), @@ -821,7 +822,7 @@ sub devconf_edit :Chained('devconf_base') :PathPart('edit') :Args(0) { my $form; my $params = { $c->stash->{devconf}->get_inflated_columns }; $params->{device}{id} = delete $params->{device_id}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); $form = NGCP::Panel::Form::Device::Config->new; $form->process( @@ -849,12 +850,12 @@ sub devconf_edit :Chained('devconf_base') :PathPart('edit') :Args(0) { $c->stash->{devconf}->update($form->values); delete $c->session->{created_objects}->{device}; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully updated device configuration'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update device configuration'), @@ -893,7 +894,7 @@ sub devprof_create :Chained('base') :PathPart('profile/create') :Args(0) :Does(A my $form = NGCP::Panel::Form::Device::Profile->new; my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); $form->process( posted => $posted, params => $c->request->params, @@ -919,12 +920,12 @@ sub devprof_create :Chained('base') :PathPart('profile/create') :Args(0) :Does(A delete $c->session->{created_objects}->{config}; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully created device profile'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create device profile'), @@ -942,8 +943,8 @@ sub devprof_create :Chained('base') :PathPart('profile/create') :Args(0) :Does(A sub devprof_base :Chained('base') :PathPart('profile') :CaptureArgs(1) :Does(ACL) :ACLDetachTo('/denied_page') :AllowedRole(admin) :AllowedRole(reseller) :AllowedRole(subscriberadmin) { my ($self, $c, $devprof_id) = @_; - unless($devprof_id->is_int) { - NGCP::Panel::Utils::Message->error( + unless(is_int($devprof_id)) { + NGCP::Panel::Utils::Message::error( c => $c, error => "invalid device profile id '$devprof_id'", desc => $c->loc('Invalid device profile id'), @@ -953,7 +954,7 @@ sub devprof_base :Chained('base') :PathPart('profile') :CaptureArgs(1) :Does(ACL $c->stash->{devprof} = $c->stash->{devprof_rs}->find($devprof_id); unless($c->stash->{devprof}) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "device profile with id '$devprof_id' not found", desc => $c->loc('Device profile not found'), @@ -1074,13 +1075,13 @@ sub devprof_delete :Chained('devprof_base') :PathPart('delete') :Args(0) :Does(A try { $c->stash->{devprof}->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{devprof}->get_inflated_columns }, desc => $c->loc('Device profile successfully deleted'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "failed to delete device profile with id '".$c->stash->{devprof}->id."': $e", desc => $c->loc('Failed to delete device profile'), @@ -1097,7 +1098,7 @@ sub devprof_edit :Chained('devprof_base') :PathPart('edit') :Args(0) :Does(ACL) my $form; my $params = { $c->stash->{devprof}->get_inflated_columns }; $params->{config}{id} = delete $params->{config_id}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); $form = NGCP::Panel::Form::Device::Profile->new; $form->process( @@ -1125,13 +1126,13 @@ sub devprof_edit :Chained('devprof_base') :PathPart('edit') :Args(0) :Does(ACL) delete $c->session->{created_objects}->{config}; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{devprof}->get_inflated_columns }, desc => $c->loc('Successfully updated device profile'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update device profile'), diff --git a/lib/NGCP/Panel/Controller/Domain.pm b/lib/NGCP/Panel/Controller/Domain.pm index cf4c0dd4a5..06498906c6 100644 --- a/lib/NGCP/Panel/Controller/Domain.pm +++ b/lib/NGCP/Panel/Controller/Domain.pm @@ -1,8 +1,9 @@ package NGCP::Panel::Controller::Domain; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use NGCP::Panel::Form::Domain::Reseller; use NGCP::Panel::Form::Domain::ResellerPbx; @@ -60,8 +61,8 @@ sub create :Chained('dom_list') :PathPart('create') :Args() { my $posted = ($c->request->method eq 'POST'); my $form; my $pbx; if($type && $type eq 'pbx') { - unless($reseller_id && $reseller_id->is_int) { - NGCP::Panel::Utils::Message->error( + unless($reseller_id && is_int($reseller_id)) { + NGCP::Panel::Utils::Message::error( c => $c, error => 'invalid reseller id for creating pbx domain', desc => $c->loc('Invalid reseller id detected.'), @@ -73,7 +74,7 @@ sub create :Chained('dom_list') :PathPart('create') :Args() { } $c->stash->{reseller} = $c->model('DB')->resultset('resellers')->find($reseller_id); unless($c->stash->{reseller}) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "reseller with id $reseller_id not found when creating pbx domain", desc => $c->loc('Reseller not found.'), @@ -88,7 +89,7 @@ sub create :Chained('dom_list') :PathPart('create') :Args() { $form = NGCP::Panel::Form::Domain::Reseller->new; } my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); delete $params->{domain} if exists($params->{domain}{id}); $form->process( posted => $posted, @@ -136,7 +137,7 @@ sub create :Chained('dom_list') :PathPart('create') :Args() { $c->session->{created_objects}->{domain} = { id => $new_dom->id }; }); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create domain.'), @@ -146,14 +147,14 @@ sub create :Chained('dom_list') :PathPart('create') :Args() { my (undef, $xmlrpc_res) = $self->_sip_domain_reload($c); if (!defined $xmlrpc_res || $xmlrpc_res < 1) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, desc => $c->loc('Failed to activate domain. Domain was created.'), ); NGCP::Panel::Utils::Navigation::back_or($c, $c->uri_for('/domain')); } - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Domain successfully created'), ); @@ -170,9 +171,9 @@ sub create :Chained('dom_list') :PathPart('create') :Args() { sub base :Chained('/domain/dom_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $domain_id) = @_; - unless($domain_id && $domain_id->is_integer) { + unless($domain_id && is_int($domain_id)) { $domain_id //= ''; - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, data => { domain_id => $domain_id }, desc => $c->loc('Invalid domain id detected'), @@ -184,7 +185,7 @@ sub base :Chained('/domain/dom_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{dom_rs}->find($domain_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, desc => $c->loc('Domain does not exist'), ); @@ -223,7 +224,7 @@ sub edit :Chained('base') :PathPart('edit') :Args(0) { }); }); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update domain.'), @@ -233,7 +234,7 @@ sub edit :Chained('base') :PathPart('edit') :Args(0) { } $self->_sip_domain_reload($c); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Domain successfully updated'), ); @@ -262,7 +263,7 @@ sub delete :Chained('base') :PathPart('delete') :Args(0) { unless($c->config->{features}->{debug}); }); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete domain.'), @@ -272,7 +273,7 @@ sub delete :Chained('base') :PathPart('delete') :Args(0) { } $self->_sip_domain_reload($c); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{domain_result}->get_inflated_columns }, desc => $c->loc('Domain successfully deleted!'), diff --git a/lib/NGCP/Panel/Controller/EmailTemplate.pm b/lib/NGCP/Panel/Controller/EmailTemplate.pm index bf34655e72..ff7e8c34c1 100644 --- a/lib/NGCP/Panel/Controller/EmailTemplate.pm +++ b/lib/NGCP/Panel/Controller/EmailTemplate.pm @@ -1,7 +1,8 @@ package NGCP::Panel::Controller::EmailTemplate; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use NGCP::Panel::Form::EmailTemplate::Reseller; use NGCP::Panel::Form::EmailTemplate::Admin; @@ -70,7 +71,7 @@ sub tmpl_create :Chained('tmpl_list') :PathPart('create') :Args(0) { my $posted = ($c->request->method eq 'POST'); my $form; my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); if($c->user->roles eq "admin") { $form = NGCP::Panel::Form::EmailTemplate::Admin->new; } elsif($c->user->roles eq "reseller") { @@ -104,12 +105,12 @@ sub tmpl_create :Chained('tmpl_list') :PathPart('create') :Args(0) { }); delete $c->session->{created_objects}->{reseller}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Email template successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create email template'), @@ -130,8 +131,8 @@ sub tmpl_base :Chained('tmpl_list') :PathPart('') :CaptureArgs(1) { $c->detach('/denied_page') if($c->user->read_only); - unless($tmpl_id && $tmpl_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($tmpl_id && is_int($tmpl_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid email template id detected', desc => $c->log('Invalid email template id detected'), @@ -143,7 +144,7 @@ sub tmpl_base :Chained('tmpl_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{tmpl_rs}->find($tmpl_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Email template does not exist', desc => $c->log('Email template does not exist'), @@ -168,13 +169,13 @@ sub tmpl_delete :Chained('tmpl_base') :PathPart('delete') { }); } $c->stash->{tmpl}->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{tmpl}->get_inflated_columns }, desc => $c->loc('Email template successfully deleted'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete email template'), @@ -190,7 +191,7 @@ sub tmpl_edit :Chained('tmpl_base') :PathPart('edit') { my $form; my $params = { $c->stash->{tmpl}->get_inflated_columns }; $params->{reseller}{id} = delete $params->{reseller_id}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); if($c->user->roles eq "admin") { $form = NGCP::Panel::Form::EmailTemplate::Admin->new; } elsif($c->user->roles eq "reseller") { @@ -222,12 +223,12 @@ sub tmpl_edit :Chained('tmpl_base') :PathPart('edit') { }); delete $c->session->{created_objects}->{reseller}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Email template successfully updated'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update email template'), diff --git a/lib/NGCP/Panel/Controller/Invoice.pm b/lib/NGCP/Panel/Controller/Invoice.pm index 98498c49c9..3ee0b7d453 100644 --- a/lib/NGCP/Panel/Controller/Invoice.pm +++ b/lib/NGCP/Panel/Controller/Invoice.pm @@ -1,7 +1,8 @@ package NGCP::Panel::Controller::Invoice; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; -BEGIN { extends 'Catalyst::Controller'; } +#use namespace::sweep; +BEGIN { use base 'Catalyst::Controller'; } use NGCP::Panel::Utils::Message; use NGCP::Panel::Utils::DateTime; @@ -58,8 +59,8 @@ sub customer_inv_list :Chained('/') :PathPart('invoice/customer') :CaptureArgs(1 { name => "amount_total", search => 1, title => $c->loc("Total Amount") }, ]); - unless($contract_id && $contract_id->is_int) { - NGCP::Panel::Utils::Message->error( + unless($contract_id && is_int($contract_id)) { + NGCP::Panel::Utils::Message::error( c => $c, error => "Invalid contract id $contract_id found", desc => $c->loc('Invalid contract id found'), @@ -68,7 +69,7 @@ sub customer_inv_list :Chained('/') :PathPart('invoice/customer') :CaptureArgs(1 NGCP::Panel::Utils::Navigation::back_or($c, $c->uri_for('/invoice')); } if($c->user->roles eq "subscriberadmin" && $c->user->account_id != $contract_id) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "access violation, subscriberadmin ".$c->user->uuid." with contract id ".$c->user->account_id." tries to access foreign contract id $contract_id", desc => $c->loc('Invalid contract id found'), @@ -78,7 +79,7 @@ sub customer_inv_list :Chained('/') :PathPart('invoice/customer') :CaptureArgs(1 } my $contract = $c->model('DB')->resultset('contracts')->find($contract_id); unless($contract) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "Contract id $contract_id not found", desc => $c->loc('Invalid contract id detected'), @@ -116,8 +117,8 @@ sub customer_ajax :Chained('customer_inv_list') :PathPart('ajax') :Args(0) { sub base :Chained('inv_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $inv_id) = @_; - unless($inv_id && $inv_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($inv_id && is_int($inv_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid invoice id detected', desc => $c->loc('Invalid invoice id detected'), @@ -127,7 +128,7 @@ sub base :Chained('inv_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{inv_rs}->find($inv_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invoice does not exist', desc => $c->loc('Invoice does not exist'), @@ -142,7 +143,7 @@ sub create :Chained('inv_list') :PathPart('create') :Args() :Does(ACL) :ACLDetac my $posted = ($c->request->method eq 'POST'); my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); my $form; $form = NGCP::Panel::Form::Invoice::Invoice->new(ctx => $c); @@ -166,7 +167,7 @@ sub create :Chained('inv_list') :PathPart('create') :Args() :Does(ACL) :ACLDetac my $customer_rs = NGCP::Panel::Utils::Contract::get_customer_rs(c => $c); my $customer = $customer_rs->find({ 'me.id' => $contract_id }); unless($customer) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "invalid contract_id $contract_id", desc => $c->loc('Customer not found'), @@ -190,7 +191,7 @@ sub create :Chained('inv_list') :PathPart('create') :Args() :Does(ACL) :ACLDetac } $tmpl = $tmpl->first; unless($tmpl) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "invalid template id $tmpl_id", desc => $c->loc('Invoice template not found'), @@ -198,7 +199,7 @@ sub create :Chained('inv_list') :PathPart('create') :Args() :Does(ACL) :ACLDetac die; } unless($tmpl->data) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "invalid template id $tmpl_id, data is empty", desc => $c->loc('Invoice template does not have an SVG stored yet'), @@ -207,7 +208,7 @@ sub create :Chained('inv_list') :PathPart('create') :Args() :Does(ACL) :ACLDetac } unless($customer->contact->reseller_id == $tmpl->reseller_id) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "template id ".$tmpl->id." has different reseller than contract id $contract_id", desc => $c->loc('Template and customer must belong to same reseller'), @@ -263,7 +264,7 @@ sub create :Chained('inv_list') :PathPart('create') :Args() :Does(ACL) :ACLDetac # etime => $etime # ); #} catch($e) { - # NGCP::Panel::Utils::Message->error( + # NGCP::Panel::Utils::Message::error( # c => $c, # error => $e, # desc => $c->loc('Failed to get contract balance.'), @@ -289,7 +290,7 @@ sub create :Chained('inv_list') :PathPart('create') :Args() :Does(ACL) :ACLDetac try { $invoice = $schema->resultset('invoices')->create($form->values); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to save invoice meta data.'), @@ -341,7 +342,7 @@ sub create :Chained('inv_list') :PathPart('create') :Args() :Does(ACL) :ACLDetac $t->process(\$svg, $vars, \$out) || do { my $error = $t->error(); my $msg = "error processing template, type=".$error->type.", info='".$error->info."'"; - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => $msg, desc => $c->loc('Failed to render template. Type is [_1], info is [_2].', $error->type, $error->info), @@ -353,7 +354,7 @@ sub create :Chained('inv_list') :PathPart('create') :Args() :Does(ACL) :ACLDetac NGCP::Panel::Utils::InvoiceTemplate::svg_pdf($c, \$out, \$pdf); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => $e, desc => $c->loc('Failed to render invoice'), @@ -366,7 +367,7 @@ sub create :Chained('inv_list') :PathPart('create') :Args() :Does(ACL) :ACLDetac serial => $serial, data => $pdf, }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, cname => 'create', log => $vars->{invoice}, @@ -374,7 +375,7 @@ sub create :Chained('inv_list') :PathPart('create') :Args() :Does(ACL) :ACLDetac ); }); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create invoice.'), @@ -395,13 +396,13 @@ sub delete :Chained('base') :PathPart('delete') { $schema->txn_do(sub{ $c->stash->{inv}->delete; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{inv}->get_inflated_columns }, desc => $c->loc('Invoice successfully deleted'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete invoice .'), @@ -418,7 +419,7 @@ sub download :Chained('base') :PathPart('download') { $c->response->body($c->stash->{inv}->data); return; } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete invoice .'), diff --git a/lib/NGCP/Panel/Controller/InvoiceTemplate.pm b/lib/NGCP/Panel/Controller/InvoiceTemplate.pm index 300b6a1b4d..98bf668e2a 100644 --- a/lib/NGCP/Panel/Controller/InvoiceTemplate.pm +++ b/lib/NGCP/Panel/Controller/InvoiceTemplate.pm @@ -1,7 +1,8 @@ package NGCP::Panel::Controller::InvoiceTemplate; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; -BEGIN { extends 'Catalyst::Controller'; } +#use namespace::sweep; +BEGIN { use base 'Catalyst::Controller'; } use File::Type; use MIME::Base64 qw(encode_base64); @@ -61,8 +62,8 @@ sub reseller_ajax :Chained('template_list') :PathPart('ajax/reseller') :Args(1) sub base :Chained('template_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $tmpl_id) = @_; - unless($tmpl_id && $tmpl_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($tmpl_id && is_int($tmpl_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid invoice template id detected', desc => $c->loc('Invalid invoice template id detected'), @@ -72,7 +73,7 @@ sub base :Chained('template_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{tmpl_rs}->find($tmpl_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invoice template does not exist', desc => $c->loc('Invoice template does not exist'), @@ -85,8 +86,8 @@ sub base :Chained('template_list') :PathPart('') :CaptureArgs(1) { sub create :Chained('template_list') :PathPart('create') :Args() { my ($self, $c, $reseller_id) = @_; - if(defined $reseller_id && !$reseller_id->is_integer) { - NGCP::Panel::Utils::Message->error( + if(defined $reseller_id && !is_int($reseller_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid reseller id detected', desc => $c->loc('Invalid reseller id detected'), @@ -96,7 +97,7 @@ sub create :Chained('template_list') :PathPart('create') :Args() { my $posted = ($c->request->method eq 'POST'); my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); my $form; if($c->user->roles eq "admin" && !$reseller_id) { @@ -106,7 +107,7 @@ sub create :Chained('template_list') :PathPart('create') :Args() { if($c->user->roles eq "admin") { my $reseller = $c->model('DB')->resultset('resellers')->find($reseller_id); unless($reseller) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid reseller id detected', desc => $c->loc('Invalid reseller id detected'), @@ -153,12 +154,12 @@ sub create :Chained('template_list') :PathPart('create') :Args() { delete $c->session->{created_objects}->{reseller}; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Invoice template successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create invoice template'), @@ -178,7 +179,7 @@ sub edit_info :Chained('base') :PathPart('editinfo') { my $posted = ($c->request->method eq 'POST'); my $params = { $tmpl->get_inflated_columns }; $params->{reseller}{id} = delete $params->{reseller_id}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); my $form; if($c->user->roles eq "admin") { @@ -222,12 +223,12 @@ sub edit_info :Chained('base') :PathPart('editinfo') { delete $c->session->{created_objects}->{reseller}; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Invoice template successfully updated'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update invoice template'), @@ -248,13 +249,13 @@ sub delete :Chained('base') :PathPart('delete') { $schema->txn_do(sub{ $c->stash->{tmpl}->delete; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{tmpl}->get_inflated_columns }, desc => $c->loc('Invoice template successfully deleted'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete invoice template.'), @@ -295,7 +296,7 @@ sub set_content_ajax :Chained('base') :PathPart('editcontent/set/ajax') :Args(0) my $content = $c->request->body_parameters->{template}; unless($content) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => 'empty svg file not allowed', desc => $c->log('Attempted to save an empty invoice template'), @@ -311,7 +312,7 @@ sub set_content_ajax :Chained('base') :PathPart('editcontent/set/ajax') :Args(0) }); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to store invoice template'), @@ -334,7 +335,7 @@ sub preview_content :Chained('base') :PathPart('editcontent/preview') :Args { my $svg = $tmpl->data; unless(defined $svg) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Trying to preview a non-saved svg template', desc => $c->loc('Template has not been saved yet, please save before previewing.'), @@ -355,7 +356,7 @@ sub preview_content :Chained('base') :PathPart('editcontent/preview') :Args { $t->process(\$svg, $dummy, \$out) || do { my $error = $t->error(); my $msg = "error processing template, type=".$error->type.", info='".$error->info."'"; - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => $msg, desc => $c->loc('Failed to render template. Type is ' . $error->type . ', info is ' . $error->info), @@ -366,7 +367,7 @@ sub preview_content :Chained('base') :PathPart('editcontent/preview') :Args { NGCP::Panel::Utils::InvoiceTemplate::svg_pdf($c, \$out, \$pdf); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => $e, desc => $c->loc('Failed to preview template'), diff --git a/lib/NGCP/Panel/Controller/Log.pm b/lib/NGCP/Panel/Controller/Log.pm index 4e246c3e3d..a68f60ac3a 100644 --- a/lib/NGCP/Panel/Controller/Log.pm +++ b/lib/NGCP/Panel/Controller/Log.pm @@ -1,7 +1,8 @@ package NGCP::Panel::Controller::Log; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use LWP::UserAgent; my $ua = LWP::UserAgent->new; diff --git a/lib/NGCP/Panel/Controller/Login.pm b/lib/NGCP/Panel/Controller/Login.pm index 9eb729f70a..7ac5f0dcee 100644 --- a/lib/NGCP/Panel/Controller/Login.pm +++ b/lib/NGCP/Panel/Controller/Login.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Controller::Login; +use NGCP::Panel::Utils::Generic qw(:all); use Moose; diff --git a/lib/NGCP/Panel/Controller/Logout.pm b/lib/NGCP/Panel/Controller/Logout.pm index 4ac804079f..4da8c08301 100644 --- a/lib/NGCP/Panel/Controller/Logout.pm +++ b/lib/NGCP/Panel/Controller/Logout.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Controller::Logout; +use NGCP::Panel::Utils::Generic qw(:all); use Moose; BEGIN { extends 'Catalyst::Controller'; } diff --git a/lib/NGCP/Panel/Controller/MaliciousCall.pm b/lib/NGCP/Panel/Controller/MaliciousCall.pm index 06343808aa..d5651c54a7 100644 --- a/lib/NGCP/Panel/Controller/MaliciousCall.pm +++ b/lib/NGCP/Panel/Controller/MaliciousCall.pm @@ -1,7 +1,8 @@ package NGCP::Panel::Controller::MaliciousCall; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use NGCP::Panel::Form::MaliciousCall::Reseller; use NGCP::Panel::Form::MaliciousCall::Admin; @@ -72,8 +73,8 @@ sub ajax :Chained('mcid_list') :PathPart('ajax') :Args(0) { sub base :Chained('mcid_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $mcid_id) = @_; - unless($mcid_id && $mcid_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($mcid_id && is_int($mcid_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid malicious call id detected', desc => $c->log('Invalid malicious call id detected'), @@ -85,7 +86,7 @@ sub base :Chained('mcid_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{mcid_rs}->find($mcid_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Malicious call does not exist', desc => $c->log('Malicious call does not exist'), @@ -106,12 +107,12 @@ sub delete :Chained('base') :PathPart('delete') { try { $c->stash->{mcid_res}->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Malicious call successfully deleted'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, data => { id => $$c->stash->{mcid_res}->id }, desc => $c->loc('Failed to delete Malicious call'), diff --git a/lib/NGCP/Panel/Controller/NCOS.pm b/lib/NGCP/Panel/Controller/NCOS.pm index 58c3f09b64..6847bd9d32 100644 --- a/lib/NGCP/Panel/Controller/NCOS.pm +++ b/lib/NGCP/Panel/Controller/NCOS.pm @@ -1,7 +1,8 @@ package NGCP::Panel::Controller::NCOS; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use NGCP::Panel::Form::NCOS::ResellerLevel; use NGCP::Panel::Form::NCOS::AdminLevel; @@ -64,8 +65,8 @@ sub ajax :Chained('levels_list') :PathPart('ajax') :Args(0) { sub base :Chained('levels_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $level_id) = @_; - unless($level_id && $level_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($level_id && is_int($level_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid NCOS level id detected', desc => $c->loc('Invalid NCOS level id detected'), @@ -75,7 +76,7 @@ sub base :Chained('levels_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{levels_rs}->find($level_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'NCOS level does not exist', desc => $c->loc('NCOS level does not exist'), @@ -93,7 +94,7 @@ sub edit :Chained('base') :PathPart('edit') { my $level = $c->stash->{level_result}; my $params = { $level->get_inflated_columns }; $params->{reseller}{id} = delete $params->{reseller_id}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); if($c->user->is_superuser) { $form = NGCP::Panel::Form::NCOS::AdminLevel->new; } else { @@ -118,12 +119,12 @@ sub edit :Chained('base') :PathPart('edit') { delete $form->values->{reseller}; $level->update($form->values); delete $c->session->{created_objects}->{reseller}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('NCOS level successfully updated'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update NCOS level'), @@ -157,12 +158,12 @@ sub delete :Chained('base') :PathPart('delete') { } $c->stash->{level_result}->delete; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('NCOS level successfully deleted'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete NCOS level'), @@ -177,7 +178,7 @@ sub create :Chained('levels_list') :PathPart('create') :Args(0) { my $posted = ($c->request->method eq 'POST'); my $form; my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); if($c->user->is_superuser) { $form = NGCP::Panel::Form::NCOS::AdminLevel->new; } else { @@ -204,12 +205,12 @@ sub create :Chained('levels_list') :PathPart('create') :Args(0) { } $level->create($form->values); delete $c->session->{created_objects}->{reseller}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('NCOS level successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create NCOS level'), @@ -258,8 +259,8 @@ sub pattern_ajax :Chained('pattern_list') :PathPart('ajax') :Args(0) { sub pattern_base :Chained('pattern_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $pattern_id) = @_; - unless($pattern_id && $pattern_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($pattern_id && is_int($pattern_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid NCOS pattern id detected', desc => $c->loc('Invalid NCOS pattern id detected'), @@ -269,7 +270,7 @@ sub pattern_base :Chained('pattern_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{pattern_rs}->find($pattern_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'NCOS pattern does not exist', desc => $c->loc('NCOS pattern does not exist'), @@ -298,13 +299,13 @@ sub pattern_edit :Chained('pattern_base') :PathPart('edit') { if($posted && $form->validated) { try { $c->stash->{pattern_result}->update($form->values); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{pattern_result}->get_inflated_columns }, desc => $c->loc('NCOS pattern successfully updated'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update NCOS pattern'), @@ -325,13 +326,13 @@ sub pattern_delete :Chained('pattern_base') :PathPart('delete') { try { $c->stash->{pattern_result}->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{pattern_result}->get_inflated_columns }, desc => $c->loc('NCOS pattern successfully deleted'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete NCOS pattern'), @@ -358,12 +359,12 @@ sub pattern_create :Chained('pattern_list') :PathPart('create') :Args(0) { if($posted && $form->validated) { try { $c->stash->{pattern_rs}->create($form->values); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('NCOS pattern successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create NCOS pattern'), @@ -398,12 +399,12 @@ sub pattern_edit_local_ac :Chained('pattern_list') :PathPart('edit_local_ac') :A if($posted && $form->validated) { try { $c->stash->{level_result}->update($form->values); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('NCOS level setting successfully updated'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update NCOS level setting'), diff --git a/lib/NGCP/Panel/Controller/Network.pm b/lib/NGCP/Panel/Controller/Network.pm index 30cd844e12..7b5317fb7b 100644 --- a/lib/NGCP/Panel/Controller/Network.pm +++ b/lib/NGCP/Panel/Controller/Network.pm @@ -1,7 +1,8 @@ package NGCP::Panel::Controller::Network; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use NGCP::Panel::Form::BillingNetwork::Admin; use NGCP::Panel::Form::BillingNetwork::Reseller; @@ -78,7 +79,7 @@ sub create :Chained('network_list') :PathPart('create') :Args(0) { $form = NGCP::Panel::Form::BillingNetwork::Reseller->new; } my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); $form->process( posted => $posted, params => $c->request->params, @@ -108,12 +109,12 @@ sub create :Chained('network_list') :PathPart('create') :Args(0) { $c->session->{created_objects}->{network} = { id => $bn->id }; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Billing Network successfully created'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create billing network.'), @@ -132,9 +133,9 @@ sub create :Chained('network_list') :PathPart('create') :Args(0) { sub base :Chained('/network/network_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $network_id) = @_; - unless($network_id && $network_id->is_integer) { + unless($network_id && is_int($network_id)) { $network_id //= ''; - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, data => { id => $network_id }, desc => $c->loc('Invalid billing network id detected'), @@ -146,7 +147,7 @@ sub base :Chained('/network/network_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{network_rs}->find($network_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, desc => $c->loc('Billing network does not exist'), ); @@ -168,7 +169,7 @@ sub edit :Chained('base') :PathPart('edit') :Args(0) { my $params = $c->stash->{network}; $params->{blocks} = $c->stash->{network_blocks}; $params->{reseller}{id} = delete $params->{reseller_id}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); $form->process( posted => $posted, params => $c->request->params, @@ -188,12 +189,12 @@ sub edit :Chained('base') :PathPart('edit') :Args(0) { $c->stash->{'network_result'}->create_related("billing_network_blocks", $block); } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Billing network successfully updated'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update billing network'), @@ -227,13 +228,13 @@ sub terminate :Chained('base') :PathPart('terminate') :Args(0) { status => 'terminated', #terminate_timestamp => NGCP::Panel::Utils::DateTime::current_local, }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => $c->stash->{network}, desc => $c->loc('Billing network successfully terminated'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => $c->stash->{network}, diff --git a/lib/NGCP/Panel/Controller/NumberBlock.pm b/lib/NGCP/Panel/Controller/NumberBlock.pm index d63cadaeab..719bd808de 100644 --- a/lib/NGCP/Panel/Controller/NumberBlock.pm +++ b/lib/NGCP/Panel/Controller/NumberBlock.pm @@ -1,7 +1,8 @@ package NGCP::Panel::Controller::NumberBlock; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use JSON qw(decode_json encode_json); use NGCP::Panel::Form::NumberBlock::BlockAdmin; @@ -61,8 +62,8 @@ sub block_ajax :Chained('block_list') :PathPart('ajax') :Args(0) :Does(ACL) :ACL sub block_base :Chained('block_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $block_id) = @_; - unless($block_id && $block_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($block_id && is_int($block_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid number block id detected', desc => $c->loc('Invalid number block id detected'), @@ -72,7 +73,7 @@ sub block_base :Chained('block_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{block_rs}->find($block_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Number block does not exist', desc => $c->loc('Number block does not exist'), @@ -87,7 +88,7 @@ sub block_create :Chained('block_list') :PathPart('create') :Args(0) :Does(ACL) my $posted = ($c->request->method eq 'POST'); my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); $params->{reseller_list} = encode_json([]);; my $form; @@ -122,7 +123,7 @@ sub block_create :Chained('block_list') :PathPart('create') :Args(0) :Does(ACL) $num->{sn_prefix} = delete $num->{snbase}; $num->{sn_length} = delete $num->{snlength}; $num->{ac} //= ''; - $values = $values->merge($num); + $values = merge($values, $num); my $block = $c->stash->{block_rs}->create($values); foreach my $r(@{ $reseller_list }) { @@ -133,12 +134,12 @@ sub block_create :Chained('block_list') :PathPart('create') :Args(0) :Does(ACL) delete $c->session->{created_objects}->{reseller}; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Number block successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create number block'), @@ -161,7 +162,7 @@ sub block_edit :Chained('block_base') :PathPart('edit') :Does(ACL) :ACLDetachTo( $params->{e164}{ac} = delete $params->{cc}; $params->{e164}{snbase} = delete $params->{sn_prefix}; $params->{e164}{snlength} = delete $params->{sn_length}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); my @resellers = $block->search_related('voip_number_block_resellers')->get_column('reseller_id')->all; $params->{reseller_list} = encode_json(\@resellers); @@ -195,7 +196,7 @@ sub block_edit :Chained('block_base') :PathPart('edit') :Does(ACL) :ACLDetachTo( $num->{sn_prefix} = delete $num->{snbase}; $num->{sn_length} = delete $num->{snlength}; $num->{ac} //= ''; - $values = $values->merge($num); + $values = merge($values, $num); $block->update($values); $block->search_related('voip_number_block_resellers')->delete; @@ -207,12 +208,12 @@ sub block_edit :Chained('block_base') :PathPart('edit') :Does(ACL) :ACLDetachTo( delete $c->session->{created_objects}->{reseller}; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Number block successfully updated'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update number block'), @@ -235,13 +236,13 @@ sub block_delete :Chained('block_base') :PathPart('delete') :Does(ACL) :ACLDetac $c->stash->{block}->search_related('voip_number_block_resellers')->delete; $c->stash->{block}->delete; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{block}->get_inflated_columns }, desc => $c->loc('Number block successfully deleted'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete number block'), diff --git a/lib/NGCP/Panel/Controller/Package.pm b/lib/NGCP/Panel/Controller/Package.pm index 54367ab28a..007c8da515 100644 --- a/lib/NGCP/Panel/Controller/Package.pm +++ b/lib/NGCP/Panel/Controller/Package.pm @@ -1,7 +1,8 @@ package NGCP::Panel::Controller::Package; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use NGCP::Panel::Form::ProfilePackage::Admin; use NGCP::Panel::Form::ProfilePackage::Reseller; @@ -79,7 +80,7 @@ sub create :Chained('package_list') :PathPart('create') :Args(0) { $form = NGCP::Panel::Form::ProfilePackage::Reseller->new(ctx => $c); } my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); $form->process( posted => $posted, params => $c->request->params, @@ -115,12 +116,12 @@ sub create :Chained('package_list') :PathPart('create') :Args(0) { $c->session->{created_objects}->{package} = { id => $profile_package->id }; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Profile package successfully created'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create profile package.'), @@ -139,9 +140,9 @@ sub create :Chained('package_list') :PathPart('create') :Args(0) { sub base :Chained('/package/package_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $package_id) = @_; - unless($package_id && $package_id->is_integer) { + unless($package_id && is_int($package_id)) { $package_id //= ''; - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, data => { id => $package_id }, desc => $c->loc('Invalid package id detected'), @@ -153,7 +154,7 @@ sub base :Chained('/package/package_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{package_rs}->find($package_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, desc => $c->loc('Profile package does not exist'), ); @@ -182,7 +183,7 @@ sub edit :Chained('base') :PathPart('edit') :Args(0) { foreach(qw/balance_interval timely_duration/){ $params->{$_} = { unit => delete $params->{$_.'_unit'}, value => delete $params->{$_.'_value'} }; } - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); $form->process( posted => $posted, params => $c->request->params, @@ -216,12 +217,12 @@ sub edit :Chained('base') :PathPart('edit') :Args(0) { $profile_package->profiles->create($mapping); } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Profile package successfully updated'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update profile package'), @@ -253,13 +254,13 @@ sub delete :Chained('base') :PathPart('delete') :Args(0) { } $package->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => $c->stash->{package}, desc => $c->loc('Profile package successfully deleted'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => $c->stash->{package}, @@ -294,9 +295,9 @@ sub details_base :Chained('/') :PathPart('package') :CaptureArgs(1) { my $dispatch_to = '_package_resultset_' . $c->user->roles; my $package_rs = $self->$dispatch_to($c); - unless($package_id && $package_id->is_integer) { + unless($package_id && is_int($package_id)) { $package_id //= ''; - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, data => { id => $package_id }, desc => $c->loc('Invalid package id detected'), @@ -308,7 +309,7 @@ sub details_base :Chained('/') :PathPart('package') :CaptureArgs(1) { my $res = $package_rs->find($package_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, desc => $c->loc('Profile package does not exist'), ); diff --git a/lib/NGCP/Panel/Controller/Pbx.pm b/lib/NGCP/Panel/Controller/Pbx.pm index 05d142fc06..e6f321397b 100644 --- a/lib/NGCP/Panel/Controller/Pbx.pm +++ b/lib/NGCP/Panel/Controller/Pbx.pm @@ -1,7 +1,8 @@ package NGCP::Panel::Controller::Pbx; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; -BEGIN { extends 'Catalyst::Controller'; } +#use namespace::sweep; +BEGIN { use base 'Catalyst::Controller'; } use NGCP::Panel::Utils::Message; use NGCP::Panel::Utils::DateTime; diff --git a/lib/NGCP/Panel/Controller/Peering.pm b/lib/NGCP/Panel/Controller/Peering.pm index 1c9610f0eb..533e5bdd94 100644 --- a/lib/NGCP/Panel/Controller/Peering.pm +++ b/lib/NGCP/Panel/Controller/Peering.pm @@ -1,8 +1,9 @@ package NGCP::Panel::Controller::Peering; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use NGCP::Panel::Form::PeeringGroup; use NGCP::Panel::Form::PeeringRule; @@ -53,8 +54,8 @@ sub ajax :Chained('group_list') :PathPart('ajax') :Args(0) { sub base :Chained('group_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $group_id) = @_; - unless($group_id && $group_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($group_id && is_int($group_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid group id detected', desc => $c->loc('Invalid group id detected'), @@ -66,7 +67,7 @@ sub base :Chained('group_list') :PathPart('') :CaptureArgs(1) { my $res = $c->model('DB')->resultset('voip_peer_groups')->find($group_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Peering group does not exist', desc => $c->loc('Peering group does not exist'), @@ -110,7 +111,7 @@ sub edit :Chained('base') :PathPart('edit') { my $form = NGCP::Panel::Form::PeeringGroup->new; my $params = { $c->stash->{group_result}->get_inflated_columns }; $params->{contract}{id} = delete $params->{peering_contract_id}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); $form->process( posted => $posted, params => $c->request->params, @@ -126,12 +127,12 @@ sub edit :Chained('base') :PathPart('edit') { $c->stash->{group_result}->update($form->custom_get_values); $self->_sip_lcr_reload($c); delete $c->session->{created_objects}->{contract}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Peering group successfully updated'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update peering group'), @@ -156,13 +157,13 @@ sub delete :Chained('base') :PathPart('delete') { } $c->stash->{group_result}->delete; $self->_sip_lcr_reload($c); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{group_result}->get_inflated_columns }, desc => $c->loc('Peering Group successfully deleted'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete peering group'), @@ -178,7 +179,7 @@ sub create :Chained('group_list') :PathPart('create') :Args(0) { my $posted = ($c->request->method eq 'POST'); my $form = NGCP::Panel::Form::PeeringGroup->new; my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); $form->process( posted => $posted, params => $c->request->params, @@ -196,12 +197,12 @@ sub create :Chained('group_list') :PathPart('create') :Args(0) { $formdata ); $self->_sip_lcr_reload($c); delete $c->session->{created_objects}->{contract}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Peering group successfully created'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create peering group'), @@ -266,12 +267,12 @@ sub servers_create :Chained('servers_list') :PathPart('create') :Args(0) { }; my $server = $c->stash->{group_result}->voip_peer_hosts->create($dbvalues); $self->_sip_lcr_reload($c); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Peering server successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create peering server'), @@ -291,8 +292,8 @@ sub servers_create :Chained('servers_list') :PathPart('create') :Args(0) { sub servers_base :Chained('servers_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $server_id) = @_; - unless($server_id && $server_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($server_id && is_int($server_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid peering server id', desc => $c->loc('Invalid peering server id'), @@ -304,7 +305,7 @@ sub servers_base :Chained('servers_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{group_result}->voip_peer_hosts->find($server_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Peering server does not exist', desc => $c->loc('Peering server does not exist'), @@ -338,12 +339,12 @@ sub servers_edit :Chained('servers_base') :PathPart('edit') :Args(0) { try { $c->stash->{server_result}->update($form->values); $self->_sip_lcr_reload($c); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Peering server successfully updated'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update peering server'), @@ -366,13 +367,13 @@ sub servers_delete :Chained('servers_base') :PathPart('delete') :Args(0) { try { $c->stash->{server_result}->delete; $self->_sip_lcr_reload($c); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{server_result}->get_inflated_columns }, desc => $c->loc('Peering server successfully deleted'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete peering server'), @@ -445,13 +446,13 @@ sub servers_flash_dialogic :Chained('servers_base') :PathPart('flash/dialogic') }); } } - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{server_result}->get_inflated_columns }, desc => $c->loc('Dialogic successfully flashed.'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to flash dialogic'), @@ -582,12 +583,12 @@ sub rules_create :Chained('rules_list') :PathPart('create') :Args(0) { $form->values->{callee_prefix} //= ''; $c->stash->{group_result}->voip_peer_rules->create($form->values); $self->_sip_lcr_reload($c); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Peering rule successfully created'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create peering rule'), @@ -607,8 +608,8 @@ sub rules_create :Chained('rules_list') :PathPart('create') :Args(0) { sub rules_base :Chained('rules_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $rule_id) = @_; - unless($rule_id && $rule_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($rule_id && is_int($rule_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid peering rule id detected', desc => $c->loc('Invalid peering rule id detected'), @@ -620,7 +621,7 @@ sub rules_base :Chained('rules_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{group_result}->voip_peer_rules->find($rule_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Peering Rule does not exist', desc => $c->loc('Peering Rule does not exist'), @@ -655,12 +656,12 @@ sub rules_edit :Chained('rules_base') :PathPart('edit') :Args(0) { $form->values->{callee_prefix} //= ''; $c->stash->{rule_result}->update($form->values); $self->_sip_lcr_reload($c); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Peering rule successfully changed'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update peering rule'), @@ -683,13 +684,13 @@ sub rules_delete :Chained('rules_base') :PathPart('delete') :Args(0) { try { $c->stash->{rule_result}->delete; $self->_sip_lcr_reload($c); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{rule_result}->get_inflated_columns }, desc => $c->loc('Peering rule successfully deleted'), ); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete peering rule'), diff --git a/lib/NGCP/Panel/Controller/Product.pm b/lib/NGCP/Panel/Controller/Product.pm index db34352967..57edfe2a8d 100644 --- a/lib/NGCP/Panel/Controller/Product.pm +++ b/lib/NGCP/Panel/Controller/Product.pm @@ -1,8 +1,9 @@ package NGCP::Panel::Controller::Product; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } sub auto :Does(ACL) :ACLDetachTo('/denied_page') :AllowedRole(admin) :AllowedRole(reseller) { my ($self, $c) = @_; diff --git a/lib/NGCP/Panel/Controller/Reseller.pm b/lib/NGCP/Panel/Controller/Reseller.pm index a6285dfd72..84a9e6cb25 100644 --- a/lib/NGCP/Panel/Controller/Reseller.pm +++ b/lib/NGCP/Panel/Controller/Reseller.pm @@ -1,7 +1,8 @@ package NGCP::Panel::Controller::Reseller; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -use namespace::sweep; -BEGIN { extends 'Catalyst::Controller'; } +#use namespace::sweep; +BEGIN { use base 'Catalyst::Controller'; } use DateTime qw(); use HTTP::Status qw(HTTP_SEE_OTHER); use File::Type; @@ -70,7 +71,7 @@ sub create :Chained('list_reseller') :PathPart('create') :Args(0) :Does(ACL) :AC if($c->user->read_only); my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); my $posted = $c->request->method eq 'POST'; my $form = NGCP::Panel::Form::Reseller->new; @@ -95,12 +96,12 @@ sub create :Chained('list_reseller') :PathPart('create') :Args(0) :Does(ACL) :AC delete $c->session->{created_objects}->{contract}; $c->session->{created_objects}->{reseller} = { id => $reseller->id }; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Reseller successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create reseller'), @@ -117,8 +118,8 @@ sub create :Chained('list_reseller') :PathPart('create') :Args(0) :Does(ACL) :AC sub base :Chained('list_reseller') :PathPart('') :CaptureArgs(1) { my ($self, $c, $reseller_id) = @_; - unless($reseller_id && $reseller_id->is_int) { - NGCP::Panel::Utils::Message->error( + unless($reseller_id && is_int($reseller_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid reseller id detected', desc => $c->loc('Invalid reseller id detected'), @@ -193,7 +194,7 @@ sub base :Chained('list_reseller') :PathPart('') :CaptureArgs(1) { $c->stash(reseller => $c->stash->{resellers}->search_rs({ id => $reseller_id })); unless($c->stash->{reseller}->first) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Reseller not found', desc => $c->loc('Reseller not found'), @@ -243,7 +244,7 @@ sub edit :Chained('base') :PathPart('edit') :Args(0) :Does(ACL) :ACLDetachTo('/d my $params = { $reseller->get_inflated_columns }; $params->{contract}{id} = delete $params->{contract_id}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); $form->process( posted => $posted, params => $c->request->params, @@ -271,12 +272,12 @@ sub edit :Chained('base') :PathPart('edit') :Args(0) :Does(ACL) :ACLDetachTo('/d delete $c->session->{created_objects}->{contract}; delete $c->session->{edit_contract_id}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Reseller successfully updated'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update reseller'), @@ -298,7 +299,7 @@ sub terminate :Chained('base') :PathPart('terminate') :Args(0) :Does(ACL) :ACLDe my $reseller = $c->stash->{reseller}->first; if ($reseller->id == 1) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Cannot terminate reseller with the id 1', desc => $c->loc('Cannot terminate reseller with the id 1'), @@ -315,13 +316,13 @@ sub terminate :Chained('base') :PathPart('terminate') :Args(0) :Does(ACL) :ACLDe $self->_handle_reseller_status_change($c,$reseller); } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $reseller->get_inflated_columns }, desc => $c->loc('Successfully terminated reseller'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to terminate reseller'), @@ -468,13 +469,13 @@ sub create_defaults :Path('create_defaults') :Args(0) :Does(ACL) :ACLDetachTo('/ #); }); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create reseller'), ); }; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Reseller successfully created with login [_1] and password [_2], please review your settings below', $defaults{admins}->{login}, $defaults{admins}->{md5pass}), ); @@ -552,12 +553,12 @@ sub edit_branding_css :Chained('base') :PathPart('css/edit') :Args(0) :Does(ACL) $branding->update($form->params); } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Reseller branding successfully updated'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update reseller branding'), diff --git a/lib/NGCP/Panel/Controller/Rewrite.pm b/lib/NGCP/Panel/Controller/Rewrite.pm index 32fb6c908c..1ab49bd63a 100644 --- a/lib/NGCP/Panel/Controller/Rewrite.pm +++ b/lib/NGCP/Panel/Controller/Rewrite.pm @@ -1,7 +1,8 @@ package NGCP::Panel::Controller::Rewrite; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use NGCP::Panel::Form::RewriteRule::AdminSet; use NGCP::Panel::Form::RewriteRule::ResellerSet; @@ -51,8 +52,8 @@ sub set_ajax :Chained('set_list') :PathPart('ajax') :Args(0) { sub set_base :Chained('set_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $set_id) = @_; - unless($set_id && $set_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($set_id && is_int($set_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid rewrite rule set id detected', desc => $c->loc('Invalid rewrite rule set id detected'), @@ -62,7 +63,7 @@ sub set_base :Chained('set_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{sets_rs}->find($set_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Rewrite rule set does not exist', desc => $c->loc('Rewrite rule set does not exist'), @@ -78,7 +79,7 @@ sub set_edit :Chained('set_base') :PathPart('edit') { my $posted = ($c->request->method eq 'POST'); my $params = { $c->stash->{set_result}->get_inflated_columns }; $params->{reseller}{id} = delete $params->{reseller_id}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); my $form; if($c->user->roles eq "admin") { $form = NGCP::Panel::Form::RewriteRule::AdminSet->new; @@ -106,12 +107,12 @@ sub set_edit :Chained('set_base') :PathPart('edit') { } $c->stash->{set_result}->update($form->values); delete $c->session->{created_objects}->{reseller}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Rewrite rule set successfully updated'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update rewrite rule set'), @@ -129,13 +130,13 @@ sub set_delete :Chained('set_base') :PathPart('delete') { try { $c->stash->{set_result}->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{set_result}->get_inflated_columns }, desc => $c->loc('Rewrite rule set successfully deleted'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete rewrite rule set'), @@ -149,7 +150,7 @@ sub set_clone :Chained('set_base') :PathPart('clone') { my $posted = ($c->request->method eq 'POST'); my $params = { $c->stash->{set_result}->get_inflated_columns }; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); my $form = NGCP::Panel::Form::RewriteRule::CloneSet->new; $form->process( posted => $posted, @@ -183,12 +184,12 @@ sub set_clone :Chained('set_base') :PathPart('clone') { }); } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Rewrite rule set successfully cloned'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to clone rewrite rule set.'), @@ -207,7 +208,7 @@ sub set_create :Chained('set_list') :PathPart('create') :Args(0) { my $posted = ($c->request->method eq 'POST'); my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); my $form; if($c->user->roles eq "admin") { $form = NGCP::Panel::Form::RewriteRule::AdminSet->new; @@ -237,12 +238,12 @@ sub set_create :Chained('set_list') :PathPart('create') :Args(0) { } $c->stash->{sets_rs}->create($form->values); delete $c->session->{created_objects}->{reseller}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Rewrite rule set successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create rewrite rule set'), @@ -274,7 +275,7 @@ sub rules_root :Chained('rules_list') :PathPart('') :Args(0) { my $param_where = $c->req->params->{where}; my $elem = $rules_rs->find($param_move) - if ($param_move && $param_move->is_integer && $param_where); + if ($param_move && is_int($param_move) && $param_where); if($elem) { my $use_next = ($param_where eq "down") ? 1 : 0; my $swap_elem = $rules_rs->search({ @@ -302,7 +303,7 @@ sub rules_root :Chained('rules_list') :PathPart('') :Args(0) { } $self->_sip_dialplan_reload($c); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to move rewrite rule.'), @@ -360,8 +361,8 @@ sub rules_root :Chained('rules_list') :PathPart('') :Args(0) { sub rules_base :Chained('rules_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $rule_id) = @_; - unless($rule_id && $rule_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($rule_id && is_int($rule_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid rewrite rule id detected', desc => $c->loc('Invalid rewrite rule id detected'), @@ -371,7 +372,7 @@ sub rules_base :Chained('rules_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{rules_rs}->find($rule_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Rewrite rule does not exist', desc => $c->loc('Rewrite rule does not exist'), @@ -402,12 +403,12 @@ sub rules_edit :Chained('rules_base') :PathPart('edit') { try { $c->stash->{rule_result}->update($form->values); $self->_sip_dialplan_reload($c); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Rewrite rule successfully updated'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update rewrite rule'), @@ -426,13 +427,13 @@ sub rules_delete :Chained('rules_base') :PathPart('delete') { try { $c->stash->{rule_result}->delete; $self->_sip_dialplan_reload($c); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{rule_result}->get_inflated_columns }, desc => $c->loc('Rewrite rule successfully deleted'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete rewrite rule'), @@ -462,12 +463,12 @@ sub rules_create :Chained('rules_list') :PathPart('create') :Args(0) { $form->values->{priority} = int($last_priority) + 1; $c->stash->{rules_rs}->create($form->values); $self->_sip_dialplan_reload($c); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Rewrite rule successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create rewrite rule'), diff --git a/lib/NGCP/Panel/Controller/Root.pm b/lib/NGCP/Panel/Controller/Root.pm index 65a358245d..2c061faa84 100644 --- a/lib/NGCP/Panel/Controller/Root.pm +++ b/lib/NGCP/Panel/Controller/Root.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Controller::Root; +use NGCP::Panel::Utils::Generic qw(:all); use Moose; BEGIN { extends 'Catalyst::Controller' } @@ -18,6 +19,7 @@ __PACKAGE__->config(namespace => ''); sub auto :Private { my($self, $c) = @_; + #exit(0); # just for profiling if(defined $c->request->params->{lang} && $c->request->params->{lang} =~ /^\w+$/) { $c->log->debug("checking language"); diff --git a/lib/NGCP/Panel/Controller/Security.pm b/lib/NGCP/Panel/Controller/Security.pm index 4aec11bbe2..916fb6ee8a 100644 --- a/lib/NGCP/Panel/Controller/Security.pm +++ b/lib/NGCP/Panel/Controller/Security.pm @@ -1,7 +1,8 @@ package NGCP::Panel::Controller::Security; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use XML::LibXML; use URI::Encode; @@ -116,7 +117,7 @@ sub ip_unban :Chained('ip_base') :PathPart('unban') :Args(0) { EOF $dispatcher->dispatch($c, "loadbalancer", 1, 1, $xml); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { ip => $ip }, desc => $c->loc('IP successfully unbanned'), @@ -150,7 +151,7 @@ EOF $dispatcher->dispatch($c, "loadbalancer", 1, 1, $xml); } - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { user => $user }, desc => $c->loc('User successfully unbanned'), diff --git a/lib/NGCP/Panel/Controller/Sound.pm b/lib/NGCP/Panel/Controller/Sound.pm index 4dac355791..4608f2e67a 100644 --- a/lib/NGCP/Panel/Controller/Sound.pm +++ b/lib/NGCP/Panel/Controller/Sound.pm @@ -1,8 +1,9 @@ package NGCP::Panel::Controller::Sound; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use NGCP::Panel::Form::Sound::AdminSet; use NGCP::Panel::Form::Sound::ResellerSet; @@ -43,7 +44,7 @@ sub auto :Private { $contract_select_rs = $contract_select_rs->search({ 'me.id' => $contract_id }); my $product_id = $contract_select_rs->first->get_column('product_id'); unless($product_id) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "No product for customer contract id $contract_id found", desc => $c->loc('No product for this customer contract found.'), @@ -80,8 +81,8 @@ sub sets_list :Chained('/') :PathPart('sound') :CaptureArgs(0) { sub contract_sets_list :Chained('/') :PathPart('sound/contract') :CaptureArgs(1) { my ( $self, $c, $contract_id ) = @_; - unless($contract_id && $contract_id->is_int) { - NGCP::Panel::Utils::Message->error( + unless($contract_id && is_int($contract_id)) { + NGCP::Panel::Utils::Message::error( c => $c, error => "Invalid contract id $contract_id found", desc => $c->loc('Invalid contract id found'), @@ -89,7 +90,7 @@ sub contract_sets_list :Chained('/') :PathPart('sound/contract') :CaptureArgs(1) NGCP::Panel::Utils::Navigation::back_or($c, $c->uri_for('/sound')); } if($c->user->roles eq "subscriberadmin" && $c->user->account_id != $contract_id) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "access violation, subscriberadmin ".$c->user->uuid." with contract id ".$c->user->account_id." tries to access foreign contract id $contract_id", desc => $c->loc('Invalid contract id found'), @@ -98,7 +99,7 @@ sub contract_sets_list :Chained('/') :PathPart('sound/contract') :CaptureArgs(1) } my $contract = $c->model('DB')->resultset('contracts')->find($contract_id); unless($contract) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "Contract id $contract_id not found", desc => $c->loc('Invalid contract id detected'), @@ -140,8 +141,8 @@ sub contract_ajax :Chained('contract_sets_list') :PathPart('ajax') :Args(0) { sub base :Chained('sets_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $set_id) = @_; - unless($set_id && $set_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($set_id && is_int($set_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid sound set id detected', desc => $c->loc('Invalid sound set id detected'), @@ -151,7 +152,7 @@ sub base :Chained('sets_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{sets_rs}->find($set_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Sound set does not exist', desc => $c->loc('Sound set does not exist'), @@ -170,7 +171,7 @@ sub edit :Chained('base') :PathPart('edit') { my $params = { $c->stash->{set_result}->get_inflated_columns }; $params->{reseller}{id} = delete $params->{reseller_id}; $params->{contract}{id} = delete $params->{contract_id}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); if($c->user->roles eq "admin") { $form = NGCP::Panel::Form::Sound::AdminSet->new; } elsif($c->user->roles eq "reseller") { @@ -249,12 +250,12 @@ sub edit :Chained('base') :PathPart('edit') { }); delete $c->session->{created_objects}->{reseller}; delete $c->session->{created_objects}->{contract}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Sound set successfully updated'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update sound set'), @@ -296,13 +297,13 @@ sub delete :Chained('base') :PathPart('delete') { $c->stash->{set_result}->delete; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{set_result}->get_inflated_columns }, desc => $c->loc('Sound set successfully deleted'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete sound set'), @@ -318,7 +319,7 @@ sub create :Chained('sets_list') :PathPart('create') :Args() { my $posted = ($c->request->method eq 'POST'); my $form; my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); if($c->user->roles eq "admin") { $form = NGCP::Panel::Form::Sound::AdminSet->new; if($contract_id) { @@ -414,12 +415,12 @@ sub create :Chained('sets_list') :PathPart('create') :Args() { }); delete $c->session->{created_objects}->{reseller}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Sound set successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create sound set'), @@ -509,8 +510,8 @@ sub handles_root :Chained('handles_list') :PathPart('') :Args(0) { sub handles_base :Chained('handles_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $handle_id) = @_; - unless($handle_id && $handle_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($handle_id && is_int($handle_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid sound handle id detected', desc => $c->loc('Invalid sound handle id detected'), @@ -519,7 +520,7 @@ sub handles_base :Chained('handles_list') :PathPart('') :CaptureArgs(1) { } my @tmph = $c->stash->{handles_rs}->all; unless($c->stash->{handles_rs}->find({ 'handles.id' => $handle_id })) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Sound handle id does not exist', desc => $c->loc('Sound handle id does not exist'), @@ -529,7 +530,7 @@ sub handles_base :Chained('handles_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{files_rs}->find_or_create(handle_id => $handle_id); unless(defined $res ) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Sound handle not found', desc => $c->loc('Sound handle not found'), @@ -570,7 +571,7 @@ sub handles_edit :Chained('handles_base') :PathPart('edit') { my $ft = File::Type->new(); unless ($ft->checktype_contents($soundfile) eq 'audio/x-wav') { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid file type detected, only WAV supported', desc => $c->loc('Invalid file type detected, only WAV supported'), @@ -585,7 +586,7 @@ sub handles_edit :Chained('handles_base') :PathPart('edit') { try { NGCP::Panel::Utils::Sems::clear_audio_cache($c, $file_result->set_id, $file_result->handle->name, $group_name); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "Failed to clear audio cache for " . $group_name . " at appserver", desc => $c->loc('Failed to clear audio cache.'), @@ -602,7 +603,7 @@ sub handles_edit :Chained('handles_base') :PathPart('edit') { $soundfile = NGCP::Panel::Utils::Sounds::transcode_file( $upload->tempname, 'WAV', $target_codec); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Transcoding audio file failed', desc => $c->loc('Transcoding audio file failed'), @@ -617,12 +618,12 @@ sub handles_edit :Chained('handles_base') :PathPart('edit') { data => $soundfile, codec => $target_codec, }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Sound handle successfully uploaded'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update uploaded sound handle'), @@ -633,12 +634,12 @@ sub handles_edit :Chained('handles_base') :PathPart('edit') { $file_result->update({ loopplay => $form->values->{loopplay}, }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Sound handle successfully updated'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update sound handle'), @@ -658,13 +659,13 @@ sub handles_delete :Chained('handles_base') :PathPart('delete') { try { $c->stash->{file_result}->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{file_result}->get_inflated_columns }, desc => $c->loc('Sound handle successfully deleted'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete sound handle'), @@ -697,7 +698,7 @@ sub handles_download :Chained('handles_base') :PathPart('download') :Args(0) { $data = NGCP::Panel::Utils::Sounds::transcode_data( $file->data, $file->codec, 'WAV'); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to transcode audio file'), @@ -829,12 +830,12 @@ sub handles_load_default :Chained('handles_list') :PathPart('loaddefault') :Args } } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Sound set successfully loaded with default files.'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to load default sound files.'), diff --git a/lib/NGCP/Panel/Controller/Statistics.pm b/lib/NGCP/Panel/Controller/Statistics.pm index ff15c107a3..50d0d987d7 100644 --- a/lib/NGCP/Panel/Controller/Statistics.pm +++ b/lib/NGCP/Panel/Controller/Statistics.pm @@ -1,7 +1,8 @@ package NGCP::Panel::Controller::Statistics; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use NGCP::Panel::Utils::Statistics; use NGCP::Panel::Form::Statistics; diff --git a/lib/NGCP/Panel/Controller/Subscriber.pm b/lib/NGCP/Panel/Controller/Subscriber.pm index 127e2637e8..d422b1b083 100644 --- a/lib/NGCP/Panel/Controller/Subscriber.pm +++ b/lib/NGCP/Panel/Controller/Subscriber.pm @@ -1,6 +1,7 @@ package NGCP::Panel::Controller::Subscriber; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use HTML::Entities; use JSON qw(decode_json encode_json); use URI::Escape qw(uri_unescape); @@ -136,7 +137,7 @@ sub create_list :Chained('sub_list') :PathPart('create') :Args(0) :Does(ACL) :AC my $posted = ($c->request->method eq 'POST'); my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); my $form = NGCP::Panel::Form::Subscriber->new(ctx => $c); $form->process( posted => $posted, @@ -190,12 +191,12 @@ sub create_list :Chained('sub_list') :PathPart('create') :Args(0) :Does(ACL) :AC delete $c->session->{created_objects}->{contract}; delete $c->session->{created_objects}->{domain}; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Subscriber successfully created!'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create subscriber'), @@ -211,8 +212,8 @@ sub create_list :Chained('sub_list') :PathPart('create') :Args(0) :Does(ACL) :AC sub base :Chained('sub_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $subscriber_id) = @_; - unless($subscriber_id && $subscriber_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($subscriber_id && is_int($subscriber_id)) { + NGCP::Panel::Utils::Message::error( c => $c, error => "subscriber id '$subscriber_id' is not an integer", desc => $c->loc('Invalid subscriber id detected'), @@ -222,7 +223,7 @@ sub base :Chained('sub_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{subscribers_rs}->find({ id => $subscriber_id }); unless(defined $res) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "subscriber id '$subscriber_id' does not exist", desc => $c->loc('Subscriber does not exist'), @@ -238,7 +239,7 @@ sub base :Chained('sub_list') :PathPart('') :CaptureArgs(1) { 'me.id' => $c->stash->{contract}->id, }); unless(defined $contract) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "subscriber id '$subscriber_id' points to non-existing contract id", desc => $c->loc('Contract does not exist for subscriber'), @@ -356,7 +357,7 @@ sub webfax_send :Chained('base') :PathPart('webfax/send') :Args(0) { ); } } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => "failed to send fax: $e", desc => $c->loc('Error while sending fax (have the fax settings been configured properly?)'), @@ -449,7 +450,7 @@ sub terminate :Chained('base') :PathPart('terminate') :Args(0) :Does(ACL) :ACLDe my $subscriber = $c->stash->{subscriber}; if($c->user->roles eq 'subscriberadmin' && $c->user->uuid eq $subscriber->uuid) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => 'unauthorized termination of own subscriber for uuid '.$c->user->uuid, desc => $c->loc('Terminating own subscriber is prohibited.'), @@ -459,13 +460,13 @@ sub terminate :Chained('base') :PathPart('terminate') :Args(0) :Does(ACL) :ACLDe try { NGCP::Panel::Utils::Subscriber::terminate(c => $c, subscriber => $subscriber); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $subscriber->get_inflated_columns }, desc => $c->loc('Successfully terminated subscriber'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to terminate subscriber'), @@ -479,7 +480,7 @@ sub reset_webpassword :Chained('base') :PathPart('resetwebpassword') :Args(0) { my $subscriber = $c->stash->{subscriber}; if($c->user->roles eq 'subscriberadmin' && $c->user->voip_subscriber->contract_id != $subscriber->contract_id) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => 'unauthorized password reset for subscriber uuid '.$c->user->uuid, desc => $c->loc('Invalid password reset attempt.'), @@ -509,12 +510,12 @@ sub reset_webpassword :Chained('base') :PathPart('resetwebpassword') :Args(0) { }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully reset web password, please check your email at [_1]', $subscriber->contact ? $subscriber->contact->email : $subscriber->contract->contact->email), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to reset web password'), @@ -571,12 +572,12 @@ sub reset_webpassword_nosubscriber :Chained('/') :PathPart('resetwebpassword') : NGCP::Panel::Utils::Email::password_reset($c, $subscriber, $url); } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully reset web password, please check your email'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to reset web password'), @@ -659,7 +660,7 @@ sub recover_webpassword :Chained('/') :PathPart('recoverwebpassword') :Args(0) { $rs->delete; }); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, type => 'internal', @@ -669,7 +670,7 @@ sub recover_webpassword :Chained('/') :PathPart('recoverwebpassword') :Args(0) { } $c->log->debug("+++++++++++++++++++++++ successfully recovered subscriber " . $subscriber->username . '@' . $subscriber->domain->domain); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { username => $subscriber->username . '@' . $subscriber->domain->domain }, desc => $c->loc('Web password successfully recovered, please re-login.'), @@ -782,7 +783,7 @@ sub preferences_base :Chained('base') :PathPart('preferences') :CaptureArgs(1) { ->single({id => $pref_id}); if(($c->user->roles eq 'subscriber' || $c->user->roles eq 'subscriberadmin') && !$c->stash->{preference_meta}->expose_to_customer) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, type => 'internal', desc => $c->loc("Invalid access to pref_id '[_1]' by provisioning subscriber id '[_2]'", $pref_id, $c->user->id), @@ -839,7 +840,7 @@ sub preferences_edit :Chained('preferences_base') :PathPart('edit') :Args(0) { schema => $c->model('DB'), subscriber => $c->stash->{subscriber}); } } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => "Failed to handle preference: $e", desc => $c->loc('Failed to handle preference'), @@ -875,7 +876,7 @@ sub preferences_edit :Chained('preferences_base') :PathPart('edit') :Args(0) { } } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => "Failed to set peer registration: $e", desc => $c->loc('Peer registration error'), @@ -910,7 +911,7 @@ sub preferences_callforward :Chained('base') :PathPart('preferences/callforward' last SWITCH; }; # default - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => "Invalid call-forward type '$cf_type'", desc => $c->loc('Invalid Call Forward type.'), @@ -1109,12 +1110,12 @@ sub preferences_callforward :Chained('base') :PathPart('preferences/callforward' } } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully saved Call Forward'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to save Call Forward'), @@ -1166,7 +1167,7 @@ sub preferences_callforward_advanced :Chained('base') :PathPart('preferences/cal last SWITCH; }; # default - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => "Invalid call-forward type '$cf_type'", desc => $c->loc('Invalid Call Forward type.'), @@ -1248,7 +1249,7 @@ sub preferences_callforward_advanced :Chained('base') :PathPart('preferences/cal unless(@active) { $ringtimeout_preference->first->delete if($cf_type eq "cft" && $ringtimeout_preference->first); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully cleared Call Forward'), ); @@ -1296,12 +1297,12 @@ sub preferences_callforward_advanced :Chained('base') :PathPart('preferences/cal } } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully saved Call Forward'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to save Call Forward'), @@ -1431,13 +1432,13 @@ sub preferences_callforward_destinationset_create :Chained('base') :PathPart('pr } } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, type => 'internal', desc => $c->loc('Successfully created new destination set'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, type => 'internal', @@ -1615,13 +1616,13 @@ sub preferences_callforward_destinationset_edit :Chained('preferences_callforwar } } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, type => 'internal', desc => $c->loc('Successfully updated destination set'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, type => 'internal', @@ -1667,14 +1668,14 @@ sub preferences_callforward_destinationset_delete :Chained('preferences_callforw } $set->delete; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $set->get_inflated_columns }, type => 'internal', desc => $c->loc('Successfully deleted destination set'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => { $set->get_inflated_columns }, @@ -1776,13 +1777,13 @@ sub preferences_callforward_timeset_create :Chained('base') :PathPart('preferenc } } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, type => 'internal', desc => $c->loc('Successfully created new time set'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, type => 'internal', @@ -1903,13 +1904,13 @@ sub preferences_callforward_timeset_edit :Chained('preferences_callforward_times $set->voip_cf_periods->create($fields); } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, type => 'internal', desc => $c->loc('Successfully updated time set'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, type => 'internal', @@ -1943,14 +1944,14 @@ sub preferences_callforward_timeset_delete :Chained('preferences_callforward_tim } $set->delete; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $set->get_inflated_columns }, type => 'internal', desc => $c->loc('Successfully deleted time set'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => { $set->get_inflated_columns }, @@ -1981,12 +1982,12 @@ sub preferences_callforward_delete :Chained('base') :PathPart('preferences/callf prov_subscriber => $prov_subscriber, ); $cf_pref->delete_all; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully deleted Call Forward'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete Call Forward.'), @@ -2006,7 +2007,7 @@ sub underrun_catchup :Private { NGCP::Panel::Utils::ProfilePackages::get_contract_balance(c => $c, contract => $c->stash->{subscriber}->contract); }); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, type => 'internal', @@ -2362,7 +2363,7 @@ sub edit_master :Chained('master') :PathPart('edit') :Args(0) :Does(ACL) :ACLDet $profile_set = $profile_set_rs->find($form->values->{profile_set}{id}); unless($profile_set) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => 'invalid subscriber profile set id ' . $form->values->{profile_set}{id}, desc => $c->loc('Invalid subscriber profile set id'), @@ -2549,7 +2550,7 @@ sub edit_master :Chained('master') :PathPart('edit') :Args(0) :Does(ACL) :ACLDet } } } elsif(defined $subscriber->provisioning_voip_subscriber->pbx_extension) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $c->loc('CloudPBX subscriber must have a primary number'), desc => $c->loc('Failed to update subscriber, CloudPBX must have a primary number'), @@ -2595,12 +2596,12 @@ sub edit_master :Chained('master') :PathPart('edit') :Args(0) :Does(ACL) :ACLDet #} }); delete $c->session->{created_objects}->{group}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully updated subscriber'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update subscriber'), @@ -2716,12 +2717,12 @@ sub webpass_edit :Chained('base') :PathPart('webpass/edit') :Args(0) { $prov_subscriber->update({ webpassword => $form->values->{webpassword} }); }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully updated password'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update subscriber (webpassword)'), @@ -2749,7 +2750,7 @@ sub edit_voicebox :Chained('base') :PathPart('preferences/voicebox/edit') :Args( my $posted = ($c->request->method eq 'POST'); my $vm_user = $c->stash->{subscriber}->provisioning_voip_subscriber->voicemail_user; unless($vm_user) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => "no voicemail user found for subscriber uuid ".$c->stash->{subscriber}->uuid, desc => $c->loc('Failed to find voicemail user.'), @@ -2814,7 +2815,7 @@ sub edit_voicebox :Chained('base') :PathPart('preferences/voicebox/edit') :Args( last SWITCH; }; # default - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => "trying to set invalid voicemail param '$attribute' for subscriber uuid ".$c->stash->{subscriber}->uuid, desc => $c->loc('Invalid voicemail setting'), @@ -2824,7 +2825,7 @@ sub edit_voicebox :Chained('base') :PathPart('preferences/voicebox/edit') :Args( return; } # SWITCH if($posted && $form->validated) { - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully updated voicemail setting'), ); @@ -2833,7 +2834,7 @@ sub edit_voicebox :Chained('base') :PathPart('preferences/voicebox/edit') :Args( return; } } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update voicemail setting'), @@ -2968,7 +2969,7 @@ sub edit_fax :Chained('base') :PathPart('preferences/fax/edit') :Args(1) { last SWITCH; }; # default - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => "trying to set invalid fax param '$attribute' for subscriber uuid ".$c->stash->{subscriber}->uuid, desc => $c->loc('Invalid fax setting.'), @@ -2978,7 +2979,7 @@ sub edit_fax :Chained('base') :PathPart('preferences/fax/edit') :Args(1) { return; } # SWITCH if($posted && $form->validated) { - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully updated fax setting'), ); @@ -2987,7 +2988,7 @@ sub edit_fax :Chained('base') :PathPart('preferences/fax/edit') :Args(1) { return; } } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update fax setting'), @@ -3050,12 +3051,12 @@ sub edit_reminder :Chained('base') :PathPart('preferences/reminder/edit') { } elsif($reminder) { $reminder->delete; } - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully updated reminder setting'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update reminder setting.'), @@ -3176,7 +3177,7 @@ sub voicemail :Chained('master') :PathPart('voicemail') :CaptureArgs(1) { id => $vm_id, }); unless($rs->first) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => "no such voicemail file with id '$vm_id' for uuid ".$c->stash->{subscriber}->uuid, desc => $c->loc('No such voicemail file.'), @@ -3198,7 +3199,7 @@ sub play_voicemail :Chained('voicemail') :PathPart('play') :Args(0) { $data= NGCP::Panel::Utils::Sounds::transcode_data( $recording, 'WAV', 'WAV'); } catch ($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Transcode of audio file failed'), @@ -3223,13 +3224,13 @@ sub delete_voicemail :Chained('voicemail') :PathPart('delete') :Args(0) { try { $c->stash->{voicemail}->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{voicemail}->get_inflated_columns }, desc => $c->loc('Successfully deleted voicemail'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete voicemail message'), @@ -3255,7 +3256,7 @@ sub registered :Chained('master') :PathPart('registered') :CaptureArgs(1) { } $c->stash->{registered} = $reg_rs->first; unless($c->stash->{registered}) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => "failed to find location id '$reg_id' for subscriber uuid " . $s->uuid, desc => $c->loc('Failed to find registered device.'), @@ -3278,14 +3279,14 @@ sub delete_registered :Chained('registered') :PathPart('delete') :Args(0) { $c->stash->{subscriber}->provisioning_voip_subscriber, $c->stash->{registered}->contact); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete registered device'), ); } - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{registered}->get_inflated_columns }, desc => $c->loc('Successfully deleted registered device'), @@ -3319,12 +3320,12 @@ sub create_registered :Chained('master') :PathPart('registered/create') :Args(0) $form->field('contact')->value, $form->field('q')->value ); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully added registered device'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to add registered device'), @@ -3368,12 +3369,12 @@ sub create_trusted :Chained('base') :PathPart('preferences/trusted/create') :Arg protocol => $form->field('protocol')->value, from_pattern => $form->field('from_pattern') ? $form->field('from_pattern')->value : undef, }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully created trusted source'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create trusted source'), @@ -3398,7 +3399,7 @@ sub trusted_base :Chained('base') :PathPart('preferences/trusted') :CaptureArgs( ->voip_trusted_sources->find($trusted_id); unless($c->stash->{trusted}) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => "trusted source id '$trusted_id' not found for subscriber uuid ".$c->stash->{subscriber}->uuid, desc => $c->loc('Trusted source entry not found'), @@ -3444,12 +3445,12 @@ sub edit_trusted :Chained('trusted_base') :PathPart('edit') { protocol => $form->field('protocol')->value, from_pattern => $form->field('from_pattern') ? $form->field('from_pattern')->value : undef, }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully updated trusted source'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update trusted source'), @@ -3475,13 +3476,13 @@ sub delete_trusted :Chained('trusted_base') :PathPart('delete') :Args(0) { try { $c->stash->{trusted}->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{trusted}->get_inflated_columns }, desc => $c->loc('Successfully deleted trusted source'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete trusted source.'), @@ -3556,12 +3557,12 @@ sub create_speeddial :Chained('base') :PathPart('preferences/speeddial/create') slot => $form->field('slot')->value, destination => $d, }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully created speed dial slot'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create speed dial slot'), @@ -3586,7 +3587,7 @@ sub speeddial :Chained('base') :PathPart('preferences/speeddial') :CaptureArgs(1 my $sd = $c->stash->{subscriber}->provisioning_voip_subscriber->voip_speed_dials ->find($sd_id); unless($sd) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => "no such speed dial slot with id '$sd_id' for uuid ".$c->stash->{subscriber}->uuid, desc => $c->loc('No such speed dial id.'), @@ -3605,13 +3606,13 @@ sub delete_speeddial :Chained('speeddial') :PathPart('delete') :Args(0) { try { $c->stash->{speeddial}->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{speeddial}->get_inflated_columns }, desc => $c->loc('Successfully deleted speed dial slot'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete speed dial slot'), @@ -3661,12 +3662,12 @@ sub edit_speeddial :Chained('speeddial') :PathPart('edit') :Args(0) { slot => $form->field('slot')->value, destination => $d, }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully updated speed dial slot'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update speed dial slot'), @@ -3701,7 +3702,7 @@ sub autoattendant :Chained('base') :PathPart('preferences/autoattendant') :Captu my $aa = $c->stash->{subscriber}->provisioning_voip_subscriber->voip_pbx_autoattendants ->find($aa_id); unless($aa) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => "no such auto attendant slot with id '$aa_id' for uuid ".$c->stash->{subscriber}->uuid, desc => $c->loc('No such auto attendant id.'), @@ -3720,13 +3721,13 @@ sub delete_autoattendant :Chained('autoattendant') :PathPart('delete') :Args(0) try { $c->stash->{autoattendant}->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{autoattendant}->get_inflated_columns }, desc => $c->loc('Successfully deleted auto attendant slot'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete auto attendant slot'), @@ -3787,12 +3788,12 @@ sub edit_autoattendant :Chained('base') :PathPart('preferences/speeddial/edit') }); } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully updated auto attendant slots'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update autoattendant slots'), @@ -3827,7 +3828,7 @@ sub ccmappings :Chained('base') :PathPart('preferences/ccmappings') :CaptureArgs my $ccmapping = $c->stash->{subscriber}->provisioning_voip_subscriber->voip_cc_mappings ->find($aa_id); unless($ccmapping) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => "no such ccmapping with id '$aa_id' for uuid ".$c->stash->{subscriber}->uuid, desc => $c->loc('No such auto ccmapping id.'), @@ -3847,13 +3848,13 @@ sub delete_ccmapping :Chained('ccmappings') :PathPart('delete') :Args(0) { try { $c->stash->{ccmapping}->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{ccmapping}->get_inflated_columns }, desc => $c->loc('Successfully deleted ccmapping'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete ccmapping'), @@ -3907,12 +3908,12 @@ sub edit_ccmapping :Chained('base') :PathPart('preferences/ccmappings/edit') :Ar }); } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Successfully updated ccmappings'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update ccmappings'), diff --git a/lib/NGCP/Panel/Controller/SubscriberProfile.pm b/lib/NGCP/Panel/Controller/SubscriberProfile.pm index 39a252536c..8c1f5eca9d 100644 --- a/lib/NGCP/Panel/Controller/SubscriberProfile.pm +++ b/lib/NGCP/Panel/Controller/SubscriberProfile.pm @@ -1,7 +1,8 @@ package NGCP::Panel::Controller::SubscriberProfile; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use NGCP::Panel::Form::SubscriberProfile::SetAdmin; use NGCP::Panel::Form::SubscriberProfile::SetReseller; @@ -69,8 +70,8 @@ sub set_ajax_reseller :Chained('set_list') :PathPart('ajax/reseller') :Args(1) : sub set_base :Chained('set_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $set_id) = @_; - unless($set_id && $set_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($set_id && is_int($set_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid subscriber profile set id detected', desc => $c->loc('Invalid subscriber profile set id detected'), @@ -80,7 +81,7 @@ sub set_base :Chained('set_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{set_rs}->find($set_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Subscriber profile set does not exist', desc => $c->loc('Subscriber profile set does not exist'), @@ -98,7 +99,7 @@ sub set_create :Chained('set_list') :PathPart('create') :Args(0) :Does(ACL) :ACL my $posted = ($c->request->method eq 'POST'); my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); my $form; if($c->user->roles eq "admin") { $form = NGCP::Panel::Form::SubscriberProfile::SetAdmin->new; @@ -133,12 +134,12 @@ sub set_create :Chained('set_list') :PathPart('create') :Args(0) :Does(ACL) :ACL delete $c->session->{created_objects}->{reseller}; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Subscriber profile set successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create subscriber profile set'), @@ -161,7 +162,7 @@ sub set_edit :Chained('set_base') :PathPart('edit') :Does(ACL) :ACLDetachTo('/de my $posted = ($c->request->method eq 'POST'); my $params = { $set->get_inflated_columns }; $params->{reseller}{id} = delete $params->{reseller_id}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); my $form; if($c->user->roles eq "admin") { $form = NGCP::Panel::Form::SubscriberProfile::SetAdmin->new; @@ -196,12 +197,12 @@ sub set_edit :Chained('set_base') :PathPart('edit') :Does(ACL) :ACLDetachTo('/de delete $c->session->{created_objects}->{reseller}; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Subscriber profile set successfully updated'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update subscriber profile set'), @@ -232,13 +233,13 @@ sub set_delete :Chained('set_base') :PathPart('delete') :Does(ACL) :ACLDetachTo( $c->stash->{set}->voip_subscriber_profiles->delete; $c->stash->{set}->delete; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{set}->get_inflated_columns }, desc => $c->loc('Subscriber profile set successfully deleted'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete subscriber profile set'), @@ -256,7 +257,7 @@ sub set_clone :Chained('set_base') :PathPart('clone') :Does(ACL) :ACLDetachTo('/ my $posted = ($c->request->method eq 'POST'); my $params = { $c->stash->{set}->get_inflated_columns }; $params->{reseller}{id} = delete $params->{reseller_id}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); my $form; if($c->user->roles eq "admin") { $form = NGCP::Panel::Form::SubscriberProfile::SetCloneAdmin->new; @@ -303,12 +304,12 @@ sub set_clone :Chained('set_base') :PathPart('clone') :Does(ACL) :ACLDetachTo('/ } } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Subscriber profile successfully cloned'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to clone subscriber profile'), @@ -351,8 +352,8 @@ sub profile_ajax :Chained('profile_list') :PathPart('ajax') :Args(0) { sub profile_base :Chained('profile_list') :PathPart('') :CaptureArgs(1) :Does(ACL) :ACLDetachTo('/denied_page') :AllowedRole(admin) :AllowedRole(reseller) { my ($self, $c, $profile_id) = @_; - unless($profile_id && $profile_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($profile_id && is_int($profile_id)) { + NGCP::Panel::Utils::Message::error( c => $c, log => 'Invalid subscriber profile id detected', desc => $c->loc('Invalid subscriber profile id detected'), @@ -362,7 +363,7 @@ sub profile_base :Chained('profile_list') :PathPart('') :CaptureArgs(1) :Does(AC my $res = $c->stash->{set}->voip_subscriber_profiles->find($profile_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, log => 'Subscriber profile does not exist', desc => $c->loc('Subscriber profile does not exist'), @@ -383,7 +384,7 @@ sub profile_create :Chained('profile_list') :PathPart('create') :Args(0) :Does(A my $posted = ($c->request->method eq 'POST'); my $params = {}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); my $form = NGCP::Panel::Form::SubscriberProfile::Profile->new(ctx => $c); #$form->create_structure($form->field_names); $form->process( @@ -425,12 +426,12 @@ sub profile_create :Chained('profile_list') :PathPart('create') :Args(0) :Does(A }); } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Subscriber profile successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create subscriber profile'), @@ -558,12 +559,12 @@ sub profile_edit :Chained('profile_base') :PathPart('edit') :Does(ACL) :ACLDetac } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Subscriber profile successfully updated'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update subscriber profile'), @@ -602,13 +603,13 @@ sub profile_delete :Chained('profile_base') :PathPart('delete') :Does(ACL) :ACLD $profile->voip_prof_preferences->delete; $profile->delete; }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => { $c->stash->{profile}->get_inflated_columns }, desc => $c->loc('Subscriber profile successfully deleted'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to delete subscriber profile'), @@ -625,7 +626,7 @@ sub profile_clone :Chained('profile_base') :PathPart('clone') :Does(ACL) :ACLDet my $posted = ($c->request->method eq 'POST'); my $params = { $c->stash->{profile}->get_inflated_columns }; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); my $form = NGCP::Panel::Form::SubscriberProfile::ProfileClone->new; $form->process( posted => $posted, @@ -652,12 +653,12 @@ sub profile_clone :Chained('profile_base') :PathPart('clone') :Does(ACL) :ACLDet }); } }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Subscriber profile successfully cloned'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to clone subscriber profile'), diff --git a/lib/NGCP/Panel/Controller/Voucher.pm b/lib/NGCP/Panel/Controller/Voucher.pm index 0d3653bb18..12e4ac7e4c 100644 --- a/lib/NGCP/Panel/Controller/Voucher.pm +++ b/lib/NGCP/Panel/Controller/Voucher.pm @@ -1,9 +1,10 @@ package NGCP::Panel::Controller::Voucher; +use NGCP::Panel::Utils::Generic qw(:all); use Sipwise::Base; use Text::CSV_XS; use DateTime::Format::ISO8601; -BEGIN { extends 'Catalyst::Controller'; } +BEGIN { use base 'Catalyst::Controller'; } use NGCP::Panel::Form::Voucher::Admin; use NGCP::Panel::Form::Voucher::Reseller; @@ -98,8 +99,8 @@ sub ajax_package_filter :Chained('voucher_list') :PathPart('ajax/package') :Args sub base :Chained('voucher_list') :PathPart('') :CaptureArgs(1) { my ($self, $c, $voucher_id) = @_; - unless($voucher_id && $voucher_id->is_integer) { - NGCP::Panel::Utils::Message->error( + unless($voucher_id && is_int($voucher_id)) { + NGCP::Panel::Utils::Message::error( c => $c, data => { id => $voucher_id }, desc => $c->loc('Invalid voucher id detected!'), @@ -110,7 +111,7 @@ sub base :Chained('voucher_list') :PathPart('') :CaptureArgs(1) { my $res = $c->stash->{voucher_rs}->find($voucher_id); unless(defined($res)) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, data => { id => $voucher_id }, desc => $c->loc('Billing Voucher does not exist!'), @@ -130,12 +131,12 @@ sub delete :Chained('base') :PathPart('delete') { try { $c->stash->{voucher_result}->delete; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Billing Voucher successfully deleted'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, data => { id => $$c->stash->{voucher_result}->id }, desc => $c->loc('Failed to delete Billing Voucher'), @@ -164,7 +165,7 @@ sub edit :Chained('base') :PathPart('edit') { } else { delete $params->{code}; } - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); if($c->user->is_superuser) { $form = NGCP::Panel::Form::Voucher::Admin->new(ctx => $c); } else { @@ -215,12 +216,12 @@ sub edit :Chained('base') :PathPart('edit') { delete $c->session->{created_objects}->{reseller}; delete $c->session->{created_objects}->{customer}; delete $c->session->{created_objects}->{profile_package}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Billing voucher successfully updated'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to update billing voucher'), @@ -243,7 +244,7 @@ sub create :Chained('voucher_list') :PathPart('create') :Args(0) { my $form; my $params = {}; $params->{reseller}{id} = delete $params->{reseller_id}; - $params = $params->merge($c->session->{created_objects}); + $params = merge($params, $c->session->{created_objects}); if($c->user->is_superuser) { $form = NGCP::Panel::Form::Voucher::Admin->new(ctx => $c); } else { @@ -287,12 +288,12 @@ sub create :Chained('voucher_list') :PathPart('create') :Args(0) { delete $c->session->{created_objects}->{reseller}; delete $c->session->{created_objects}->{customer}; delete $c->session->{created_objects}->{profile_package}; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Billing voucher successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create billing voucher'), @@ -325,7 +326,7 @@ sub voucher_upload :Chained('voucher_list') :PathPart('upload') :Args(0) { if($posted && $form->validated) { unless($upload) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, desc => $c->loc('No Billing Voucher file specified!'), ); @@ -374,12 +375,12 @@ sub voucher_upload :Chained('voucher_list') :PathPart('upload') :Args(0) { if(@fails) { $text .= $c->loc(", but skipped the following line numbers: ") . (join ", ", @fails); } - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $text, ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to upload Billing Vouchers'), diff --git a/lib/NGCP/Panel/Field/AliasNumber.pm b/lib/NGCP/Panel/Field/AliasNumber.pm index 2bd45fe2ab..d7d05f2d8d 100644 --- a/lib/NGCP/Panel/Field/AliasNumber.pm +++ b/lib/NGCP/Panel/Field/AliasNumber.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::AliasNumber; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Repeatable'; @@ -27,6 +28,7 @@ has_field 'rm' => ( ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/BillingNetwork.pm b/lib/NGCP/Panel/Field/BillingNetwork.pm index 978f63b9bf..0bcd1bb880 100644 --- a/lib/NGCP/Panel/Field/BillingNetwork.pm +++ b/lib/NGCP/Panel/Field/BillingNetwork.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::BillingNetwork; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -22,6 +23,7 @@ has_field 'create' => ( element_attr => { onclick => 'this.form.submit();return false;' }, #without this, only the first create button works ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/BillingProfile.pm b/lib/NGCP/Panel/Field/BillingProfile.pm index 541edd3029..e2fc6c553d 100644 --- a/lib/NGCP/Panel/Field/BillingProfile.pm +++ b/lib/NGCP/Panel/Field/BillingProfile.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::BillingProfile; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -22,6 +23,7 @@ has_field 'create' => ( element_attr => { onclick => 'this.form.submit();return false;' }, #without this, only the first create button works ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/BillingZone.pm b/lib/NGCP/Panel/Field/BillingZone.pm index d372738de9..60258bdbfb 100644 --- a/lib/NGCP/Panel/Field/BillingZone.pm +++ b/lib/NGCP/Panel/Field/BillingZone.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::BillingZone; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -21,6 +22,7 @@ has_field 'create' => ( element_class => [qw/btn btn-tertiary pull-right/], ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/Contact.pm b/lib/NGCP/Panel/Field/Contact.pm index 5d91aa8a64..9d32a55cc6 100644 --- a/lib/NGCP/Panel/Field/Contact.pm +++ b/lib/NGCP/Panel/Field/Contact.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::Contact; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -21,6 +22,7 @@ has_field 'create' => ( element_class => [qw/btn btn-tertiary pull-right/], ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/ContactNoReseller.pm b/lib/NGCP/Panel/Field/ContactNoReseller.pm index d4db82c2f6..c1c89a3fb1 100644 --- a/lib/NGCP/Panel/Field/ContactNoReseller.pm +++ b/lib/NGCP/Panel/Field/ContactNoReseller.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::ContactNoReseller; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -21,6 +22,7 @@ has_field 'create' => ( element_class => [qw/btn btn-tertiary pull-right/], ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/Contract.pm b/lib/NGCP/Panel/Field/Contract.pm index 7263f80ed5..80131d537a 100644 --- a/lib/NGCP/Panel/Field/Contract.pm +++ b/lib/NGCP/Panel/Field/Contract.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::Contract; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -21,6 +22,7 @@ has_field 'create' => ( element_class => [qw/btn btn-tertiary pull-right/], ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/ContractBalance.pm b/lib/NGCP/Panel/Field/ContractBalance.pm index ace4f95bae..fe2c7fea65 100644 --- a/lib/NGCP/Panel/Field/ContractBalance.pm +++ b/lib/NGCP/Panel/Field/ContractBalance.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::ContractBalance; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -14,6 +15,7 @@ has_field 'id' => ( table_fields => ['id', 'x', 'y'], ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/Country.pm b/lib/NGCP/Panel/Field/Country.pm index 4891cb79af..740fc9a687 100644 --- a/lib/NGCP/Panel/Field/Country.pm +++ b/lib/NGCP/Panel/Field/Country.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::Country; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -14,4 +15,5 @@ has_field 'id' => ( table_fields => ['id', 'name'], ); +no Moose; 1; diff --git a/lib/NGCP/Panel/Field/CustomerContract.pm b/lib/NGCP/Panel/Field/CustomerContract.pm index 235bc21c84..8dcead4d61 100644 --- a/lib/NGCP/Panel/Field/CustomerContract.pm +++ b/lib/NGCP/Panel/Field/CustomerContract.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::CustomerContract; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -21,6 +22,7 @@ has_field 'create' => ( element_class => [qw/btn btn-tertiary pull-right/], ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/DataTable.pm b/lib/NGCP/Panel/Field/DataTable.pm index d17274f94c..3642328b69 100644 --- a/lib/NGCP/Panel/Field/DataTable.pm +++ b/lib/NGCP/Panel/Field/DataTable.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::DataTable; +use Moose; use HTML::FormHandler::Moose; use Template; use JSON; @@ -78,6 +79,7 @@ sub validate { return 1; } +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/DatePicker.pm b/lib/NGCP/Panel/Field/DatePicker.pm index bd21ed6d4b..8fd072a3bc 100644 --- a/lib/NGCP/Panel/Field/DatePicker.pm +++ b/lib/NGCP/Panel/Field/DatePicker.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::DatePicker; +use Moose; use HTML::FormHandler::Moose; use Template; extends 'HTML::FormHandler::Field'; @@ -56,6 +57,7 @@ sub validate { return 1; } +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/DateTime.pm b/lib/NGCP/Panel/Field/DateTime.pm index cde53a6994..0b7b846b00 100644 --- a/lib/NGCP/Panel/Field/DateTime.pm +++ b/lib/NGCP/Panel/Field/DateTime.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::DateTime; +use Moose; use HTML::FormHandler::Moose; use Sipwise::Base; extends 'HTML::FormHandler::Field::Text'; @@ -14,6 +15,7 @@ sub datetime_deflate { } } +no Moose; 1; =head1 NAME diff --git a/lib/NGCP/Panel/Field/Device.pm b/lib/NGCP/Panel/Field/Device.pm index 260e735a52..782e183b67 100644 --- a/lib/NGCP/Panel/Field/Device.pm +++ b/lib/NGCP/Panel/Field/Device.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::Device; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -21,6 +22,7 @@ has_field 'create' => ( element_class => [qw/btn btn-tertiary pull-right/], ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/DeviceConfig.pm b/lib/NGCP/Panel/Field/DeviceConfig.pm index 13cbb4c968..1ccadbebe1 100644 --- a/lib/NGCP/Panel/Field/DeviceConfig.pm +++ b/lib/NGCP/Panel/Field/DeviceConfig.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::DeviceConfig; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -21,6 +22,7 @@ has_field 'create' => ( element_class => [qw/btn btn-tertiary pull-right/], ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/Domain.pm b/lib/NGCP/Panel/Field/Domain.pm index 1573ea7396..5413817248 100644 --- a/lib/NGCP/Panel/Field/Domain.pm +++ b/lib/NGCP/Panel/Field/Domain.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::Domain; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -21,6 +22,7 @@ has_field 'create' => ( element_class => [qw/btn btn-tertiary pull-right/], ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/E164.pm b/lib/NGCP/Panel/Field/E164.pm index 21e70e7b3c..62941dc321 100644 --- a/lib/NGCP/Panel/Field/E164.pm +++ b/lib/NGCP/Panel/Field/E164.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::E164; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -65,6 +66,7 @@ sub validate { } } +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/E164Range.pm b/lib/NGCP/Panel/Field/E164Range.pm index 8e5f48ae89..4a929269b2 100644 --- a/lib/NGCP/Panel/Field/E164Range.pm +++ b/lib/NGCP/Panel/Field/E164Range.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::E164Range; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -87,6 +88,7 @@ sub validate { } } +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/E164RangeRepeat.pm b/lib/NGCP/Panel/Field/E164RangeRepeat.pm index c300501e6d..ab30d03e8e 100644 --- a/lib/NGCP/Panel/Field/E164RangeRepeat.pm +++ b/lib/NGCP/Panel/Field/E164RangeRepeat.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::E164RangeRepeat; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Repeatable'; @@ -24,6 +25,7 @@ has_field 'rm' => ( ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/EmailList.pm b/lib/NGCP/Panel/Field/EmailList.pm index 8c14361e0a..c7fc0f8188 100644 --- a/lib/NGCP/Panel/Field/EmailList.pm +++ b/lib/NGCP/Panel/Field/EmailList.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::EmailList; +use Moose; use HTML::FormHandler::Moose; use Email::Valid; use Sipwise::Base; @@ -6,7 +7,7 @@ extends 'HTML::FormHandler::Field::Text'; sub validate { my ( $self ) = @_; - my @emails = $self->value->split(','); + my @emails = split(/\s*,\s*/, $self->value); for my $mail (@emails) { unless( Email::Valid->address( -address => $mail, @@ -21,6 +22,7 @@ sub validate { return 1; } +no Moose; 1; =head1 NAME diff --git a/lib/NGCP/Panel/Field/EmailTemplate.pm b/lib/NGCP/Panel/Field/EmailTemplate.pm index 57d744b91a..8aba9cfd11 100644 --- a/lib/NGCP/Panel/Field/EmailTemplate.pm +++ b/lib/NGCP/Panel/Field/EmailTemplate.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::EmailTemplate; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -21,4 +22,5 @@ has_field 'create' => ( element_class => [qw/btn btn-tertiary pull-right/], ); +no Moose; 1; diff --git a/lib/NGCP/Panel/Field/IPAddress.pm b/lib/NGCP/Panel/Field/IPAddress.pm index 34eb17c882..bbc4b3f929 100644 --- a/lib/NGCP/Panel/Field/IPAddress.pm +++ b/lib/NGCP/Panel/Field/IPAddress.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::IPAddress; +use Moose; use HTML::FormHandler::Moose; use Data::Validate::IP qw(is_ipv4 is_ipv6); extends 'HTML::FormHandler::Field::Text'; @@ -10,6 +11,7 @@ sub validate { return 1; } +no Moose; 1; =head1 NAME diff --git a/lib/NGCP/Panel/Field/Identifier.pm b/lib/NGCP/Panel/Field/Identifier.pm index ae58fb21ab..1cf5066fae 100644 --- a/lib/NGCP/Panel/Field/Identifier.pm +++ b/lib/NGCP/Panel/Field/Identifier.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::Identifier; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Text'; @@ -15,6 +16,7 @@ sub validate { return 0; } +no Moose; 1; =head1 NAME diff --git a/lib/NGCP/Panel/Field/Interval.pm b/lib/NGCP/Panel/Field/Interval.pm index c13e707674..d56d98850f 100644 --- a/lib/NGCP/Panel/Field/Interval.pm +++ b/lib/NGCP/Panel/Field/Interval.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::Interval; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -28,6 +29,7 @@ has_field 'unit' => ( do_wrapper => 0, ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/InvoiceTemplate.pm b/lib/NGCP/Panel/Field/InvoiceTemplate.pm index d1c47e653e..4054576e79 100644 --- a/lib/NGCP/Panel/Field/InvoiceTemplate.pm +++ b/lib/NGCP/Panel/Field/InvoiceTemplate.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::InvoiceTemplate; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -14,4 +15,5 @@ has_field 'id' => ( table_fields => ['id', 'reseller_name', 'name'], ); +no Moose; 1; diff --git a/lib/NGCP/Panel/Field/MonthPicker.pm b/lib/NGCP/Panel/Field/MonthPicker.pm index 419bb306c8..27c42d74c4 100644 --- a/lib/NGCP/Panel/Field/MonthPicker.pm +++ b/lib/NGCP/Panel/Field/MonthPicker.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::MonthPicker; +use Moose; use HTML::FormHandler::Moose; use Template; extends 'HTML::FormHandler::Field'; @@ -56,6 +57,7 @@ sub validate { return 1; } +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/NumRangeAPI.pm b/lib/NGCP/Panel/Field/NumRangeAPI.pm index 9c130ef6d8..75dc690889 100644 --- a/lib/NGCP/Panel/Field/NumRangeAPI.pm +++ b/lib/NGCP/Panel/Field/NumRangeAPI.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::NumRangeAPI; +use Moose; use Sipwise::Base; extends 'HTML::FormHandler::Field::Text'; @@ -28,6 +29,7 @@ sub validate { return; } +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/NumberStatusSelect.pm b/lib/NGCP/Panel/Field/NumberStatusSelect.pm index 4a4e7614fa..d0bdfe2387 100644 --- a/lib/NGCP/Panel/Field/NumberStatusSelect.pm +++ b/lib/NGCP/Panel/Field/NumberStatusSelect.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::NumberStatusSelect; +use Moose; use Sipwise::Base; extends 'HTML::FormHandler::Field::Select'; @@ -13,6 +14,7 @@ sub build_options { ]; } +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/PbxGroup.pm b/lib/NGCP/Panel/Field/PbxGroup.pm index bc5795d28b..557af05f90 100644 --- a/lib/NGCP/Panel/Field/PbxGroup.pm +++ b/lib/NGCP/Panel/Field/PbxGroup.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::PbxGroup; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -22,6 +23,7 @@ has_field 'create' => ( element_class => [qw/btn btn-tertiary pull-right/], ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/PbxGroupAPI.pm b/lib/NGCP/Panel/Field/PbxGroupAPI.pm index a5f30a4c24..dbea453d50 100644 --- a/lib/NGCP/Panel/Field/PbxGroupAPI.pm +++ b/lib/NGCP/Panel/Field/PbxGroupAPI.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::PbxGroupAPI; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field'; @@ -10,6 +11,7 @@ has_field 'dummy' => ( do_label => 1, ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/PbxGroupMemberAPI.pm b/lib/NGCP/Panel/Field/PbxGroupMemberAPI.pm index 666b24e819..d55a363f7a 100644 --- a/lib/NGCP/Panel/Field/PbxGroupMemberAPI.pm +++ b/lib/NGCP/Panel/Field/PbxGroupMemberAPI.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::PbxGroupMemberAPI; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field'; @@ -10,6 +11,7 @@ has_field 'dummy' => ( do_label => 1, ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/PosInteger.pm b/lib/NGCP/Panel/Field/PosInteger.pm index 9d4a89062c..e7736b6f6a 100644 --- a/lib/NGCP/Panel/Field/PosInteger.pm +++ b/lib/NGCP/Panel/Field/PosInteger.pm @@ -1,6 +1,7 @@ package NGCP::Panel::Field::PosInteger; +use Moose; use Sipwise::Base; -extends 'HTML::FormHandler::Field::Integer'; +use base 'HTML::FormHandler::Field::Integer'; sub validate { my ( $self ) = @_; @@ -9,6 +10,7 @@ sub validate { if(!$self->has_errors && $value < 0); } +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/Product.pm b/lib/NGCP/Panel/Field/Product.pm index 4035e4bcb2..e5d9e800b3 100644 --- a/lib/NGCP/Panel/Field/Product.pm +++ b/lib/NGCP/Panel/Field/Product.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::Product; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -14,6 +15,7 @@ has_field 'id' => ( table_fields => ['id', 'name'], ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/ProfileNetwork.pm b/lib/NGCP/Panel/Field/ProfileNetwork.pm index ef535f6701..cdd955abac 100644 --- a/lib/NGCP/Panel/Field/ProfileNetwork.pm +++ b/lib/NGCP/Panel/Field/ProfileNetwork.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::ProfileNetwork; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -28,6 +29,7 @@ has_field 'network_id' => ( custom_renderers => { name => 'function ( data, type, full ) { if(data.length > 13) data = data.substring(0,10) + \'...\'; return data; }'} ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/ProfilePackage.pm b/lib/NGCP/Panel/Field/ProfilePackage.pm index 6ab65ac5d9..9274377d77 100644 --- a/lib/NGCP/Panel/Field/ProfilePackage.pm +++ b/lib/NGCP/Panel/Field/ProfilePackage.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::ProfilePackage; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -22,6 +23,7 @@ has_field 'create' => ( #element_attr => { onclick => 'this.form.submit();return false;' }, #without this, only the first create button works ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/Regexp.pm b/lib/NGCP/Panel/Field/Regexp.pm index 440cfbda1f..fc82a700cb 100644 --- a/lib/NGCP/Panel/Field/Regexp.pm +++ b/lib/NGCP/Panel/Field/Regexp.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::Regexp; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Text'; @@ -11,6 +12,7 @@ sub validate { return 1; } +no Moose; 1; =head1 NAME diff --git a/lib/NGCP/Panel/Field/Reseller.pm b/lib/NGCP/Panel/Field/Reseller.pm index 254bf91f08..63c2140789 100644 --- a/lib/NGCP/Panel/Field/Reseller.pm +++ b/lib/NGCP/Panel/Field/Reseller.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::Reseller; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -21,4 +22,5 @@ has_field 'create' => ( element_class => [qw/btn btn-tertiary pull-right/], ); +no Moose; 1; diff --git a/lib/NGCP/Panel/Field/ResellerContract.pm b/lib/NGCP/Panel/Field/ResellerContract.pm index bd7083a32a..be397ef32a 100644 --- a/lib/NGCP/Panel/Field/ResellerContract.pm +++ b/lib/NGCP/Panel/Field/ResellerContract.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::ResellerContract; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -21,6 +22,7 @@ has_field 'create' => ( element_class => [qw/btn btn-tertiary pull-right/], ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/ResellerStatusSelect.pm b/lib/NGCP/Panel/Field/ResellerStatusSelect.pm index 1de615fc69..fc418b9fb0 100644 --- a/lib/NGCP/Panel/Field/ResellerStatusSelect.pm +++ b/lib/NGCP/Panel/Field/ResellerStatusSelect.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::ResellerStatusSelect; +use Moose; use Sipwise::Base; extends 'HTML::FormHandler::Field::Select'; @@ -12,6 +13,7 @@ sub build_options { ]; } +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/SubscriberDestinationSet.pm b/lib/NGCP/Panel/Field/SubscriberDestinationSet.pm index 4ce288f212..eca26b3c8b 100644 --- a/lib/NGCP/Panel/Field/SubscriberDestinationSet.pm +++ b/lib/NGCP/Panel/Field/SubscriberDestinationSet.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::SubscriberDestinationSet; +use Moose; use Sipwise::Base; extends 'HTML::FormHandler::Field::Select'; @@ -22,6 +23,7 @@ sub build_options { return \@all; } +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/SubscriberLockSelect.pm b/lib/NGCP/Panel/Field/SubscriberLockSelect.pm index 1d6b30c6fc..5254053273 100644 --- a/lib/NGCP/Panel/Field/SubscriberLockSelect.pm +++ b/lib/NGCP/Panel/Field/SubscriberLockSelect.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::SubscriberLockSelect; +use Moose; use Sipwise::Base; extends 'HTML::FormHandler::Field::Select'; @@ -14,6 +15,7 @@ sub build_options { ]; } +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/SubscriberPbxGroup.pm b/lib/NGCP/Panel/Field/SubscriberPbxGroup.pm index 29f269ec31..300ffceb99 100644 --- a/lib/NGCP/Panel/Field/SubscriberPbxGroup.pm +++ b/lib/NGCP/Panel/Field/SubscriberPbxGroup.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::SubscriberPbxGroup; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -23,4 +24,5 @@ has_field 'create' => ( element_class => [qw/btn btn-tertiary pull-right/], ); +no Moose; 1; diff --git a/lib/NGCP/Panel/Field/SubscriberProfile.pm b/lib/NGCP/Panel/Field/SubscriberProfile.pm index ab2929e275..176cbb442f 100644 --- a/lib/NGCP/Panel/Field/SubscriberProfile.pm +++ b/lib/NGCP/Panel/Field/SubscriberProfile.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::SubscriberProfile; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -22,4 +23,5 @@ has_field 'create' => ( ); =cut +no Moose; 1; diff --git a/lib/NGCP/Panel/Field/SubscriberProfileSet.pm b/lib/NGCP/Panel/Field/SubscriberProfileSet.pm index 96e801087b..94416afbee 100644 --- a/lib/NGCP/Panel/Field/SubscriberProfileSet.pm +++ b/lib/NGCP/Panel/Field/SubscriberProfileSet.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::SubscriberProfileSet; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -23,4 +24,5 @@ has_field 'create' => ( ); =cut +no Moose; 1; diff --git a/lib/NGCP/Panel/Field/SubscriberStatusSelect.pm b/lib/NGCP/Panel/Field/SubscriberStatusSelect.pm index b9bd4238a2..8ca1eeba1f 100644 --- a/lib/NGCP/Panel/Field/SubscriberStatusSelect.pm +++ b/lib/NGCP/Panel/Field/SubscriberStatusSelect.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::SubscriberStatusSelect; +use Moose; use Sipwise::Base; extends 'HTML::FormHandler::Field::Select'; @@ -12,6 +13,7 @@ sub build_options { ]; } +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/SubscriberTimeSet.pm b/lib/NGCP/Panel/Field/SubscriberTimeSet.pm index c36a6b59ea..18d5e78c8f 100644 --- a/lib/NGCP/Panel/Field/SubscriberTimeSet.pm +++ b/lib/NGCP/Panel/Field/SubscriberTimeSet.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::SubscriberTimeSet; +use Moose; use Sipwise::Base; extends 'HTML::FormHandler::Field::Select'; @@ -22,6 +23,7 @@ sub build_options { return \@all; } +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Field/URI.pm b/lib/NGCP/Panel/Field/URI.pm index 53a57663fa..00622afc79 100644 --- a/lib/NGCP/Panel/Field/URI.pm +++ b/lib/NGCP/Panel/Field/URI.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::URI; +use Moose; use Sipwise::Base; use HTML::FormHandler::Moose; @@ -97,6 +98,7 @@ sub uri_deflate { return $v; } +no Moose; 1; __PACKAGE__->meta->make_immutable; use namespace::autoclean diff --git a/lib/NGCP/Panel/Field/Voucher.pm b/lib/NGCP/Panel/Field/Voucher.pm index 441f77c1e5..bee328f015 100644 --- a/lib/NGCP/Panel/Field/Voucher.pm +++ b/lib/NGCP/Panel/Field/Voucher.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Field::Voucher; +use Moose; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Field::Compound'; @@ -14,6 +15,7 @@ has_field 'id' => ( table_fields => ['id', 'code', 'amount','reseller.name','profile_package_name','used_at'], ); +no Moose; 1; # vim: set tabstop=4 expandtab: diff --git a/lib/NGCP/Panel/Form/Administrator/APIDownDelete.pm b/lib/NGCP/Panel/Form/Administrator/APIDownDelete.pm index ab39a36209..2807ab695a 100644 --- a/lib/NGCP/Panel/Form/Administrator/APIDownDelete.pm +++ b/lib/NGCP/Panel/Form/Administrator/APIDownDelete.pm @@ -1,7 +1,7 @@ package NGCP::Panel::Form::Administrator::APIDownDelete; use HTML::FormHandler::Moose; use HTML::FormHandler::Widget::Block::Bootstrap; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; extends 'HTML::FormHandler'; has '+widget_wrapper' => (default => 'Bootstrap'); diff --git a/lib/NGCP/Panel/Form/Administrator/APIGenerate.pm b/lib/NGCP/Panel/Form/Administrator/APIGenerate.pm index 75639380bb..da70a4742e 100644 --- a/lib/NGCP/Panel/Form/Administrator/APIGenerate.pm +++ b/lib/NGCP/Panel/Form/Administrator/APIGenerate.pm @@ -1,7 +1,7 @@ package NGCP::Panel::Form::Administrator::APIGenerate; use HTML::FormHandler::Moose; use HTML::FormHandler::Widget::Block::Bootstrap; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; extends 'HTML::FormHandler'; has '+widget_wrapper' => (default => 'Bootstrap'); diff --git a/lib/NGCP/Panel/Form/Administrator/Admin.pm b/lib/NGCP/Panel/Form/Administrator/Admin.pm index 8af14c82fc..e703eb54c9 100644 --- a/lib/NGCP/Panel/Form/Administrator/Admin.pm +++ b/lib/NGCP/Panel/Form/Administrator/Admin.pm @@ -1,7 +1,7 @@ package NGCP::Panel::Form::Administrator::Admin; use HTML::FormHandler::Moose; use HTML::FormHandler::Widget::Block::Bootstrap; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; extends 'NGCP::Panel::Form::Administrator::Reseller'; for (qw(is_superuser lawful_intercept)) { diff --git a/lib/NGCP/Panel/Form/Administrator/Reseller.pm b/lib/NGCP/Panel/Form/Administrator/Reseller.pm index 848891e199..ff2a5d3a83 100644 --- a/lib/NGCP/Panel/Form/Administrator/Reseller.pm +++ b/lib/NGCP/Panel/Form/Administrator/Reseller.pm @@ -1,7 +1,7 @@ package NGCP::Panel::Form::Administrator::Reseller; use HTML::FormHandler::Moose; use HTML::FormHandler::Widget::Block::Bootstrap; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use NGCP::Panel::Utils::Form; extends 'HTML::FormHandler'; diff --git a/lib/NGCP/Panel/Form/Balance/BalanceIntervalAPI.pm b/lib/NGCP/Panel/Form/Balance/BalanceIntervalAPI.pm index 24e215c9c1..b41ac3f840 100644 --- a/lib/NGCP/Panel/Form/Balance/BalanceIntervalAPI.pm +++ b/lib/NGCP/Panel/Form/Balance/BalanceIntervalAPI.pm @@ -1,7 +1,7 @@ package NGCP::Panel::Form::Balance::BalanceIntervalAPI; use HTML::FormHandler::Moose; use HTML::FormHandler::Widget::Block::Bootstrap; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; extends 'HTML::FormHandler'; has_field 'id' => ( diff --git a/lib/NGCP/Panel/Form/Balance/CustomerBalance.pm b/lib/NGCP/Panel/Form/Balance/CustomerBalance.pm index b205b41cd9..985835720b 100644 --- a/lib/NGCP/Panel/Form/Balance/CustomerBalance.pm +++ b/lib/NGCP/Panel/Form/Balance/CustomerBalance.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Balance::CustomerBalance; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/BillingFee.pm b/lib/NGCP/Panel/Form/BillingFee.pm index 12c2569930..4176dc7216 100644 --- a/lib/NGCP/Panel/Form/BillingFee.pm +++ b/lib/NGCP/Panel/Form/BillingFee.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::BillingFee; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; use NGCP::Panel::Field::BillingZone; diff --git a/lib/NGCP/Panel/Form/BillingFee/API.pm b/lib/NGCP/Panel/Form/BillingFee/API.pm index 0e36b92591..99fc1fc497 100644 --- a/lib/NGCP/Panel/Form/BillingFee/API.pm +++ b/lib/NGCP/Panel/Form/BillingFee/API.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::BillingFee::API; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::BillingFee'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'billing_profile_id' => ( type => 'PosInteger', diff --git a/lib/NGCP/Panel/Form/BillingFeeUpload.pm b/lib/NGCP/Panel/Form/BillingFeeUpload.pm index 4e9b891a2c..4202f08a35 100644 --- a/lib/NGCP/Panel/Form/BillingFeeUpload.pm +++ b/lib/NGCP/Panel/Form/BillingFeeUpload.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::BillingFeeUpload; use Sipwise::Base; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; use NGCP::Panel::Field::BillingZone; diff --git a/lib/NGCP/Panel/Form/BillingNetwork/Admin.pm b/lib/NGCP/Panel/Form/BillingNetwork/Admin.pm index 44c71374f2..6d33b22da9 100644 --- a/lib/NGCP/Panel/Form/BillingNetwork/Admin.pm +++ b/lib/NGCP/Panel/Form/BillingNetwork/Admin.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::BillingNetwork::Admin; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::BillingNetwork::Reseller'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'reseller' => ( type => '+NGCP::Panel::Field::Reseller', diff --git a/lib/NGCP/Panel/Form/BillingNetwork/NetworkAPI.pm b/lib/NGCP/Panel/Form/BillingNetwork/NetworkAPI.pm index 454b0a39e3..39925edb33 100644 --- a/lib/NGCP/Panel/Form/BillingNetwork/NetworkAPI.pm +++ b/lib/NGCP/Panel/Form/BillingNetwork/NetworkAPI.pm @@ -1,7 +1,7 @@ package NGCP::Panel::Form::BillingNetwork::NetworkAPI; use HTML::FormHandler::Moose; use HTML::FormHandler::Widget::Block::Bootstrap; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; extends 'HTML::FormHandler'; has_field 'id' => ( diff --git a/lib/NGCP/Panel/Form/BillingNetwork/Reseller.pm b/lib/NGCP/Panel/Form/BillingNetwork/Reseller.pm index 0a4f0eb4fc..3570272c98 100644 --- a/lib/NGCP/Panel/Form/BillingNetwork/Reseller.pm +++ b/lib/NGCP/Panel/Form/BillingNetwork/Reseller.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::BillingNetwork::Reseller; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use NGCP::Panel::Utils::BillingNetworks qw(); use Storable qw(); diff --git a/lib/NGCP/Panel/Form/BillingPeaktimeSpecial.pm b/lib/NGCP/Panel/Form/BillingPeaktimeSpecial.pm index 7db7d51467..ce9e14e9f4 100644 --- a/lib/NGCP/Panel/Form/BillingPeaktimeSpecial.pm +++ b/lib/NGCP/Panel/Form/BillingPeaktimeSpecial.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::BillingPeaktimeSpecial; use Sipwise::Base; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; use NGCP::Panel::Field::BillingZone; diff --git a/lib/NGCP/Panel/Form/BillingPeaktimeWeekdays.pm b/lib/NGCP/Panel/Form/BillingPeaktimeWeekdays.pm index 86f3541573..67d5143516 100644 --- a/lib/NGCP/Panel/Form/BillingPeaktimeWeekdays.pm +++ b/lib/NGCP/Panel/Form/BillingPeaktimeWeekdays.pm @@ -3,7 +3,7 @@ use Sipwise::Base; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; use HTML::FormHandler::Widget::Block::Bootstrap; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use DateTime; use DateTime::Format::Strptime; diff --git a/lib/NGCP/Panel/Form/BillingProfile/Reseller.pm b/lib/NGCP/Panel/Form/BillingProfile/Reseller.pm index 5a262aafab..25343b62ee 100644 --- a/lib/NGCP/Panel/Form/BillingProfile/Reseller.pm +++ b/lib/NGCP/Panel/Form/BillingProfile/Reseller.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::BillingProfile::Reseller; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/BillingZone.pm b/lib/NGCP/Panel/Form/BillingZone.pm index fe03ce51a3..eaf1b8d95d 100644 --- a/lib/NGCP/Panel/Form/BillingZone.pm +++ b/lib/NGCP/Panel/Form/BillingZone.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::BillingZone; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/BillingZone/API.pm b/lib/NGCP/Panel/Form/BillingZone/API.pm index 2430b1adac..3a38910624 100644 --- a/lib/NGCP/Panel/Form/BillingZone/API.pm +++ b/lib/NGCP/Panel/Form/BillingZone/API.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::BillingZone::API; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::BillingZone'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'billing_profile_id' => ( type => 'PosInteger', diff --git a/lib/NGCP/Panel/Form/CCMapEntries.pm b/lib/NGCP/Panel/Form/CCMapEntries.pm index ebd0157115..d07a728aca 100644 --- a/lib/NGCP/Panel/Form/CCMapEntries.pm +++ b/lib/NGCP/Panel/Form/CCMapEntries.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::CCMapEntries; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; with 'NGCP::Panel::Render::RepeatableJs'; diff --git a/lib/NGCP/Panel/Form/CFDestinationSetAPI.pm b/lib/NGCP/Panel/Form/CFDestinationSetAPI.pm index 14029b6dde..72ccda7b20 100644 --- a/lib/NGCP/Panel/Form/CFDestinationSetAPI.pm +++ b/lib/NGCP/Panel/Form/CFDestinationSetAPI.pm @@ -1,7 +1,7 @@ package NGCP::Panel::Form::CFDestinationSetAPI; use HTML::FormHandler::Moose; use HTML::FormHandler::Widget::Block::Bootstrap; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; extends 'HTML::FormHandler'; has_field 'id' => ( diff --git a/lib/NGCP/Panel/Form/CFMappingsAPI.pm b/lib/NGCP/Panel/Form/CFMappingsAPI.pm index fe1ed68954..9d2c27401d 100644 --- a/lib/NGCP/Panel/Form/CFMappingsAPI.pm +++ b/lib/NGCP/Panel/Form/CFMappingsAPI.pm @@ -1,7 +1,7 @@ package NGCP::Panel::Form::CFMappingsAPI; use HTML::FormHandler::Moose; use HTML::FormHandler::Widget::Block::Bootstrap; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; extends 'HTML::FormHandler'; has '+widget_wrapper' => (default => 'Bootstrap'); diff --git a/lib/NGCP/Panel/Form/CFSimpleAPI.pm b/lib/NGCP/Panel/Form/CFSimpleAPI.pm index 57edc2e1b9..4e79fa8a3c 100644 --- a/lib/NGCP/Panel/Form/CFSimpleAPI.pm +++ b/lib/NGCP/Panel/Form/CFSimpleAPI.pm @@ -1,7 +1,7 @@ package NGCP::Panel::Form::CFSimpleAPI; use HTML::FormHandler::Moose; use HTML::FormHandler::Widget::Block::Bootstrap; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; extends 'HTML::FormHandler'; has '+widget_wrapper' => (default => 'Bootstrap'); diff --git a/lib/NGCP/Panel/Form/CFTimeSetAPI.pm b/lib/NGCP/Panel/Form/CFTimeSetAPI.pm index 592d38735e..eb32736533 100644 --- a/lib/NGCP/Panel/Form/CFTimeSetAPI.pm +++ b/lib/NGCP/Panel/Form/CFTimeSetAPI.pm @@ -1,7 +1,7 @@ package NGCP::Panel::Form::CFTimeSetAPI; use HTML::FormHandler::Moose; use HTML::FormHandler::Widget::Block::Bootstrap; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; extends 'HTML::FormHandler'; has_field 'id' => ( diff --git a/lib/NGCP/Panel/Form/Call/Admin.pm b/lib/NGCP/Panel/Form/Call/Admin.pm index 717c941518..10713330f0 100644 --- a/lib/NGCP/Panel/Form/Call/Admin.pm +++ b/lib/NGCP/Panel/Form/Call/Admin.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Call::Admin; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::Call::Reseller'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'source_carrier_cost' => ( type => 'Float', diff --git a/lib/NGCP/Panel/Form/Call/Reseller.pm b/lib/NGCP/Panel/Form/Call/Reseller.pm index ed8bb85f25..28780b6b18 100644 --- a/lib/NGCP/Panel/Form/Call/Reseller.pm +++ b/lib/NGCP/Panel/Form/Call/Reseller.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Call::Reseller; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/CallControl/CallAPI.pm b/lib/NGCP/Panel/Form/CallControl/CallAPI.pm index 9ca2ea7ad7..cee9215571 100644 --- a/lib/NGCP/Panel/Form/CallControl/CallAPI.pm +++ b/lib/NGCP/Panel/Form/CallControl/CallAPI.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::CallControl::CallAPI; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/CallList/Subscriber.pm b/lib/NGCP/Panel/Form/CallList/Subscriber.pm index 1f01fbca0a..cce81d9e6f 100644 --- a/lib/NGCP/Panel/Form/CallList/Subscriber.pm +++ b/lib/NGCP/Panel/Form/CallList/Subscriber.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::CallList::Subscriber; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Contact/Admin.pm b/lib/NGCP/Panel/Form/Contact/Admin.pm index 52c032918e..ed392ba545 100644 --- a/lib/NGCP/Panel/Form/Contact/Admin.pm +++ b/lib/NGCP/Panel/Form/Contact/Admin.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Contact::Admin; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::Contact::Reseller'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'reseller' => ( type => '+NGCP::Panel::Field::Reseller', diff --git a/lib/NGCP/Panel/Form/Contact/Reseller.pm b/lib/NGCP/Panel/Form/Contact/Reseller.pm index 10bac4845f..df7416254a 100644 --- a/lib/NGCP/Panel/Form/Contact/Reseller.pm +++ b/lib/NGCP/Panel/Form/Contact/Reseller.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Contact::Reseller; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Contract/Base.pm b/lib/NGCP/Panel/Form/Contract/Base.pm index f80c92b652..81c8b13b48 100644 --- a/lib/NGCP/Panel/Form/Contract/Base.pm +++ b/lib/NGCP/Panel/Form/Contract/Base.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Contract::Base; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; use DateTime::Format::Strptime qw(); diff --git a/lib/NGCP/Panel/Form/Contract/BaseAPI.pm b/lib/NGCP/Panel/Form/Contract/BaseAPI.pm index 9564b96785..dfeecc191b 100644 --- a/lib/NGCP/Panel/Form/Contract/BaseAPI.pm +++ b/lib/NGCP/Panel/Form/Contract/BaseAPI.pm @@ -1,7 +1,7 @@ package NGCP::Panel::Form::Contract::BaseAPI; use HTML::FormHandler::Moose; use HTML::FormHandler::Widget::Block::Bootstrap; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; extends 'HTML::FormHandler'; has_field 'contact_id' => ( diff --git a/lib/NGCP/Panel/Form/Customer/PbxFieldDevice.pm b/lib/NGCP/Panel/Form/Customer/PbxFieldDevice.pm index be45bf300e..3b7ce78464 100644 --- a/lib/NGCP/Panel/Form/Customer/PbxFieldDevice.pm +++ b/lib/NGCP/Panel/Form/Customer/PbxFieldDevice.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Customer::PbxFieldDevice; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Customer/PbxFieldDeviceAPI.pm b/lib/NGCP/Panel/Form/Customer/PbxFieldDeviceAPI.pm index b2ec54507b..672204c15c 100644 --- a/lib/NGCP/Panel/Form/Customer/PbxFieldDeviceAPI.pm +++ b/lib/NGCP/Panel/Form/Customer/PbxFieldDeviceAPI.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Customer::PbxFieldDeviceAPI; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Customer/PbxFieldDeviceSync.pm b/lib/NGCP/Panel/Form/Customer/PbxFieldDeviceSync.pm index d5d9312b36..a04b088730 100644 --- a/lib/NGCP/Panel/Form/Customer/PbxFieldDeviceSync.pm +++ b/lib/NGCP/Panel/Form/Customer/PbxFieldDeviceSync.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Customer::PbxFieldDeviceSync; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Customer/PbxGroupBase.pm b/lib/NGCP/Panel/Form/Customer/PbxGroupBase.pm index d1a788a3f4..42a8074472 100644 --- a/lib/NGCP/Panel/Form/Customer/PbxGroupBase.pm +++ b/lib/NGCP/Panel/Form/Customer/PbxGroupBase.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Customer::PbxGroupBase; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Customer/PbxSubscriber.pm b/lib/NGCP/Panel/Form/Customer/PbxSubscriber.pm index 099fecd564..c6be1742e2 100644 --- a/lib/NGCP/Panel/Form/Customer/PbxSubscriber.pm +++ b/lib/NGCP/Panel/Form/Customer/PbxSubscriber.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Customer::PbxSubscriber; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Customer/PbxSubscriberEdit.pm b/lib/NGCP/Panel/Form/Customer/PbxSubscriberEdit.pm index 36e8c851b9..348eac8465 100644 --- a/lib/NGCP/Panel/Form/Customer/PbxSubscriberEdit.pm +++ b/lib/NGCP/Panel/Form/Customer/PbxSubscriberEdit.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Customer::PbxSubscriberEdit; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::Customer::PbxSubscriber'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Customer/Subscriber.pm b/lib/NGCP/Panel/Form/Customer/Subscriber.pm index 60cccb0e47..ef3b0deb0e 100644 --- a/lib/NGCP/Panel/Form/Customer/Subscriber.pm +++ b/lib/NGCP/Panel/Form/Customer/Subscriber.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Customer::Subscriber; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/CustomerDailyFraud.pm b/lib/NGCP/Panel/Form/CustomerDailyFraud.pm index a12ba66aeb..34803793ec 100644 --- a/lib/NGCP/Panel/Form/CustomerDailyFraud.pm +++ b/lib/NGCP/Panel/Form/CustomerDailyFraud.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::CustomerDailyFraud; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Model::DBIC'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/CustomerMonthlyFraud.pm b/lib/NGCP/Panel/Form/CustomerMonthlyFraud.pm index 5f392048c2..9cff4f888a 100644 --- a/lib/NGCP/Panel/Form/CustomerMonthlyFraud.pm +++ b/lib/NGCP/Panel/Form/CustomerMonthlyFraud.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::CustomerMonthlyFraud; use HTML::FormHandler::Moose; extends 'HTML::FormHandler::Model::DBIC'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/DestinationSet.pm b/lib/NGCP/Panel/Form/DestinationSet.pm index a4726c0008..eb44d54463 100644 --- a/lib/NGCP/Panel/Form/DestinationSet.pm +++ b/lib/NGCP/Panel/Form/DestinationSet.pm @@ -1,7 +1,7 @@ package NGCP::Panel::Form::DestinationSet; use HTML::FormHandler::Moose; use HTML::FormHandler::Widget::Block::Bootstrap; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use NGCP::Panel::Field::PosInteger; use NGCP::Panel::Field::URI; extends 'HTML::FormHandler'; diff --git a/lib/NGCP/Panel/Form/Device/Config.pm b/lib/NGCP/Panel/Form/Device/Config.pm index c4e86729b0..c57133fdfd 100644 --- a/lib/NGCP/Panel/Form/Device/Config.pm +++ b/lib/NGCP/Panel/Form/Device/Config.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Device::Config; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Device/ConfigAPI.pm b/lib/NGCP/Panel/Form/Device/ConfigAPI.pm index 9bf99e86ff..caf49d4654 100644 --- a/lib/NGCP/Panel/Form/Device/ConfigAPI.pm +++ b/lib/NGCP/Panel/Form/Device/ConfigAPI.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Device::ConfigAPI; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Device/Firmware.pm b/lib/NGCP/Panel/Form/Device/Firmware.pm index f4d95dd1e1..25b55d247f 100644 --- a/lib/NGCP/Panel/Form/Device/Firmware.pm +++ b/lib/NGCP/Panel/Form/Device/Firmware.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Device::Firmware; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Device/FirmwareAPI.pm b/lib/NGCP/Panel/Form/Device/FirmwareAPI.pm index b5b0bcbbae..a804ca7a73 100644 --- a/lib/NGCP/Panel/Form/Device/FirmwareAPI.pm +++ b/lib/NGCP/Panel/Form/Device/FirmwareAPI.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Device::FirmwareAPI; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Device/Model.pm b/lib/NGCP/Panel/Form/Device/Model.pm index 23cd123ea8..f3959eee2d 100644 --- a/lib/NGCP/Panel/Form/Device/Model.pm +++ b/lib/NGCP/Panel/Form/Device/Model.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Device::Model; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Device/ModelAPI.pm b/lib/NGCP/Panel/Form/Device/ModelAPI.pm index b1078b01d7..54f5608598 100644 --- a/lib/NGCP/Panel/Form/Device/ModelAPI.pm +++ b/lib/NGCP/Panel/Form/Device/ModelAPI.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Device::ModelAPI; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::Device::ModelAdmin'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_block 'fields' => ( tag => 'div', diff --git a/lib/NGCP/Panel/Form/Device/ModelAdmin.pm b/lib/NGCP/Panel/Form/Device/ModelAdmin.pm index 327dfb082c..dbf4c17671 100644 --- a/lib/NGCP/Panel/Form/Device/ModelAdmin.pm +++ b/lib/NGCP/Panel/Form/Device/ModelAdmin.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Device::ModelAdmin; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::Device::Model'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Device/Profile.pm b/lib/NGCP/Panel/Form/Device/Profile.pm index 83ca1a21c2..84ab33ae97 100644 --- a/lib/NGCP/Panel/Form/Device/Profile.pm +++ b/lib/NGCP/Panel/Form/Device/Profile.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Device::Profile; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Domain/Admin.pm b/lib/NGCP/Panel/Form/Domain/Admin.pm index 1d63a1c951..71f79be2a0 100644 --- a/lib/NGCP/Panel/Form/Domain/Admin.pm +++ b/lib/NGCP/Panel/Form/Domain/Admin.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Domain::Admin; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::Domain::Reseller'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'reseller' => ( type => '+NGCP::Panel::Field::Reseller', diff --git a/lib/NGCP/Panel/Form/Domain/Reseller.pm b/lib/NGCP/Panel/Form/Domain/Reseller.pm index 2cc7375de1..b85a6d20b8 100644 --- a/lib/NGCP/Panel/Form/Domain/Reseller.pm +++ b/lib/NGCP/Panel/Form/Domain/Reseller.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Domain::Reseller; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/EmailTemplate/Admin.pm b/lib/NGCP/Panel/Form/EmailTemplate/Admin.pm index 7e03ef9298..1b6786ca7a 100644 --- a/lib/NGCP/Panel/Form/EmailTemplate/Admin.pm +++ b/lib/NGCP/Panel/Form/EmailTemplate/Admin.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::EmailTemplate::Admin; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::EmailTemplate::Reseller'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'reseller' => ( type => '+NGCP::Panel::Field::Reseller', diff --git a/lib/NGCP/Panel/Form/EmailTemplate/Reseller.pm b/lib/NGCP/Panel/Form/EmailTemplate/Reseller.pm index 7009ef69da..be97509cd4 100644 --- a/lib/NGCP/Panel/Form/EmailTemplate/Reseller.pm +++ b/lib/NGCP/Panel/Form/EmailTemplate/Reseller.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::EmailTemplate::Reseller; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Faxserver/API.pm b/lib/NGCP/Panel/Form/Faxserver/API.pm index d6249d194a..eb5c03ceab 100644 --- a/lib/NGCP/Panel/Form/Faxserver/API.pm +++ b/lib/NGCP/Panel/Form/Faxserver/API.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Faxserver::API; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'name' => ( diff --git a/lib/NGCP/Panel/Form/Faxserver/Active.pm b/lib/NGCP/Panel/Form/Faxserver/Active.pm index d617a5fcfa..9ea56ec44d 100644 --- a/lib/NGCP/Panel/Form/Faxserver/Active.pm +++ b/lib/NGCP/Panel/Form/Faxserver/Active.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Faxserver::Active; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Faxserver/Destination.pm b/lib/NGCP/Panel/Form/Faxserver/Destination.pm index b270246011..4930e094df 100644 --- a/lib/NGCP/Panel/Form/Faxserver/Destination.pm +++ b/lib/NGCP/Panel/Form/Faxserver/Destination.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Faxserver::Destination; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Faxserver/Name.pm b/lib/NGCP/Panel/Form/Faxserver/Name.pm index 9b51a42020..0230f2fe71 100644 --- a/lib/NGCP/Panel/Form/Faxserver/Name.pm +++ b/lib/NGCP/Panel/Form/Faxserver/Name.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Faxserver::Name; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Faxserver/Password.pm b/lib/NGCP/Panel/Form/Faxserver/Password.pm index 447def6a73..b5637858c6 100644 --- a/lib/NGCP/Panel/Form/Faxserver/Password.pm +++ b/lib/NGCP/Panel/Form/Faxserver/Password.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Faxserver::Password; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use NGCP::Panel::Utils::Form; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Faxserver/SendCopy.pm b/lib/NGCP/Panel/Form/Faxserver/SendCopy.pm index 2b2cbd73b2..7f00c0ae45 100644 --- a/lib/NGCP/Panel/Form/Faxserver/SendCopy.pm +++ b/lib/NGCP/Panel/Form/Faxserver/SendCopy.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Faxserver::SendCopy; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Faxserver/SendStatus.pm b/lib/NGCP/Panel/Form/Faxserver/SendStatus.pm index 54ba3bdfe8..c914a30d22 100644 --- a/lib/NGCP/Panel/Form/Faxserver/SendStatus.pm +++ b/lib/NGCP/Panel/Form/Faxserver/SendStatus.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Faxserver::SendStatus; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/InterceptionAPI.pm b/lib/NGCP/Panel/Form/InterceptionAPI.pm index c176b2d00e..8f0d756da0 100644 --- a/lib/NGCP/Panel/Form/InterceptionAPI.pm +++ b/lib/NGCP/Panel/Form/InterceptionAPI.pm @@ -3,7 +3,7 @@ package NGCP::Panel::Form::InterceptionAPI; use Sipwise::Base; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; use Data::Validate::IP qw/is_ipv4 is_ipv6/; diff --git a/lib/NGCP/Panel/Form/Invoice/Invoice.pm b/lib/NGCP/Panel/Form/Invoice/Invoice.pm index 212bda58cb..cf91c11e80 100644 --- a/lib/NGCP/Panel/Form/Invoice/Invoice.pm +++ b/lib/NGCP/Panel/Form/Invoice/Invoice.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Invoice::Invoice; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Invoice/InvoiceAPI.pm b/lib/NGCP/Panel/Form/Invoice/InvoiceAPI.pm index 576972de76..506554cafe 100644 --- a/lib/NGCP/Panel/Form/Invoice/InvoiceAPI.pm +++ b/lib/NGCP/Panel/Form/Invoice/InvoiceAPI.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Invoice::InvoiceAPI; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'customer_id' => ( type => 'PosInteger', diff --git a/lib/NGCP/Panel/Form/Invoice/TemplateAdmin.pm b/lib/NGCP/Panel/Form/Invoice/TemplateAdmin.pm index 70307357f8..958e5e4f09 100644 --- a/lib/NGCP/Panel/Form/Invoice/TemplateAdmin.pm +++ b/lib/NGCP/Panel/Form/Invoice/TemplateAdmin.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Invoice::TemplateAdmin; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::Invoice::TemplateReseller'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'reseller' => ( type => '+NGCP::Panel::Field::Reseller', diff --git a/lib/NGCP/Panel/Form/Invoice/TemplateReseller.pm b/lib/NGCP/Panel/Form/Invoice/TemplateReseller.pm index 54c5191541..192bc92969 100644 --- a/lib/NGCP/Panel/Form/Invoice/TemplateReseller.pm +++ b/lib/NGCP/Panel/Form/Invoice/TemplateReseller.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Invoice::TemplateReseller; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Login.pm b/lib/NGCP/Panel/Form/Login.pm index fb2644b946..bad70dd72b 100644 --- a/lib/NGCP/Panel/Form/Login.pm +++ b/lib/NGCP/Panel/Form/Login.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Login; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/MaliciousCall/Admin.pm b/lib/NGCP/Panel/Form/MaliciousCall/Admin.pm index a39f62276f..9d1716e025 100644 --- a/lib/NGCP/Panel/Form/MaliciousCall/Admin.pm +++ b/lib/NGCP/Panel/Form/MaliciousCall/Admin.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::MaliciousCall::Admin; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::MaliciousCall::Reseller'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'reseller' => ( type => '+NGCP::Panel::Field::Reseller', diff --git a/lib/NGCP/Panel/Form/MaliciousCall/Reseller.pm b/lib/NGCP/Panel/Form/MaliciousCall/Reseller.pm index 29c8646edb..56a147cdc9 100644 --- a/lib/NGCP/Panel/Form/MaliciousCall/Reseller.pm +++ b/lib/NGCP/Panel/Form/MaliciousCall/Reseller.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::MaliciousCall::Reseller; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/NCOS/AdminLevel.pm b/lib/NGCP/Panel/Form/NCOS/AdminLevel.pm index e918de4439..003b90a5aa 100644 --- a/lib/NGCP/Panel/Form/NCOS/AdminLevel.pm +++ b/lib/NGCP/Panel/Form/NCOS/AdminLevel.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::NCOS::AdminLevel; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::NCOS::ResellerLevel'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'reseller' => ( type => '+NGCP::Panel::Field::Reseller', diff --git a/lib/NGCP/Panel/Form/NCOS/AdminLevelAPI.pm b/lib/NGCP/Panel/Form/NCOS/AdminLevelAPI.pm index 4b84f83d7f..aa97f9994f 100644 --- a/lib/NGCP/Panel/Form/NCOS/AdminLevelAPI.pm +++ b/lib/NGCP/Panel/Form/NCOS/AdminLevelAPI.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::NCOS::AdminLevelAPI; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::NCOS::ResellerLevelAPI'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'reseller' => ( type => '+NGCP::Panel::Field::Reseller', diff --git a/lib/NGCP/Panel/Form/NCOS/LocalAC.pm b/lib/NGCP/Panel/Form/NCOS/LocalAC.pm index a3c6eec7a9..2c84137c19 100644 --- a/lib/NGCP/Panel/Form/NCOS/LocalAC.pm +++ b/lib/NGCP/Panel/Form/NCOS/LocalAC.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::NCOS::LocalAC; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/NCOS/Pattern.pm b/lib/NGCP/Panel/Form/NCOS/Pattern.pm index f4afe75320..73cbe217df 100644 --- a/lib/NGCP/Panel/Form/NCOS/Pattern.pm +++ b/lib/NGCP/Panel/Form/NCOS/Pattern.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::NCOS::Pattern; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/NCOS/PatternAPI.pm b/lib/NGCP/Panel/Form/NCOS/PatternAPI.pm index ab58f9fef7..9b6c8a031a 100644 --- a/lib/NGCP/Panel/Form/NCOS/PatternAPI.pm +++ b/lib/NGCP/Panel/Form/NCOS/PatternAPI.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::NCOS::PatternAPI; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::NCOS::Pattern'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'ncos_level_id' => ( type => 'PosInteger', diff --git a/lib/NGCP/Panel/Form/NCOS/ResellerLevel.pm b/lib/NGCP/Panel/Form/NCOS/ResellerLevel.pm index 22b0642fb7..3423060883 100644 --- a/lib/NGCP/Panel/Form/NCOS/ResellerLevel.pm +++ b/lib/NGCP/Panel/Form/NCOS/ResellerLevel.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::NCOS::ResellerLevel; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/NCOS/ResellerLevelAPI.pm b/lib/NGCP/Panel/Form/NCOS/ResellerLevelAPI.pm index 52bd351a56..ad44a23583 100644 --- a/lib/NGCP/Panel/Form/NCOS/ResellerLevelAPI.pm +++ b/lib/NGCP/Panel/Form/NCOS/ResellerLevelAPI.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::NCOS::ResellerLevelAPI; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/NumberBlock/BlockAdmin.pm b/lib/NGCP/Panel/Form/NumberBlock/BlockAdmin.pm index 12ff02ad1b..f5e03c699f 100644 --- a/lib/NGCP/Panel/Form/NumberBlock/BlockAdmin.pm +++ b/lib/NGCP/Panel/Form/NumberBlock/BlockAdmin.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::NumberBlock::BlockAdmin; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::NumberBlock::BlockReseller'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'reseller_list' => ( type => '+NGCP::Panel::Field::DataTable', diff --git a/lib/NGCP/Panel/Form/NumberBlock/BlockReseller.pm b/lib/NGCP/Panel/Form/NumberBlock/BlockReseller.pm index c1a0d899f1..b1c6a209d0 100644 --- a/lib/NGCP/Panel/Form/NumberBlock/BlockReseller.pm +++ b/lib/NGCP/Panel/Form/NumberBlock/BlockReseller.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::NumberBlock::BlockReseller; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/PeeringGroup.pm b/lib/NGCP/Panel/Form/PeeringGroup.pm index 80fc4c9737..4e46c1bb98 100644 --- a/lib/NGCP/Panel/Form/PeeringGroup.pm +++ b/lib/NGCP/Panel/Form/PeeringGroup.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::PeeringGroup; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; use NGCP::Panel::Field::BillingZone; diff --git a/lib/NGCP/Panel/Form/PeeringRule.pm b/lib/NGCP/Panel/Form/PeeringRule.pm index 6fc96e4aa8..3895d0d255 100644 --- a/lib/NGCP/Panel/Form/PeeringRule.pm +++ b/lib/NGCP/Panel/Form/PeeringRule.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::PeeringRule; use Sipwise::Base; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/PeeringServer.pm b/lib/NGCP/Panel/Form/PeeringServer.pm index 5a38f8911d..f7d3a60301 100644 --- a/lib/NGCP/Panel/Form/PeeringServer.pm +++ b/lib/NGCP/Panel/Form/PeeringServer.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::PeeringServer; use Sipwise::Base; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use NGCP::Panel::Field::PosInteger; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Preferences.pm b/lib/NGCP/Panel/Form/Preferences.pm index 9f4dd8e8ec..540e30a32c 100644 --- a/lib/NGCP/Panel/Form/Preferences.pm +++ b/lib/NGCP/Panel/Form/Preferences.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Preferences; use Sipwise::Base; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/ProfilePackage/Admin.pm b/lib/NGCP/Panel/Form/ProfilePackage/Admin.pm index e7e7b34e6f..5cf0962ede 100644 --- a/lib/NGCP/Panel/Form/ProfilePackage/Admin.pm +++ b/lib/NGCP/Panel/Form/ProfilePackage/Admin.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::ProfilePackage::Admin; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::ProfilePackage::Reseller'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'reseller' => ( type => '+NGCP::Panel::Field::Reseller', diff --git a/lib/NGCP/Panel/Form/ProfilePackage/PackageAPI.pm b/lib/NGCP/Panel/Form/ProfilePackage/PackageAPI.pm index 347f85f4b6..b6e1f096b2 100644 --- a/lib/NGCP/Panel/Form/ProfilePackage/PackageAPI.pm +++ b/lib/NGCP/Panel/Form/ProfilePackage/PackageAPI.pm @@ -1,7 +1,7 @@ package NGCP::Panel::Form::ProfilePackage::PackageAPI; use HTML::FormHandler::Moose; use HTML::FormHandler::Widget::Block::Bootstrap; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; extends 'HTML::FormHandler'; has_field 'id' => ( diff --git a/lib/NGCP/Panel/Form/ProfilePackage/Reseller.pm b/lib/NGCP/Panel/Form/ProfilePackage/Reseller.pm index b9e7185715..a3a794633d 100644 --- a/lib/NGCP/Panel/Form/ProfilePackage/Reseller.pm +++ b/lib/NGCP/Panel/Form/ProfilePackage/Reseller.pm @@ -1,7 +1,7 @@ package NGCP::Panel::Form::ProfilePackage::Reseller; use HTML::FormHandler::Moose; use HTML::FormHandler::Widget::Block::Bootstrap; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use Storable qw(); use NGCP::Panel::Utils::ProfilePackages qw(); extends 'HTML::FormHandler'; diff --git a/lib/NGCP/Panel/Form/Reminder.pm b/lib/NGCP/Panel/Form/Reminder.pm index e9713ccab6..16172c5a11 100644 --- a/lib/NGCP/Panel/Form/Reminder.pm +++ b/lib/NGCP/Panel/Form/Reminder.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Reminder; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Reminder/API.pm b/lib/NGCP/Panel/Form/Reminder/API.pm index 7ada3d68f3..c07f5d9fd3 100644 --- a/lib/NGCP/Panel/Form/Reminder/API.pm +++ b/lib/NGCP/Panel/Form/Reminder/API.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Reminder::API; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::Reminder'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'subscriber_id' => ( type => 'PosInteger', diff --git a/lib/NGCP/Panel/Form/Reseller.pm b/lib/NGCP/Panel/Form/Reseller.pm index 4f8cbc15d6..8960f54a21 100644 --- a/lib/NGCP/Panel/Form/Reseller.pm +++ b/lib/NGCP/Panel/Form/Reseller.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Reseller; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Reseller/Branding.pm b/lib/NGCP/Panel/Form/Reseller/Branding.pm index 9381dfc187..17d0411f14 100644 --- a/lib/NGCP/Panel/Form/Reseller/Branding.pm +++ b/lib/NGCP/Panel/Form/Reseller/Branding.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Reseller::Branding; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/RewriteRule/AdminSet.pm b/lib/NGCP/Panel/Form/RewriteRule/AdminSet.pm index 958f1a3149..96d0c6cbb3 100644 --- a/lib/NGCP/Panel/Form/RewriteRule/AdminSet.pm +++ b/lib/NGCP/Panel/Form/RewriteRule/AdminSet.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::RewriteRule::AdminSet; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::RewriteRule::ResellerSet'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'reseller' => ( type => '+NGCP::Panel::Field::Reseller', diff --git a/lib/NGCP/Panel/Form/RewriteRule/ApplyAPI.pm b/lib/NGCP/Panel/Form/RewriteRule/ApplyAPI.pm index 2bd2e3b3a0..b914b78554 100644 --- a/lib/NGCP/Panel/Form/RewriteRule/ApplyAPI.pm +++ b/lib/NGCP/Panel/Form/RewriteRule/ApplyAPI.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::RewriteRule::ApplyAPI; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/RewriteRule/CloneSet.pm b/lib/NGCP/Panel/Form/RewriteRule/CloneSet.pm index 01ee5a5e53..94d47ca8aa 100644 --- a/lib/NGCP/Panel/Form/RewriteRule/CloneSet.pm +++ b/lib/NGCP/Panel/Form/RewriteRule/CloneSet.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::RewriteRule::CloneSet; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/RewriteRule/ResellerSet.pm b/lib/NGCP/Panel/Form/RewriteRule/ResellerSet.pm index c4d92819c3..9b222a1b3d 100644 --- a/lib/NGCP/Panel/Form/RewriteRule/ResellerSet.pm +++ b/lib/NGCP/Panel/Form/RewriteRule/ResellerSet.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::RewriteRule::ResellerSet; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/RewriteRule/Rule.pm b/lib/NGCP/Panel/Form/RewriteRule/Rule.pm index c5d041c7f9..02d601519e 100644 --- a/lib/NGCP/Panel/Form/RewriteRule/Rule.pm +++ b/lib/NGCP/Panel/Form/RewriteRule/Rule.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::RewriteRule::Rule; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Sound/AdminSet.pm b/lib/NGCP/Panel/Form/Sound/AdminSet.pm index 3806348c14..052ca2f234 100644 --- a/lib/NGCP/Panel/Form/Sound/AdminSet.pm +++ b/lib/NGCP/Panel/Form/Sound/AdminSet.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Sound::AdminSet; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::Sound::ResellerSet'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'reseller' => ( type => '+NGCP::Panel::Field::Reseller', diff --git a/lib/NGCP/Panel/Form/Sound/CustomerSet.pm b/lib/NGCP/Panel/Form/Sound/CustomerSet.pm index 7a3bcf955d..251b4473e8 100644 --- a/lib/NGCP/Panel/Form/Sound/CustomerSet.pm +++ b/lib/NGCP/Panel/Form/Sound/CustomerSet.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Sound::CustomerSet; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Sound/File.pm b/lib/NGCP/Panel/Form/Sound/File.pm index 4ebe8b3bba..71727fc88e 100644 --- a/lib/NGCP/Panel/Form/Sound/File.pm +++ b/lib/NGCP/Panel/Form/Sound/File.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Sound::File; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Sound/FileAPI.pm b/lib/NGCP/Panel/Form/Sound/FileAPI.pm index 49458081be..80107d9f28 100644 --- a/lib/NGCP/Panel/Form/Sound/FileAPI.pm +++ b/lib/NGCP/Panel/Form/Sound/FileAPI.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Sound::FileAPI; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Sound/HandleAPI.pm b/lib/NGCP/Panel/Form/Sound/HandleAPI.pm index 7fede7358b..0f850e3e5e 100644 --- a/lib/NGCP/Panel/Form/Sound/HandleAPI.pm +++ b/lib/NGCP/Panel/Form/Sound/HandleAPI.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Sound::HandleAPI; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Sound/LoadDefault.pm b/lib/NGCP/Panel/Form/Sound/LoadDefault.pm index 1da777cd01..cd54f320c2 100644 --- a/lib/NGCP/Panel/Form/Sound/LoadDefault.pm +++ b/lib/NGCP/Panel/Form/Sound/LoadDefault.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Sound::LoadDefault; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use File::Find::Rule; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Sound/ResellerSet.pm b/lib/NGCP/Panel/Form/Sound/ResellerSet.pm index cd7115d23b..9b3a6685f0 100644 --- a/lib/NGCP/Panel/Form/Sound/ResellerSet.pm +++ b/lib/NGCP/Panel/Form/Sound/ResellerSet.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Sound::ResellerSet; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Statistics.pm b/lib/NGCP/Panel/Form/Statistics.pm index 78ddbb613c..5f58188af9 100644 --- a/lib/NGCP/Panel/Form/Statistics.pm +++ b/lib/NGCP/Panel/Form/Statistics.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Statistics; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Subscriber.pm b/lib/NGCP/Panel/Form/Subscriber.pm index 60d7711cf1..3738a47f1f 100644 --- a/lib/NGCP/Panel/Form/Subscriber.pm +++ b/lib/NGCP/Panel/Form/Subscriber.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Subscriber; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Subscriber/AutoAttendant.pm b/lib/NGCP/Panel/Form/Subscriber/AutoAttendant.pm index be2e5b4b78..36f5bc088f 100644 --- a/lib/NGCP/Panel/Form/Subscriber/AutoAttendant.pm +++ b/lib/NGCP/Panel/Form/Subscriber/AutoAttendant.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Subscriber::AutoAttendant; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Subscriber/AutoAttendantAPI.pm b/lib/NGCP/Panel/Form/Subscriber/AutoAttendantAPI.pm index 84a56dc343..39c25c311c 100644 --- a/lib/NGCP/Panel/Form/Subscriber/AutoAttendantAPI.pm +++ b/lib/NGCP/Panel/Form/Subscriber/AutoAttendantAPI.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Subscriber::AutoAttendantAPI; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has '+widget_wrapper' => ( default => 'Bootstrap' ); sub build_render_list {return [qw/submitid fields actions/]} diff --git a/lib/NGCP/Panel/Form/Subscriber/EditWebpass.pm b/lib/NGCP/Panel/Form/Subscriber/EditWebpass.pm index 37d750d2f7..0287ba958e 100644 --- a/lib/NGCP/Panel/Form/Subscriber/EditWebpass.pm +++ b/lib/NGCP/Panel/Form/Subscriber/EditWebpass.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Subscriber::EditWebpass; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use NGCP::Panel::Utils::Form; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Subscriber/Location.pm b/lib/NGCP/Panel/Form/Subscriber/Location.pm index ec07b3971c..d700b3cdeb 100644 --- a/lib/NGCP/Panel/Form/Subscriber/Location.pm +++ b/lib/NGCP/Panel/Form/Subscriber/Location.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Subscriber::Location; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Subscriber/RecoverPassword.pm b/lib/NGCP/Panel/Form/Subscriber/RecoverPassword.pm index 475fb21fd7..8149cf21e8 100644 --- a/lib/NGCP/Panel/Form/Subscriber/RecoverPassword.pm +++ b/lib/NGCP/Panel/Form/Subscriber/RecoverPassword.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Subscriber::RecoverPassword; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; use NGCP::Panel::Field::PosInteger; diff --git a/lib/NGCP/Panel/Form/Subscriber/RegisteredAPI.pm b/lib/NGCP/Panel/Form/Subscriber/RegisteredAPI.pm index 1617de2493..1ec28e6031 100644 --- a/lib/NGCP/Panel/Form/Subscriber/RegisteredAPI.pm +++ b/lib/NGCP/Panel/Form/Subscriber/RegisteredAPI.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Subscriber::RegisteredAPI; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Subscriber/ResetPassword.pm b/lib/NGCP/Panel/Form/Subscriber/ResetPassword.pm index 9c9ca94dc7..6e2d640b19 100644 --- a/lib/NGCP/Panel/Form/Subscriber/ResetPassword.pm +++ b/lib/NGCP/Panel/Form/Subscriber/ResetPassword.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Subscriber::ResetPassword; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; use NGCP::Panel::Field::PosInteger; diff --git a/lib/NGCP/Panel/Form/Subscriber/SpeedDial.pm b/lib/NGCP/Panel/Form/Subscriber/SpeedDial.pm index 15abfb85d8..6ccf2e5883 100644 --- a/lib/NGCP/Panel/Form/Subscriber/SpeedDial.pm +++ b/lib/NGCP/Panel/Form/Subscriber/SpeedDial.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Subscriber::SpeedDial; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use NGCP::Panel::Field::URI; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Subscriber/SpeedDialAPI.pm b/lib/NGCP/Panel/Form/Subscriber/SpeedDialAPI.pm index 01b87ac6cc..08297f5e9b 100644 --- a/lib/NGCP/Panel/Form/Subscriber/SpeedDialAPI.pm +++ b/lib/NGCP/Panel/Form/Subscriber/SpeedDialAPI.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Subscriber::SpeedDialAPI; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'speeddials' => ( type => 'Repeatable', diff --git a/lib/NGCP/Panel/Form/Subscriber/TrustedSource.pm b/lib/NGCP/Panel/Form/Subscriber/TrustedSource.pm index 786cc8b905..013c531215 100644 --- a/lib/NGCP/Panel/Form/Subscriber/TrustedSource.pm +++ b/lib/NGCP/Panel/Form/Subscriber/TrustedSource.pm @@ -3,7 +3,7 @@ package NGCP::Panel::Form::Subscriber::TrustedSource; use Sipwise::Base; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; use Data::Validate::IP qw/is_ipv4 is_ipv6/; diff --git a/lib/NGCP/Panel/Form/Subscriber/TrustedSourceAPI.pm b/lib/NGCP/Panel/Form/Subscriber/TrustedSourceAPI.pm index 68c5749db2..1178580196 100644 --- a/lib/NGCP/Panel/Form/Subscriber/TrustedSourceAPI.pm +++ b/lib/NGCP/Panel/Form/Subscriber/TrustedSourceAPI.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Subscriber::TrustedSourceAPI; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::Subscriber::TrustedSource'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'subscriber_id' => ( type => 'PosInteger', diff --git a/lib/NGCP/Panel/Form/Subscriber/Webfax.pm b/lib/NGCP/Panel/Form/Subscriber/Webfax.pm index 01c5a1a8d0..c32cd357a3 100644 --- a/lib/NGCP/Panel/Form/Subscriber/Webfax.pm +++ b/lib/NGCP/Panel/Form/Subscriber/Webfax.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Subscriber::Webfax; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Subscriber/WebfaxAPI.pm b/lib/NGCP/Panel/Form/Subscriber/WebfaxAPI.pm index bc11cbf46e..b95cea6e92 100644 --- a/lib/NGCP/Panel/Form/Subscriber/WebfaxAPI.pm +++ b/lib/NGCP/Panel/Form/Subscriber/WebfaxAPI.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Subscriber::WebfaxAPI; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::Subscriber::Webfax'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'subscriber_id' => ( type => 'PosInteger', diff --git a/lib/NGCP/Panel/Form/SubscriberCFAdvanced.pm b/lib/NGCP/Panel/Form/SubscriberCFAdvanced.pm index 9c313c3444..032f161a49 100644 --- a/lib/NGCP/Panel/Form/SubscriberCFAdvanced.pm +++ b/lib/NGCP/Panel/Form/SubscriberCFAdvanced.pm @@ -1,7 +1,7 @@ package NGCP::Panel::Form::SubscriberCFAdvanced; use HTML::FormHandler::Moose; use HTML::FormHandler::Widget::Block::Bootstrap; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; extends 'HTML::FormHandler'; with 'NGCP::Panel::Render::RepeatableJs'; diff --git a/lib/NGCP/Panel/Form/SubscriberCFSimple.pm b/lib/NGCP/Panel/Form/SubscriberCFSimple.pm index baa8f3fc29..12f1772408 100644 --- a/lib/NGCP/Panel/Form/SubscriberCFSimple.pm +++ b/lib/NGCP/Panel/Form/SubscriberCFSimple.pm @@ -1,7 +1,7 @@ package NGCP::Panel::Form::SubscriberCFSimple; use HTML::FormHandler::Moose; use HTML::FormHandler::Widget::Block::Bootstrap; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use NGCP::Panel::Field::PosInteger; use NGCP::Panel::Field::URI; extends 'HTML::FormHandler'; diff --git a/lib/NGCP/Panel/Form/SubscriberCFTAdvanced.pm b/lib/NGCP/Panel/Form/SubscriberCFTAdvanced.pm index 44b00dc733..c4f89b0828 100644 --- a/lib/NGCP/Panel/Form/SubscriberCFTAdvanced.pm +++ b/lib/NGCP/Panel/Form/SubscriberCFTAdvanced.pm @@ -1,7 +1,7 @@ package NGCP::Panel::Form::SubscriberCFTAdvanced; use HTML::FormHandler::Moose; use HTML::FormHandler::Widget::Block::Bootstrap; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use NGCP::Panel::Field::PosInteger; extends 'NGCP::Panel::Form::SubscriberCFAdvanced'; diff --git a/lib/NGCP/Panel/Form/SubscriberCFTSimple.pm b/lib/NGCP/Panel/Form/SubscriberCFTSimple.pm index 46cb5e1c69..cb7e201022 100644 --- a/lib/NGCP/Panel/Form/SubscriberCFTSimple.pm +++ b/lib/NGCP/Panel/Form/SubscriberCFTSimple.pm @@ -1,7 +1,7 @@ package NGCP::Panel::Form::SubscriberCFTSimple; use HTML::FormHandler::Moose; use HTML::FormHandler::Widget::Block::Bootstrap; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use NGCP::Panel::Field::PosInteger; extends 'NGCP::Panel::Form::SubscriberCFSimple'; diff --git a/lib/NGCP/Panel/Form/SubscriberEdit.pm b/lib/NGCP/Panel/Form/SubscriberEdit.pm index 96af1bb6df..61a43c865f 100644 --- a/lib/NGCP/Panel/Form/SubscriberEdit.pm +++ b/lib/NGCP/Panel/Form/SubscriberEdit.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::SubscriberEdit; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/SubscriberProfile/ApiProfile.pm b/lib/NGCP/Panel/Form/SubscriberProfile/ApiProfile.pm index e0fd3fff6a..39033ae442 100644 --- a/lib/NGCP/Panel/Form/SubscriberProfile/ApiProfile.pm +++ b/lib/NGCP/Panel/Form/SubscriberProfile/ApiProfile.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::SubscriberProfile::ApiProfile; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::SubscriberProfile::Profile'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'profile_set' => ( type => '+NGCP::Panel::Field::SubscriberProfileSet', diff --git a/lib/NGCP/Panel/Form/SubscriberProfile/Profile.pm b/lib/NGCP/Panel/Form/SubscriberProfile/Profile.pm index 36ff31de38..350d0e41e3 100644 --- a/lib/NGCP/Panel/Form/SubscriberProfile/Profile.pm +++ b/lib/NGCP/Panel/Form/SubscriberProfile/Profile.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::SubscriberProfile::Profile; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/SubscriberProfile/ProfileClone.pm b/lib/NGCP/Panel/Form/SubscriberProfile/ProfileClone.pm index 9d99f871ed..8cdf5cd957 100644 --- a/lib/NGCP/Panel/Form/SubscriberProfile/ProfileClone.pm +++ b/lib/NGCP/Panel/Form/SubscriberProfile/ProfileClone.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::SubscriberProfile::ProfileClone; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/SubscriberProfile/SetAdmin.pm b/lib/NGCP/Panel/Form/SubscriberProfile/SetAdmin.pm index 531e0ca5cb..39c7321dba 100644 --- a/lib/NGCP/Panel/Form/SubscriberProfile/SetAdmin.pm +++ b/lib/NGCP/Panel/Form/SubscriberProfile/SetAdmin.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::SubscriberProfile::SetAdmin; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::SubscriberProfile::SetReseller'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'reseller' => ( type => '+NGCP::Panel::Field::Reseller', diff --git a/lib/NGCP/Panel/Form/SubscriberProfile/SetCloneAdmin.pm b/lib/NGCP/Panel/Form/SubscriberProfile/SetCloneAdmin.pm index 3a6a29d780..e9a76e8e68 100644 --- a/lib/NGCP/Panel/Form/SubscriberProfile/SetCloneAdmin.pm +++ b/lib/NGCP/Panel/Form/SubscriberProfile/SetCloneAdmin.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::SubscriberProfile::SetCloneAdmin; use HTML::FormHandler::Moose; extends 'NGCP::Panel::Form::SubscriberProfile::SetCloneReseller'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'reseller' => ( type => '+NGCP::Panel::Field::Reseller', diff --git a/lib/NGCP/Panel/Form/SubscriberProfile/SetCloneReseller.pm b/lib/NGCP/Panel/Form/SubscriberProfile/SetCloneReseller.pm index 7bd957a9da..e200f29204 100644 --- a/lib/NGCP/Panel/Form/SubscriberProfile/SetCloneReseller.pm +++ b/lib/NGCP/Panel/Form/SubscriberProfile/SetCloneReseller.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::SubscriberProfile::SetCloneReseller; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/SubscriberProfile/SetReseller.pm b/lib/NGCP/Panel/Form/SubscriberProfile/SetReseller.pm index 22ba093e6f..f20cc2a81a 100644 --- a/lib/NGCP/Panel/Form/SubscriberProfile/SetReseller.pm +++ b/lib/NGCP/Panel/Form/SubscriberProfile/SetReseller.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::SubscriberProfile::SetReseller; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/TimeSet.pm b/lib/NGCP/Panel/Form/TimeSet.pm index 0a61a00214..84039ad8ec 100644 --- a/lib/NGCP/Panel/Form/TimeSet.pm +++ b/lib/NGCP/Panel/Form/TimeSet.pm @@ -1,7 +1,7 @@ package NGCP::Panel::Form::TimeSet; use HTML::FormHandler::Moose; use HTML::FormHandler::Widget::Block::Bootstrap; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; extends 'HTML::FormHandler'; with 'NGCP::Panel::Render::RepeatableJs'; diff --git a/lib/NGCP/Panel/Form/Topup/Cash.pm b/lib/NGCP/Panel/Form/Topup/Cash.pm index e3fd68a9fb..658ddc6ff7 100644 --- a/lib/NGCP/Panel/Form/Topup/Cash.pm +++ b/lib/NGCP/Panel/Form/Topup/Cash.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Topup::Cash; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Topup/CashAPI.pm b/lib/NGCP/Panel/Form/Topup/CashAPI.pm index 3bb236fb61..477a5ff6c0 100644 --- a/lib/NGCP/Panel/Form/Topup/CashAPI.pm +++ b/lib/NGCP/Panel/Form/Topup/CashAPI.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Topup::CashAPI; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Topup/Log.pm b/lib/NGCP/Panel/Form/Topup/Log.pm index 5aaa0957d0..9d02900034 100644 --- a/lib/NGCP/Panel/Form/Topup/Log.pm +++ b/lib/NGCP/Panel/Form/Topup/Log.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Topup::Log; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; has_field 'id' => ( type => 'Hidden' diff --git a/lib/NGCP/Panel/Form/Topup/Voucher.pm b/lib/NGCP/Panel/Form/Topup/Voucher.pm index 8c28f04369..6820b17dd4 100644 --- a/lib/NGCP/Panel/Form/Topup/Voucher.pm +++ b/lib/NGCP/Panel/Form/Topup/Voucher.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Topup::Voucher; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Topup/VoucherAPI.pm b/lib/NGCP/Panel/Form/Topup/VoucherAPI.pm index c54c42f1b0..cffc3cd9d7 100644 --- a/lib/NGCP/Panel/Form/Topup/VoucherAPI.pm +++ b/lib/NGCP/Panel/Form/Topup/VoucherAPI.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Topup::VoucherAPI; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Voicemail/API.pm b/lib/NGCP/Panel/Form/Voicemail/API.pm index a07abe9d17..7925b26604 100644 --- a/lib/NGCP/Panel/Form/Voicemail/API.pm +++ b/lib/NGCP/Panel/Form/Voicemail/API.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Voicemail::API; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Voicemail/Attach.pm b/lib/NGCP/Panel/Form/Voicemail/Attach.pm index 56ce547037..a6fd5930a6 100644 --- a/lib/NGCP/Panel/Form/Voicemail/Attach.pm +++ b/lib/NGCP/Panel/Form/Voicemail/Attach.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Voicemail::Attach; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Voicemail/Delete.pm b/lib/NGCP/Panel/Form/Voicemail/Delete.pm index 6459963b02..565a979a1d 100644 --- a/lib/NGCP/Panel/Form/Voicemail/Delete.pm +++ b/lib/NGCP/Panel/Form/Voicemail/Delete.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Voicemail::Delete; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Voicemail/Email.pm b/lib/NGCP/Panel/Form/Voicemail/Email.pm index a4f953f802..7af85f4179 100644 --- a/lib/NGCP/Panel/Form/Voicemail/Email.pm +++ b/lib/NGCP/Panel/Form/Voicemail/Email.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Voicemail::Email; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Voicemail/Meta.pm b/lib/NGCP/Panel/Form/Voicemail/Meta.pm index 48005df5d5..355348f65c 100644 --- a/lib/NGCP/Panel/Form/Voicemail/Meta.pm +++ b/lib/NGCP/Panel/Form/Voicemail/Meta.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Voicemail::Meta; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Voicemail/Pin.pm b/lib/NGCP/Panel/Form/Voicemail/Pin.pm index 0e89f9e04a..a589a37fd6 100644 --- a/lib/NGCP/Panel/Form/Voicemail/Pin.pm +++ b/lib/NGCP/Panel/Form/Voicemail/Pin.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Voicemail::Pin; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Voucher/Reseller.pm b/lib/NGCP/Panel/Form/Voucher/Reseller.pm index d0765a4c8a..b48d9087d7 100644 --- a/lib/NGCP/Panel/Form/Voucher/Reseller.pm +++ b/lib/NGCP/Panel/Form/Voucher/Reseller.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Voucher::Reseller; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Voucher/ResellerAPI.pm b/lib/NGCP/Panel/Form/Voucher/ResellerAPI.pm index e76d0e9d74..b1abe89294 100644 --- a/lib/NGCP/Panel/Form/Voucher/ResellerAPI.pm +++ b/lib/NGCP/Panel/Form/Voucher/ResellerAPI.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Voucher::ResellerAPI; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; diff --git a/lib/NGCP/Panel/Form/Voucher/Upload.pm b/lib/NGCP/Panel/Form/Voucher/Upload.pm index fac7e601bb..f91f100c54 100644 --- a/lib/NGCP/Panel/Form/Voucher/Upload.pm +++ b/lib/NGCP/Panel/Form/Voucher/Upload.pm @@ -2,7 +2,7 @@ package NGCP::Panel::Form::Voucher::Upload; use Sipwise::Base; use HTML::FormHandler::Moose; extends 'HTML::FormHandler'; -use Moose::Util::TypeConstraints; +#use Moose::Util::TypeConstraints; use HTML::FormHandler::Widget::Block::Bootstrap; use NGCP::Panel::Field::BillingZone; diff --git a/lib/NGCP/Panel/Model/CA.pm b/lib/NGCP/Panel/Model/CA.pm index ab99ea04e8..e2c8f563cd 100644 --- a/lib/NGCP/Panel/Model/CA.pm +++ b/lib/NGCP/Panel/Model/CA.pm @@ -4,7 +4,7 @@ use MIME::Base64 qw(decode_base64); use Time::HiRes qw(); use Path::Tiny qw(); use Sys::Hostname qw(hostname); -extends 'Catalyst::Component'; +use base 'Catalyst::Component'; sub client_signing_template { my ($self, $serial) = @_; @@ -119,6 +119,6 @@ sub get_provisioning_root_ca_cert { $content =~ s/^.*?BEGIN CERTIFICATE\-+(.*?)\-+END CERTIFICATE.*$/$1/; return $content; } - +1; # vim: set tabstop=4 expandtab diff --git a/lib/NGCP/Panel/Model/DB.pm b/lib/NGCP/Panel/Model/DB.pm index 1d9208177c..95d7c8ee2f 100644 --- a/lib/NGCP/Panel/Model/DB.pm +++ b/lib/NGCP/Panel/Model/DB.pm @@ -17,11 +17,6 @@ sub setup { use_module('NGCP::Schema::Config')->instance ->config_file($config_location); } - if($ENV{NGCP_PANEL_CUSTOM_DSN}) { - use_module('NGCP::Schema::Config')->instance->as_hash; - use_module('NGCP::Schema::Config')->instance->as_hash - ->{ngcp_connect_info}{dsn} = $ENV{NGCP_PANEL_CUSTOM_DSN}; - } } __PACKAGE__->config( diff --git a/lib/NGCP/Panel/Role/API.pm b/lib/NGCP/Panel/Role/API.pm index f8a4dc9d77..020a5ccbf6 100644 --- a/lib/NGCP/Panel/Role/API.pm +++ b/lib/NGCP/Panel/Role/API.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; @@ -140,7 +141,7 @@ sub validate_form { sprintf 'field=\'%s\', input=\'%s\', errors=\'%s\'', ($_->parent->$_isa('HTML::FormHandler::Field') ? $_->parent->name . '_' : '') . $_->name, $_->input // '', - $_->errors->join(q()) + join('', @{ $_->errors }) } $form->error_fields; $self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Validation failed. $e"); return; @@ -177,7 +178,7 @@ sub validate_fields { $fields->{$k}->$_isa('HTML::FormHandler::Field::Integer') || $fields->{$k}->$_isa('HTML::FormHandler::Field::Money') || $fields->{$k}->$_isa('HTML::FormHandler::Field::Float')) && - ($resource->{$k}->is_int || $resource->{$k}->is_decimal)); + (is_int($resource->{$k}) || is_decimal($resource->{$k}))); if (defined $resource->{$k} && $fields->{$k}->$_isa('HTML::FormHandler::Field::Repeatable') && @@ -319,7 +320,7 @@ sub attributed_methods { sub valid_id { my ($self, $c, $id) = @_; - return 1 if $id->is_integer; + return 1 if is_int($id); $self->error($c, HTTP_BAD_REQUEST, "Invalid id in request URI"); return; } @@ -542,7 +543,7 @@ sub set_body { sub log_request { my ($self, $c) = @_; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, type => 'api_request', log => $c->stash->{'body'}, @@ -560,7 +561,7 @@ sub log_response { my $rc = ''; if (@{ $c->error }) { my $msg = join ', ', @{ $c->error }; - $rc = NGCP::Panel::Utils::Message->error( + $rc = NGCP::Panel::Utils::Message::error( c => $c, type => 'api_response', log => $msg, @@ -568,7 +569,7 @@ sub log_response { $self->error($c, HTTP_INTERNAL_SERVER_ERROR, "Internal Server Error"); $c->clear_errors; } - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, type => 'api_response', log => $c->response->body, diff --git a/lib/NGCP/Panel/Role/API/ApplyRewrites.pm b/lib/NGCP/Panel/Role/API/ApplyRewrites.pm index 33cecb6984..f12c0e31bd 100644 --- a/lib/NGCP/Panel/Role/API/ApplyRewrites.pm +++ b/lib/NGCP/Panel/Role/API/ApplyRewrites.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::ApplyRewrites; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/AutoAttendants.pm b/lib/NGCP/Panel/Role/API/AutoAttendants.pm index a2584d1084..931d1d534a 100644 --- a/lib/NGCP/Panel/Role/API/AutoAttendants.pm +++ b/lib/NGCP/Panel/Role/API/AutoAttendants.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::AutoAttendants; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; with 'NGCP::Panel::Role::API' => { -alias =>{ item_rs => '_item_rs', }, diff --git a/lib/NGCP/Panel/Role/API/BalanceIntervals.pm b/lib/NGCP/Panel/Role/API/BalanceIntervals.pm index a46d297c6d..3f774094a9 100644 --- a/lib/NGCP/Panel/Role/API/BalanceIntervals.pm +++ b/lib/NGCP/Panel/Role/API/BalanceIntervals.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::BalanceIntervals; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/BillingFees.pm b/lib/NGCP/Panel/Role/API/BillingFees.pm index a7c1ce81dd..204fc4162f 100644 --- a/lib/NGCP/Panel/Role/API/BillingFees.pm +++ b/lib/NGCP/Panel/Role/API/BillingFees.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::BillingFees; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/BillingNetworks.pm b/lib/NGCP/Panel/Role/API/BillingNetworks.pm index 84df7d3049..e7405fe8eb 100644 --- a/lib/NGCP/Panel/Role/API/BillingNetworks.pm +++ b/lib/NGCP/Panel/Role/API/BillingNetworks.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::BillingNetworks; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/BillingProfiles.pm b/lib/NGCP/Panel/Role/API/BillingProfiles.pm index 3882895f52..f84fe6c038 100644 --- a/lib/NGCP/Panel/Role/API/BillingProfiles.pm +++ b/lib/NGCP/Panel/Role/API/BillingProfiles.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::BillingProfiles; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/BillingZones.pm b/lib/NGCP/Panel/Role/API/BillingZones.pm index aa68a50eae..fc418b58d8 100644 --- a/lib/NGCP/Panel/Role/API/BillingZones.pm +++ b/lib/NGCP/Panel/Role/API/BillingZones.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::BillingZones; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/CCMapEntries.pm b/lib/NGCP/Panel/Role/API/CCMapEntries.pm index 170d557dcf..dfc2a291a1 100644 --- a/lib/NGCP/Panel/Role/API/CCMapEntries.pm +++ b/lib/NGCP/Panel/Role/API/CCMapEntries.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::CCMapEntries; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/CFDestinationSets.pm b/lib/NGCP/Panel/Role/API/CFDestinationSets.pm index 5313825408..5976041786 100644 --- a/lib/NGCP/Panel/Role/API/CFDestinationSets.pm +++ b/lib/NGCP/Panel/Role/API/CFDestinationSets.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::CFDestinationSets; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { @@ -122,7 +123,7 @@ sub update_item { return; } for my $d (@{ $resource->{destinations} }) { - if (exists $d->{timeout} && ! $d->{timeout}->is_integer) { + if (exists $d->{timeout} && ! is_int($d->{timeout})) { $c->log->error("Invalid field 'timeout'."); $self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid field 'timeout'."); return; diff --git a/lib/NGCP/Panel/Role/API/CFMappings.pm b/lib/NGCP/Panel/Role/API/CFMappings.pm index ac90f626ff..a1741f76a4 100644 --- a/lib/NGCP/Panel/Role/API/CFMappings.pm +++ b/lib/NGCP/Panel/Role/API/CFMappings.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::CFMappings; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/CFTimeSets.pm b/lib/NGCP/Panel/Role/API/CFTimeSets.pm index 93892abf0a..22971a675b 100644 --- a/lib/NGCP/Panel/Role/API/CFTimeSets.pm +++ b/lib/NGCP/Panel/Role/API/CFTimeSets.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::CFTimeSets; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/CallControls.pm b/lib/NGCP/Panel/Role/API/CallControls.pm index 4d2e2b83f9..d2bc36cebc 100644 --- a/lib/NGCP/Panel/Role/API/CallControls.pm +++ b/lib/NGCP/Panel/Role/API/CallControls.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::CallControls; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/CallForwards.pm b/lib/NGCP/Panel/Role/API/CallForwards.pm index 9cf8cf37d3..bb89611760 100644 --- a/lib/NGCP/Panel/Role/API/CallForwards.pm +++ b/lib/NGCP/Panel/Role/API/CallForwards.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::CallForwards; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { @@ -126,7 +127,7 @@ sub update_item { for my $type (qw/cfu cfb cft cfna/) { next unless "ARRAY" eq ref $resource->{$type}{destinations}; for my $d (@{ $resource->{$type}{destinations} }) { - if (exists $d->{timeout} && ! $d->{timeout}->is_integer) { + if (exists $d->{timeout} && ! is_int($d->{timeout})) { $c->log->error("Invalid timeout in '$type'"); $self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid timeout in '$type'"); return; diff --git a/lib/NGCP/Panel/Role/API/CallLists.pm b/lib/NGCP/Panel/Role/API/CallLists.pm index 8c5913acaa..b5868e0cda 100644 --- a/lib/NGCP/Panel/Role/API/CallLists.pm +++ b/lib/NGCP/Panel/Role/API/CallLists.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::CallLists; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/Calls.pm b/lib/NGCP/Panel/Role/API/Calls.pm index 9994638f2a..8ff8d55d5e 100644 --- a/lib/NGCP/Panel/Role/API/Calls.pm +++ b/lib/NGCP/Panel/Role/API/Calls.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::Calls; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/Contracts.pm b/lib/NGCP/Panel/Role/API/Contracts.pm index d96dd0f3a8..bdeeb90c7e 100644 --- a/lib/NGCP/Panel/Role/API/Contracts.pm +++ b/lib/NGCP/Panel/Role/API/Contracts.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::Contracts; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/CustomerBalances.pm b/lib/NGCP/Panel/Role/API/CustomerBalances.pm index eb350b4806..38f12e3dd4 100644 --- a/lib/NGCP/Panel/Role/API/CustomerBalances.pm +++ b/lib/NGCP/Panel/Role/API/CustomerBalances.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::CustomerBalances; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/CustomerContacts.pm b/lib/NGCP/Panel/Role/API/CustomerContacts.pm index 4a67855418..7fde488a4e 100644 --- a/lib/NGCP/Panel/Role/API/CustomerContacts.pm +++ b/lib/NGCP/Panel/Role/API/CustomerContacts.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::CustomerContacts; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/CustomerZoneCosts.pm b/lib/NGCP/Panel/Role/API/CustomerZoneCosts.pm index 7654956ec3..37b6a16e00 100644 --- a/lib/NGCP/Panel/Role/API/CustomerZoneCosts.pm +++ b/lib/NGCP/Panel/Role/API/CustomerZoneCosts.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::CustomerZoneCosts; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/Customers.pm b/lib/NGCP/Panel/Role/API/Customers.pm index b5d0a56c4a..302c3db5b7 100644 --- a/lib/NGCP/Panel/Role/API/Customers.pm +++ b/lib/NGCP/Panel/Role/API/Customers.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::Customers; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/Domains.pm b/lib/NGCP/Panel/Role/API/Domains.pm index 9c7c8749a9..8724b536c4 100644 --- a/lib/NGCP/Panel/Role/API/Domains.pm +++ b/lib/NGCP/Panel/Role/API/Domains.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::Domains; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/EmailTemplates.pm b/lib/NGCP/Panel/Role/API/EmailTemplates.pm index 833649ec56..a31de25c10 100644 --- a/lib/NGCP/Panel/Role/API/EmailTemplates.pm +++ b/lib/NGCP/Panel/Role/API/EmailTemplates.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::EmailTemplates; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/FaxRecordings.pm b/lib/NGCP/Panel/Role/API/FaxRecordings.pm index b2b173d3e0..1e997c0fdb 100644 --- a/lib/NGCP/Panel/Role/API/FaxRecordings.pm +++ b/lib/NGCP/Panel/Role/API/FaxRecordings.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::FaxRecordings; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/Faxes.pm b/lib/NGCP/Panel/Role/API/Faxes.pm index bfb5c57048..51883e46f2 100644 --- a/lib/NGCP/Panel/Role/API/Faxes.pm +++ b/lib/NGCP/Panel/Role/API/Faxes.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::Faxes; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { @@ -76,7 +77,7 @@ sub resource_from_item { $resource{$_} = $item->$_; } foreach(qw/duration pages signal_rate/){ - $resource{$_} = $item->$_->is_int ? $item->$_ : 0; + $resource{$_} = is_int($item->$_) ? $item->$_ : 0; } return \%resource; } diff --git a/lib/NGCP/Panel/Role/API/FaxserverSettings.pm b/lib/NGCP/Panel/Role/API/FaxserverSettings.pm index 62afb22465..d60d23226f 100644 --- a/lib/NGCP/Panel/Role/API/FaxserverSettings.pm +++ b/lib/NGCP/Panel/Role/API/FaxserverSettings.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::FaxserverSettings; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/Interceptions.pm b/lib/NGCP/Panel/Role/API/Interceptions.pm index d745054aa3..86b7c8aef1 100644 --- a/lib/NGCP/Panel/Role/API/Interceptions.pm +++ b/lib/NGCP/Panel/Role/API/Interceptions.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::Interceptions; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/InvoiceTemplates.pm b/lib/NGCP/Panel/Role/API/InvoiceTemplates.pm index 9e7c0165ad..b25add7ab8 100644 --- a/lib/NGCP/Panel/Role/API/InvoiceTemplates.pm +++ b/lib/NGCP/Panel/Role/API/InvoiceTemplates.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::InvoiceTemplates; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/Invoices.pm b/lib/NGCP/Panel/Role/API/Invoices.pm index 6c7983281e..a0a60ce553 100644 --- a/lib/NGCP/Panel/Role/API/Invoices.pm +++ b/lib/NGCP/Panel/Role/API/Invoices.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::Invoices; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/MaliciousCalls.pm b/lib/NGCP/Panel/Role/API/MaliciousCalls.pm index b70644c22e..bfad43b756 100644 --- a/lib/NGCP/Panel/Role/API/MaliciousCalls.pm +++ b/lib/NGCP/Panel/Role/API/MaliciousCalls.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::MaliciousCalls; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/NcosLevels.pm b/lib/NGCP/Panel/Role/API/NcosLevels.pm index b217e93ef6..6f8d969f1a 100644 --- a/lib/NGCP/Panel/Role/API/NcosLevels.pm +++ b/lib/NGCP/Panel/Role/API/NcosLevels.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::NcosLevels; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/NcosPatterns.pm b/lib/NGCP/Panel/Role/API/NcosPatterns.pm index 7febf9886d..42f79c189e 100644 --- a/lib/NGCP/Panel/Role/API/NcosPatterns.pm +++ b/lib/NGCP/Panel/Role/API/NcosPatterns.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::NcosPatterns; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/PbxDeviceConfigs.pm b/lib/NGCP/Panel/Role/API/PbxDeviceConfigs.pm index dc476a6484..b2b6cba680 100644 --- a/lib/NGCP/Panel/Role/API/PbxDeviceConfigs.pm +++ b/lib/NGCP/Panel/Role/API/PbxDeviceConfigs.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::PbxDeviceConfigs; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/PbxDeviceFirmwares.pm b/lib/NGCP/Panel/Role/API/PbxDeviceFirmwares.pm index cf3acbcd65..9f3f3fb1dc 100644 --- a/lib/NGCP/Panel/Role/API/PbxDeviceFirmwares.pm +++ b/lib/NGCP/Panel/Role/API/PbxDeviceFirmwares.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::PbxDeviceFirmwares; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/PbxDeviceModelImages.pm b/lib/NGCP/Panel/Role/API/PbxDeviceModelImages.pm index c5ad0ed969..849c622444 100644 --- a/lib/NGCP/Panel/Role/API/PbxDeviceModelImages.pm +++ b/lib/NGCP/Panel/Role/API/PbxDeviceModelImages.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::PbxDeviceModelImages; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; diff --git a/lib/NGCP/Panel/Role/API/PbxDeviceModels.pm b/lib/NGCP/Panel/Role/API/PbxDeviceModels.pm index 26714386fa..3c04f3e820 100644 --- a/lib/NGCP/Panel/Role/API/PbxDeviceModels.pm +++ b/lib/NGCP/Panel/Role/API/PbxDeviceModels.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::PbxDeviceModels; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/PbxDeviceProfiles.pm b/lib/NGCP/Panel/Role/API/PbxDeviceProfiles.pm index 91359bbdda..d4e08ba04e 100644 --- a/lib/NGCP/Panel/Role/API/PbxDeviceProfiles.pm +++ b/lib/NGCP/Panel/Role/API/PbxDeviceProfiles.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::PbxDeviceProfiles; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/PbxDevices.pm b/lib/NGCP/Panel/Role/API/PbxDevices.pm index fd66896210..8ca6f2939d 100644 --- a/lib/NGCP/Panel/Role/API/PbxDevices.pm +++ b/lib/NGCP/Panel/Role/API/PbxDevices.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::PbxDevices; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/Preferences.pm b/lib/NGCP/Panel/Role/API/Preferences.pm index 5aaabffb18..f7d6472f45 100644 --- a/lib/NGCP/Panel/Role/API/Preferences.pm +++ b/lib/NGCP/Panel/Role/API/Preferences.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::Preferences; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { @@ -177,7 +178,7 @@ sub get_resource { SWITCH: for ($pref->attribute->data_type) { /^int$/ && do { - $value = int($pref->value) if($pref->value->is_int); + $value = int($pref->value) if(is_int($pref->value)); last SWITCH; }; /^boolean$/ && do { @@ -664,7 +665,7 @@ sub check_pref_value { SWITCH: for ($meta->data_type) { /^int$/ && do { - $err = 1 unless $value->is_int; + $err = 1 unless is_int($value); last SWITCH; }; /^boolean$/ && do { @@ -700,13 +701,13 @@ sub validate_ipnet { my ($ip, $net) = split /\//, $ipnet; if(is_ipv4($ip)) { return 1 unless(defined $net); - unless($net->is_int && $net >= 0 && $net <= 32) { + unless(is_int($net) && $net >= 0 && $net <= 32) { $self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid IPv4 network portion in $pref entry '$ipnet', must be 0 <= net <= 32"); return; } } elsif(is_ipv6($ip)) { return 1 unless(defined $net); - unless($net->is_int && $net >= 0 && $net <= 128) { + unless(is_int($net) && $net >= 0 && $net <= 128) { $self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid IPv6 network portion in $pref entry '$ipnet', must be 0 <= net <= 128"); return; } diff --git a/lib/NGCP/Panel/Role/API/ProfilePackages.pm b/lib/NGCP/Panel/Role/API/ProfilePackages.pm index dc151e3256..b4efcf8460 100644 --- a/lib/NGCP/Panel/Role/API/ProfilePackages.pm +++ b/lib/NGCP/Panel/Role/API/ProfilePackages.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::ProfilePackages; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/Reminders.pm b/lib/NGCP/Panel/Role/API/Reminders.pm index ba803142fc..305d7fece8 100644 --- a/lib/NGCP/Panel/Role/API/Reminders.pm +++ b/lib/NGCP/Panel/Role/API/Reminders.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::Reminders; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/Resellers.pm b/lib/NGCP/Panel/Role/API/Resellers.pm index a0b2f8f8e1..16a1447e0d 100644 --- a/lib/NGCP/Panel/Role/API/Resellers.pm +++ b/lib/NGCP/Panel/Role/API/Resellers.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::Resellers; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/RewriteRuleSets.pm b/lib/NGCP/Panel/Role/API/RewriteRuleSets.pm index d0a6efda7b..73af55a17b 100644 --- a/lib/NGCP/Panel/Role/API/RewriteRuleSets.pm +++ b/lib/NGCP/Panel/Role/API/RewriteRuleSets.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::RewriteRuleSets; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/RewriteRules.pm b/lib/NGCP/Panel/Role/API/RewriteRules.pm index 0bcbc6e0aa..d3e319b95e 100644 --- a/lib/NGCP/Panel/Role/API/RewriteRules.pm +++ b/lib/NGCP/Panel/Role/API/RewriteRules.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::RewriteRules; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/SoundFiles.pm b/lib/NGCP/Panel/Role/API/SoundFiles.pm index 81514d1de1..cc1ba1e2d4 100644 --- a/lib/NGCP/Panel/Role/API/SoundFiles.pm +++ b/lib/NGCP/Panel/Role/API/SoundFiles.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::SoundFiles; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { @@ -125,7 +126,7 @@ sub update_item { exceptions => [ "set_id" ], ); - $resource->{loopplay} = ($resource->{loopplay} eq "true" || $resource->{loopplay}->is_int && $resource->{loopplay}) ? 1 : 0; + $resource->{loopplay} = ($resource->{loopplay} eq "true" || is_int($resource->{loopplay}) && $resource->{loopplay}) ? 1 : 0; my $set_rs = $c->model('DB')->resultset('voip_sound_sets')->search({ diff --git a/lib/NGCP/Panel/Role/API/SoundHandles.pm b/lib/NGCP/Panel/Role/API/SoundHandles.pm index 45ae18201e..e8e311c1b4 100644 --- a/lib/NGCP/Panel/Role/API/SoundHandles.pm +++ b/lib/NGCP/Panel/Role/API/SoundHandles.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::SoundHandles; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/SoundSets.pm b/lib/NGCP/Panel/Role/API/SoundSets.pm index 94bf86313e..a9af44c29c 100644 --- a/lib/NGCP/Panel/Role/API/SoundSets.pm +++ b/lib/NGCP/Panel/Role/API/SoundSets.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::SoundSets; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/SpeedDials.pm b/lib/NGCP/Panel/Role/API/SpeedDials.pm index 1666401609..25586d202b 100644 --- a/lib/NGCP/Panel/Role/API/SpeedDials.pm +++ b/lib/NGCP/Panel/Role/API/SpeedDials.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::SpeedDials; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/SubscriberProfileSets.pm b/lib/NGCP/Panel/Role/API/SubscriberProfileSets.pm index 5a43adf55c..023679f350 100644 --- a/lib/NGCP/Panel/Role/API/SubscriberProfileSets.pm +++ b/lib/NGCP/Panel/Role/API/SubscriberProfileSets.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::SubscriberProfileSets; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/SubscriberProfiles.pm b/lib/NGCP/Panel/Role/API/SubscriberProfiles.pm index 56716d9867..e46946848a 100644 --- a/lib/NGCP/Panel/Role/API/SubscriberProfiles.pm +++ b/lib/NGCP/Panel/Role/API/SubscriberProfiles.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::SubscriberProfiles; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/SubscriberRegistrations.pm b/lib/NGCP/Panel/Role/API/SubscriberRegistrations.pm index fa8d0165dd..2d27666675 100644 --- a/lib/NGCP/Panel/Role/API/SubscriberRegistrations.pm +++ b/lib/NGCP/Panel/Role/API/SubscriberRegistrations.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::SubscriberRegistrations; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/Subscribers.pm b/lib/NGCP/Panel/Role/API/Subscribers.pm index 8bd4467909..807235c195 100644 --- a/lib/NGCP/Panel/Role/API/Subscribers.pm +++ b/lib/NGCP/Panel/Role/API/Subscribers.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::Subscribers; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { @@ -33,7 +34,7 @@ sub resource_from_item { my $customer = $self->get_customer($c, $item->contract_id); delete $prov_resource->{domain_id}; delete $prov_resource->{account_id}; - my %resource = %{ $bill_resource->merge($prov_resource) }; + my %resource = %{ merge($bill_resource, $prov_resource) }; $resource{administrative} = delete $resource{admin}; unless($customer->get_column('product_class') eq 'pbxaccount') { diff --git a/lib/NGCP/Panel/Role/API/SystemContacts.pm b/lib/NGCP/Panel/Role/API/SystemContacts.pm index af86ae2c9a..d0b6d1f614 100644 --- a/lib/NGCP/Panel/Role/API/SystemContacts.pm +++ b/lib/NGCP/Panel/Role/API/SystemContacts.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::SystemContacts; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/TopupLogs.pm b/lib/NGCP/Panel/Role/API/TopupLogs.pm index 16787febd2..9326807b0c 100644 --- a/lib/NGCP/Panel/Role/API/TopupLogs.pm +++ b/lib/NGCP/Panel/Role/API/TopupLogs.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::TopupLogs; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/TrustedSources.pm b/lib/NGCP/Panel/Role/API/TrustedSources.pm index 2ba22a942a..c60264ff09 100644 --- a/lib/NGCP/Panel/Role/API/TrustedSources.pm +++ b/lib/NGCP/Panel/Role/API/TrustedSources.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::TrustedSources; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/VoicemailRecordings.pm b/lib/NGCP/Panel/Role/API/VoicemailRecordings.pm index 5e2665fc0b..b03297ef4e 100644 --- a/lib/NGCP/Panel/Role/API/VoicemailRecordings.pm +++ b/lib/NGCP/Panel/Role/API/VoicemailRecordings.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::VoicemailRecordings; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/VoicemailSettings.pm b/lib/NGCP/Panel/Role/API/VoicemailSettings.pm index f14765d006..8994a2fc7b 100644 --- a/lib/NGCP/Panel/Role/API/VoicemailSettings.pm +++ b/lib/NGCP/Panel/Role/API/VoicemailSettings.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::VoicemailSettings; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Role/API/Voicemails.pm b/lib/NGCP/Panel/Role/API/Voicemails.pm index bb83457243..25b0a3de9a 100644 --- a/lib/NGCP/Panel/Role/API/Voicemails.pm +++ b/lib/NGCP/Panel/Role/API/Voicemails.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::Voicemails; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { @@ -71,7 +72,7 @@ sub resource_from_item { my %resource = (); $resource{id} = int($item->id); - $resource{duration} = $item->duration->is_int ? int($item->duration) : 0; + $resource{duration} = is_int($item->duration) ? int($item->duration) : 0; $resource{time} = "" . $item->origtime; $resource{caller} = $item->callerid; $resource{subscriber_id} = int($item->mailboxuser->provisioning_voip_subscriber->voip_subscriber->id); diff --git a/lib/NGCP/Panel/Role/API/Vouchers.pm b/lib/NGCP/Panel/Role/API/Vouchers.pm index 8919e81ee1..452ad49929 100644 --- a/lib/NGCP/Panel/Role/API/Vouchers.pm +++ b/lib/NGCP/Panel/Role/API/Vouchers.pm @@ -1,4 +1,5 @@ package NGCP::Panel::Role::API::Vouchers; +use NGCP::Panel::Utils::Generic qw(:all); use Moose::Role; use Sipwise::Base; with 'NGCP::Panel::Role::API' => { diff --git a/lib/NGCP/Panel/Utils/Datatables.pm b/lib/NGCP/Panel/Utils/Datatables.pm index b074e362d3..9225b8fc8d 100644 --- a/lib/NGCP/Panel/Utils/Datatables.pm +++ b/lib/NGCP/Panel/Utils/Datatables.pm @@ -3,6 +3,7 @@ use strict; use warnings; use Sipwise::Base; +use NGCP::Panel::Utils::Generic qw(:all); use List::Util qw/first/; use Scalar::Util qw/blessed/; use DateTime::Format::Strptime; @@ -154,7 +155,7 @@ sub process { if(defined(my $row = $rs->find($topId))) { push @{ $aaData }, _prune_row($cols, $row->get_inflated_columns); if (defined $row_func) { - $aaData->[-1]->put($row_func->($row)); + $aaData->[-1] = merge($aaData->[-1], {$row_func->($row)}); } $rs = $rs->search({ 'me.id' => { '!=', $topId} }); } @@ -209,7 +210,7 @@ sub process { push @{ $aaData }, _prune_row($cols, $row->get_inflated_columns); if (defined $row_func) { my $r = $row_func->($row); - $aaData->[-1]->put($row_func->($row)); + $aaData->[-1] = merge($aaData->[-1], {$row_func->($row)}); } } diff --git a/lib/NGCP/Panel/Utils/Generic.pm b/lib/NGCP/Panel/Utils/Generic.pm new file mode 100644 index 0000000000..750dcba738 --- /dev/null +++ b/lib/NGCP/Panel/Utils/Generic.pm @@ -0,0 +1,41 @@ +package NGCP::Panel::Utils::Generic; +use strict; +use Exporter; +use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); + +$VERSION = 1.00; +@ISA = qw(Exporter); +@EXPORT = (); +@EXPORT_OK = qw(is_int is_integer is_decimal merge); +%EXPORT_TAGS = ( DEFAULT => [qw(&is_int &is_integer &is_decimal &merge)], + all => [qw(&is_int &is_integer &is_decimal &merge)]); + +use Hash::Merge; + +sub is_int { + my $val = shift; + if($val =~ /^[+-]?[0-9]+$/) { + return 1; + } + return; +} + +sub is_integer { + return is_int(@_); +} + +sub is_decimal { + my $val = shift; + # TODO: also check if only 0 or 1 decimal point + if($val =~ /^[+-]?\.?[0-9\.]+$/) { + return 1; + } + return; +} + +sub merge { + my ($a, $b) = @_; + return Hash::Merge::merge($a, $b); +} + +1; diff --git a/lib/NGCP/Panel/Utils/Message.pm b/lib/NGCP/Panel/Utils/Message.pm index 914bdaaf26..6437df9ab3 100644 --- a/lib/NGCP/Panel/Utils/Message.pm +++ b/lib/NGCP/Panel/Utils/Message.pm @@ -7,8 +7,11 @@ use DateTime qw(); use DateTime::Format::RFC3339 qw(); use Time::HiRes qw(); -method get_log_params ($self: Catalyst :$c, :$type?, :$data?) { - # get log_tx_id, caller method, remote user, formatted passed parameters +sub get_log_params { + my %params = @_; + my $c = $params{c}; + my $type = $params{type}; + my $data = $params{data}; # tx_id my $log_tx = DateTime->from_epoch(epoch => Time::HiRes::time); @@ -95,16 +98,21 @@ method get_log_params ($self: Catalyst :$c, :$type?, :$data?) { }; } -method error ($self: Catalyst :$c, Str :$desc, :$log?, :$error?, :$type = 'panel', :$data?, :$cname?) { -# we explicitly declare the invocant to skip the validation for Object -# because we want a class method instead of an object method - - # undef checks +sub error { + my %params = @_; + my $c = $params{c}; + my $type = $params{type}; + my $data = $params{data}; + my $desc = $params{desc}; + my $cname = $params{cname}; + my $log = $params{log}; + my $error = $params{error}; + $type //= 'panel'; $desc //= ''; - my $log_params = $self->get_log_params(c => $c, - type => $type, - data => $data, ); + my $log_params = get_log_params(c => $c, + type => $type, + data => $data, ); defined $cname and $log_params->{called} =~ s/__ANON__/$cname/; @@ -174,16 +182,20 @@ method error ($self: Catalyst :$c, Str :$desc, :$log?, :$error?, :$type = 'panel return $rc; } -method info ($self: Catalyst :$c, Str :$desc, :$log?, :$type = 'panel', :$data?, :$cname?) { -# we explicitly declare the invocant to skip the validation for Object -# because we want a class method instead of an object method - - # undef checks +sub info { + my %params = @_; + my $c = $params{c}; + my $type = $params{type}; + my $data = $params{data}; + my $desc = $params{desc}; + my $cname = $params{cname}; + my $log = $params{log}; + $type //= 'panel'; $desc //= ''; - my $log_params = $self->get_log_params(c => $c, - type => $type, - data => $data, ); + my $log_params = get_log_params(c => $c, + type => $type, + data => $data, ); defined $cname and $log_params->{called} =~ s/__ANON__/$cname/; @@ -215,6 +227,8 @@ method info ($self: Catalyst :$c, Str :$desc, :$log?, :$type = 'panel', :$data?, return $rc; } +1; + __END__ =encoding UTF-8 @@ -230,14 +244,14 @@ Parse messages for log and Web display. Usage in the code: Error: - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, desc => $c->loc('Failed to create domain.'), ); Info: - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, desc => $c->loc('Domain successfully created'), ); diff --git a/lib/NGCP/Panel/Utils/Preferences.pm b/lib/NGCP/Panel/Utils/Preferences.pm index 7a8fa64d1f..6e7e494f2e 100644 --- a/lib/NGCP/Panel/Utils/Preferences.pm +++ b/lib/NGCP/Panel/Utils/Preferences.pm @@ -11,13 +11,13 @@ sub validate_ipnet { my ($ip, $net) = split /\//, $field->value; if(is_ipv4($ip)) { return 1 unless(defined $net); - unless($net->is_int && $net >= 0 && $net <= 32) { + unless(is_int($net) && $net >= 0 && $net <= 32) { $field->add_error("Invalid IPv4 network portion, must be 0 <= net <= 32"); return; } } elsif(is_ipv6($ip)) { return 1 unless(defined $net); - unless($net->is_int && $net >= 0 && $net <= 128) { + unless(is_int($net) && $net >= 0 && $net <= 128) { $field->add_error("Invalid IPv6 network portion, must be 0 <= net <= 128"); return; } @@ -394,14 +394,14 @@ sub create_preference_form { $c->model('DB')->resultset('voip_aig_sequence')->search_rs({ id => { '<' => $new_group->id }, })->delete_all; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, type => 'internal', data => \%log_data, desc => $c->loc('ip group sequence successfully generated'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => \%log_data, @@ -416,14 +416,14 @@ sub create_preference_form { group_id => $aip_group_id, ipnet => $form->field($attribute)->value, }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, type => 'internal', data => \%log_data, desc => $c->loc('allowed_ip_grp successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => \%log_data, @@ -454,14 +454,14 @@ sub create_preference_form { $c->model('DB')->resultset('voip_aig_sequence')->search_rs({ id => { '<' => $new_group->id }, })->delete_all; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, type => 'internal', data => \%log_data, desc => $c->loc('Manual ip group sequence successfully generated'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => \%log_data, @@ -476,14 +476,14 @@ sub create_preference_form { group_id => $man_aip_group_id, ipnet => $form->field($attribute)->value, }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, type => 'internal', data => \%log_data, desc => $c->loc('man_allowed_ip_grp successfully created'), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => \%log_data, @@ -522,13 +522,13 @@ sub create_preference_form { attribute_id => $c->stash->{preference_meta}->id, value => $form->values->{$c->stash->{preference_meta}->attribute}, }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => \%log_data, desc => $c->loc('Preference [_1] successfully created', $attribute), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => \%log_data, @@ -546,7 +546,7 @@ sub create_preference_form { rwrs_result => $selected_rwrs, pref_rs => $pref_rs, ); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => \%log_data, desc => $c->loc('Preference [_1] successfully updated', $attribute), @@ -569,13 +569,13 @@ sub create_preference_form { } else { $preference->create({ value => $selected_level->id }); } - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => \%log_data, desc => $c->loc('Preference [_1] successfully updated', $attribute), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => \%log_data, @@ -601,13 +601,13 @@ sub create_preference_form { } else { $preference->create({ value => $selected_set->id }); } - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => \%log_data, desc => $c->loc('Preference [_1] successfully updated', $attribute), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => \%log_data, @@ -633,13 +633,13 @@ sub create_preference_form { } else { $preference->create({ value => $selected_set->id }); } - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => \%log_data, desc => $c->loc('Preference [_1] successfully updated', $attribute), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => \%log_data, @@ -659,13 +659,13 @@ sub create_preference_form { try { my $preference = $pref_rs->find($preference_id); $preference->delete if $preference; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => \%log_data, desc => $c->loc('Preference [_1] successfully deleted', $attribute), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => \%log_data, @@ -679,13 +679,13 @@ sub create_preference_form { try { my $preference = $pref_rs->find($preference_id); $preference->delete if $preference; - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => \%log_data, desc => $c->loc('Preference [_1] successfully deleted', $attribute), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => \%log_data, @@ -701,13 +701,13 @@ sub create_preference_form { attribute_id => $c->stash->{preference_meta}->id, value => $form->field($attribute)->value, }); - NGCP::Panel::Utils::Message->info( + NGCP::Panel::Utils::Message::info( c => $c, data => \%log_data, desc => $c->loc('Preference [_1] successfully updated', $attribute), ); } catch($e) { - NGCP::Panel::Utils::Message->error( + NGCP::Panel::Utils::Message::error( c => $c, error => $e, data => \%log_data, diff --git a/lib/NGCP/Panel/Utils/ValidateJSON.pm b/lib/NGCP/Panel/Utils/ValidateJSON.pm index 3883d0856c..27c5879499 100644 --- a/lib/NGCP/Panel/Utils/ValidateJSON.pm +++ b/lib/NGCP/Panel/Utils/ValidateJSON.pm @@ -1,6 +1,6 @@ package NGCP::Panel::Utils::ValidateJSON; use Sipwise::Base; -extends 'JSON::Tiny::Subclassable'; +use base 'JSON::Tiny::Subclassable'; my $WHITESPACE_RE = qr/[\x20\x09\x0a\x0d]*/; @@ -26,3 +26,5 @@ sub _decode_object { } return $hash; } + +1; diff --git a/lib/NGCP/Panel/Utils/XMLDispatcher.pm b/lib/NGCP/Panel/Utils/XMLDispatcher.pm index dcdc279ab5..b9e972b846 100644 --- a/lib/NGCP/Panel/Utils/XMLDispatcher.pm +++ b/lib/NGCP/Panel/Utils/XMLDispatcher.pm @@ -5,6 +5,8 @@ use NGCP::Schema; use Net::HTTP; use Errno; +use Moose; + has 'schema' => ( is => 'rw', isa => 'DBIx::Class::Schema', @@ -148,6 +150,8 @@ sub _unqueue { $self->schema->resultset('xmlqueue')->find($id)->delete; } +no Moose; + 1; =head1 NAME diff --git a/lib/NGCP/Panel/View/HTML.pm b/lib/NGCP/Panel/View/HTML.pm index 7e590483c3..857f59a02e 100644 --- a/lib/NGCP/Panel/View/HTML.pm +++ b/lib/NGCP/Panel/View/HTML.pm @@ -3,7 +3,7 @@ use Sipwise::Base; use URI::Escape qw/uri_unescape/; -extends 'Catalyst::View::TT'; +use base 'Catalyst::View::TT'; use NGCP::Panel::Utils::I18N; diff --git a/lib/NGCP/Panel/Widget.pm b/lib/NGCP/Panel/Widget.pm index 65dfe2f9e7..2a98be47c3 100644 --- a/lib/NGCP/Panel/Widget.pm +++ b/lib/NGCP/Panel/Widget.pm @@ -1,5 +1,6 @@ package NGCP::Panel::Widget; use Sipwise::Base; +use Moose; with 'MooseX::Object::Pluggable'; sub handle { diff --git a/script/ngcp_panel_profiler.sh b/script/ngcp_panel_profiler.sh new file mode 100755 index 0000000000..5d98bc9000 --- /dev/null +++ b/script/ngcp_panel_profiler.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +export NYTPROF=sigexit=1:file=/tmp/nytprof.out +CATALYST_DEBUG=1 DBIC_TRACE=1 DBIC_TRACE_PROFILE=console DEVEL_CONFESS_OPTIONS='objects builtin dump color source' perl -I ../data-hal/lib -I ../ngcp-schema/lib -I lib -I ../sipwise-base/lib/ -d:NYTProf script/ngcp_panel_server.pl --port 1444