From e7c6776f8fb39e3835b584245c547e599bd1af55 Mon Sep 17 00:00:00 2001 From: Andreas Granig Date: Wed, 27 Mar 2013 09:32:00 +0000 Subject: [PATCH 1/8] Bump version. --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5a9b105..0cada81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +ngcp-www-admin (3.6.0) unstable; urgency=low + + [ agranig ] + * Implement termination rating in billing fees. + * Implement source pattern field in billing fees. + * Implement account-specific fraud limits. + + -- Andreas Granig Wed, 27 Mar 2013 10:30:34 +0100 + ngcp-www-admin (3.5.2) unstable; urgency=low [ agranig ] From 29a6ccde6eb12cb1a29e674b2f5948cd71ef2516 Mon Sep 17 00:00:00 2001 From: Andreas Granig Date: Thu, 28 Mar 2013 15:04:28 +0000 Subject: [PATCH 2/8] Fix editing billing fees and bump version. --- debian/changelog | 7 +++++++ root/tt/fee_edit.tt | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0cada81..815bd0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ngcp-www-admin (3.6.1) unstable; urgency=low + + [ agranig ] + * Fix editing billing fees. + + -- Andreas Granig Thu, 28 Mar 2013 16:03:53 +0100 + ngcp-www-admin (3.6.0) unstable; urgency=low [ agranig ] diff --git a/root/tt/fee_edit.tt b/root/tt/fee_edit.tt index 82a893c..ac54578 100644 --- a/root/tt/fee_edit.tt +++ b/root/tt/fee_edit.tt @@ -11,6 +11,7 @@
+ From 06da39c64da93d94bb2d0b264bf72a2495b5d41f Mon Sep 17 00:00:00 2001 From: Andreas Granig Date: Wed, 3 Apr 2013 11:45:42 +0000 Subject: [PATCH 3/8] Fix sip_uri_pattern check. --- lib/admin/Controller/peering.pm | 6 +++--- lib/admin/Controller/subscriber.pm | 2 +- root/tt/peering_detail.tt | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/admin/Controller/peering.pm b/lib/admin/Controller/peering.pm index c1f9650..7a78c3d 100644 --- a/lib/admin/Controller/peering.pm +++ b/lib/admin/Controller/peering.pm @@ -230,15 +230,15 @@ sub save_rule : Local { $settings->{callee_pattern} =~ s/^\s+|\s+$//g; $settings->{caller_pattern} =~ s/^\s+|\s+$//g; - unless ($c->model('Provisioning')->call_prov( $c, 'voip', 'check_sip_uri_prefix', { prefix => $settings->{callee_prefix} }, \$checkresult)) { + unless ($c->model('Provisioning')->call_prov( $c, 'voip', 'check_sip_uri_prefix', { prefix => $settings->{callee_prefix} }, \$checkresult) && $checkresult) { $messages{rule_callee_prefix_err} = 'Client.Syntax.MalformedUri'; $c->flash->{rule_callee_prefix_err_detail} = $c->session->{prov_error_object} if ($c->session->{prov_error_object}); } - unless ($c->model('Provisioning')->call_prov( $c, 'voip', 'check_sip_uri_pattern', { pattern => $settings->{callee_pattern} }, \$checkresult)) { + unless ($c->model('Provisioning')->call_prov( $c, 'voip', 'check_sip_uri_pattern', { pattern => $settings->{callee_pattern} }, \$checkresult) && $checkresult) { $messages{rule_callee_pattern_err} = 'Client.Syntax.MalformedUri'; $c->flash->{rule_callee_pattern_err_detail} = $c->session->{prov_error_object} if ($c->session->{prov_error_object}); } - unless ($c->model('Provisioning')->call_prov( $c, 'voip', 'check_sip_uri_pattern', { pattern =>$settings->{caller_pattern} }, \$checkresult)) { + unless ($c->model('Provisioning')->call_prov( $c, 'voip', 'check_sip_uri_pattern', { pattern =>$settings->{caller_pattern} }, \$checkresult) && $checkresult) { $messages{rule_caller_pattern_err} = 'Client.Syntax.MalformedUri'; $c->flash->{rule_caller_pattern_err_detail} = $c->session->{prov_error_object} if ($c->session->{prov_error_object}); } diff --git a/lib/admin/Controller/subscriber.pm b/lib/admin/Controller/subscriber.pm index 9823d38..f501a6f 100644 --- a/lib/admin/Controller/subscriber.pm +++ b/lib/admin/Controller/subscriber.pm @@ -2339,7 +2339,7 @@ sub save_trusted_source : Local { $messages{protocol_err} = 'Client.Syntax.UnknownProtocol' unless $checkresult; if (length $ts{from_pattern}) { # allow empty sipuri - unless ($c->model('Provisioning')->call_prov( $c, 'voip', 'check_sip_uri_pattern', { pattern => $ts{from_pattern} }, \$checkresult)) { + unless ($c->model('Provisioning')->call_prov( $c, 'voip', 'check_sip_uri_pattern', { pattern => $ts{from_pattern} }, \$checkresult) && $checkresult) { $messages{from_pattern_err} = 'Client.Syntax.MalformedUri'; $c->flash->{from_pattern_err_detail} = $c->session->{prov_error_object} if ($c->session->{prov_error_object}); } diff --git a/root/tt/peering_detail.tt b/root/tt/peering_detail.tt index 92eecb0..4ee0eec 100644 --- a/root/tt/peering_detail.tt +++ b/root/tt/peering_detail.tt @@ -178,11 +178,11 @@ name="callee_prefix" value="[% restore_rule.callee_prefix or rule.callee_prefix %]" />
-
-
@@ -228,11 +228,11 @@ name="callee_prefix" value="[% IF not rule.id == reditid %][% restore_rule.callee_prefix %][% END %]" />
-
-
From e753d859dca952693942416588bd702b6162f051 Mon Sep 17 00:00:00 2001 From: Andreas Granig Date: Wed, 3 Apr 2013 12:16:17 +0000 Subject: [PATCH 4/8] Bump version for 2.8 backport. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 815bd0d..bc03215 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ngcp-www-admin (3.6.2) unstable; urgency=low + + [ agranig ] + * Fix handling of sip uri pattern checks and clarify format in tool-tips. + + -- Andreas Granig Wed, 03 Apr 2013 14:15:15 +0200 + ngcp-www-admin (3.6.1) unstable; urgency=low [ agranig ] From e78e2ff6d7d0b9ef21f7bc1418ddb54ff2091929 Mon Sep 17 00:00:00 2001 From: Andrew Pogrebennyk Date: Mon, 22 Apr 2013 09:49:43 +0000 Subject: [PATCH 5/8] fix warning: "my" variable %settings masks earlier declaration in same scope --- lib/admin/Controller/account.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/admin/Controller/account.pm b/lib/admin/Controller/account.pm index 84186ea..33e74ae 100644 --- a/lib/admin/Controller/account.pm +++ b/lib/admin/Controller/account.pm @@ -465,7 +465,6 @@ sub update_fraud : Local { my ( $self, $c ) = @_; my %messages; - my %settings; my $account_id = $c->request->params->{account_id}; From e5081856fca3a4b87178e4dfd9400ed7414a5550 Mon Sep 17 00:00:00 2001 From: Andreas Granig Date: Mon, 22 Apr 2013 11:45:40 +0000 Subject: [PATCH 6/8] Use uuid instead of cli for call list matching. The source_user even for local calls might not be the subscriber's username (in case of "faked" From-usernames), so use the uuid for direction matching. --- lib/admin/Controller/subscriber.pm | 2 +- lib/admin/Utils.pm | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/admin/Controller/subscriber.pm b/lib/admin/Controller/subscriber.pm index f501a6f..1f1d66f 100644 --- a/lib/admin/Controller/subscriber.pm +++ b/lib/admin/Controller/subscriber.pm @@ -1364,7 +1364,7 @@ sub call_data : Local { } $c->stash->{cdr_list} = $calls; - $c->stash->{call_list} = admin::Utils::prepare_call_list($c, $$subscriber{username}, $$subscriber{domain}, $calls, $listfilter, $bilprof); + $c->stash->{call_list} = admin::Utils::prepare_call_list($c, $subscriber, $calls, $listfilter, $bilprof); $c->stash->{subscriber}{list_filter} = $listfilter if defined $listfilter; undef $c->stash->{call_list} unless eval { @{$c->stash->{call_list}} }; diff --git a/lib/admin/Utils.pm b/lib/admin/Utils.pm index 0eedd60..e8c8699 100644 --- a/lib/admin/Utils.pm +++ b/lib/admin/Utils.pm @@ -131,7 +131,7 @@ sub get_qualified_number_for_subscriber { # as returned by the prov. interface and returns a reference to an # array suited for TT display sub prepare_call_list { - my ($c, $username, $domain, $call_list, $filter, $bilprof) = @_; + my ($c, $subscriber, $call_list, $filter, $bilprof) = @_; my $callentries = []; my @time = localtime time; @@ -175,9 +175,8 @@ sub prepare_call_list { $callentry{call_fee} = ''; } - if(defined $$call{source_user} - and $$call{source_user} eq $username - and $$call{source_domain} eq $domain) + if(defined $$call{source_user_id} + and $$call{source_user_id} eq $subscriber->{uuid}) { if($$call{call_status} eq 'ok') { $callentry{direction_icon} = 'anruf_aus_small.gif'; @@ -194,9 +193,8 @@ sub prepare_call_list { } $callentry{partner_number} = $callentry{partner}; - } elsif(defined $$call{destination_user} - and $$call{destination_user} eq $username - and $$call{destination_domain} eq $domain) + } elsif(defined $$call{destination_user_id} + and $$call{destination_user_id} eq $subscriber->{uuid}) { if($$call{call_status} eq 'ok') { $callentry{direction_icon} = 'anruf_ein_small.gif'; From 471cec08bdfe231e64a4b2cdcb57d1a676605c15 Mon Sep 17 00:00:00 2001 From: Andrew Pogrebennyk Date: Tue, 23 Apr 2013 11:40:13 +0000 Subject: [PATCH 7/8] bump debian package version --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index bc03215..a13b209 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +ngcp-www-admin (3.6.3) unstable; urgency=low + + [ agranig ] + * subscriber.pm,Utils.pm: Use uuid instead of cli for call list matching. + + [ apogrebennyk ] + * account.pm: fix warning: "my" variable %settings masks earlier declaration in same scope + + -- Andrew Pogrebennyk Tue, 23 Apr 2013 13:39:41 +0200 + ngcp-www-admin (3.6.2) unstable; urgency=low [ agranig ] From 0fc51798080cc552811130dd54e699c1d10a871d Mon Sep 17 00:00:00 2001 From: Lars Dieckow Date: Thu, 25 Apr 2013 14:40:31 +0000 Subject: [PATCH 8/8] mantis #3057: unset admin property https://bugtracker.sipwise.com/view.php?id=3057 --- lib/admin/Controller/subscriber.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/admin/Controller/subscriber.pm b/lib/admin/Controller/subscriber.pm index 1f1d66f..64c7b50 100644 --- a/lib/admin/Controller/subscriber.pm +++ b/lib/admin/Controller/subscriber.pm @@ -245,7 +245,7 @@ sub update_subscriber : Local { $settings{external_id} = $c->request->params->{external_id}; } - $settings{admin} = 1 if $c->request->params->{admin}; + $settings{admin} = $c->request->params->{admin} ? 1 : 0; my $password = $c->request->params->{password}; if(length $password) {