From cd193cad650ed708d4cfd7c770e478f7d0e03dcb Mon Sep 17 00:00:00 2001 From: Daniel Tiefnig Date: Tue, 9 Jun 2009 03:35:14 +0000 Subject: [PATCH] merged branch with changes from trunk: fixed billing fees search for zone detail added support for regex in billing fee destinations implemented checkbox to search for terminated subscribers added version string to footer, updated copyright notice added sipwise logo from new inkscape source added "local" flag for domains reworked domain form layout and added tooltips allow removal of subscriber number added Catalyst::Plugin::Unicode to handle UTF-8 data on in-/output added ENCODING to TT Views to tell TT that templates are stored in UTF-8 --- lib/admin.pm | 2 +- lib/admin/Controller/billing.pm | 31 ++++++++---- lib/admin/Controller/domain.pm | 4 ++ lib/admin/Controller/subscriber.pm | 7 +++ lib/admin/View/Sipwise.pm | 1 + root/css/admin.css | 19 +++++++- root/layout/footer | 5 +- root/static/images/sipwise_logo_96.png | Bin 2959 -> 3399 bytes root/tt/billing_fees.tt | 8 ++-- root/tt/domain.tt | 63 ++++++++++++++++++------- root/tt/subscriber.tt | 9 +++- 11 files changed, 110 insertions(+), 39 deletions(-) diff --git a/lib/admin.pm b/lib/admin.pm index 628b702..5522732 100644 --- a/lib/admin.pm +++ b/lib/admin.pm @@ -16,7 +16,7 @@ use XML::Simple; use Catalyst::Log::Log4perl; -use Catalyst qw/-Debug ConfigLoader Static::Simple +use Catalyst qw/-Debug ConfigLoader Static::Simple Unicode Authentication Authentication::Store::Minimal Authentication::Credential::Password Session Session::Store::FastMmap Session::State::Cookie /; diff --git a/lib/admin/Controller/billing.pm b/lib/admin/Controller/billing.pm index 4fd65a8..b67f302 100644 --- a/lib/admin/Controller/billing.pm +++ b/lib/admin/Controller/billing.pm @@ -490,7 +490,8 @@ sub set_fees : Local { last; } @keyval{@elements} = @values; - $keyval{destination} = $self->_normalize_destination($c, $keyval{destination}); + $keyval{destination} = $self->_normalize_destination($c, $keyval{destination}) || $keyval{destination} + if length $keyval{destination}; unless(defined $keyval{destination}) { $messages{feeerr} = 'Web.Fees.InvalidDestination'; $c->session->{feeerr}{line} = $line; @@ -534,8 +535,8 @@ sub edit_fee : Local { my $destination = $c->stash->{destination} = $c->request->params->{destination}; $c->stash->{offset} = $c->request->params->{offset} || 0; - $destination = $self->_normalize_destination($c, $destination) - if defined $destination; + $destination = $self->_normalize_destination($c, $destination) || $destination + if length $destination; if(ref $c->session->{restore_fee_input} eq 'HASH') { $c->stash->{fee} = $c->session->{restore_fee_input}; @@ -580,10 +581,12 @@ sub do_edit_fee : Local { my $bilprof = $c->request->params->{bilprof}; my $offset = $c->request->params->{offset}; $settings{destination} = $c->request->params->{destination}; - $settings{destination} = $self->_normalize_destination($c, $settings{destination}) - if defined $settings{destination}; + $settings{destination} = $self->_normalize_destination($c, $settings{destination}) || $settings{destination} + if length $settings{destination}; if(defined $c->request->params->{new_destination}) { - $settings{destination} = $self->_normalize_destination($c, $c->request->params->{new_destination}); + $settings{destination} = $self->_normalize_destination($c, $c->request->params->{new_destination}) + || $c->request->params->{new_destination} + if length $c->request->params->{new_destination}; unless(defined $settings{destination}) { $messages{destination} = 'Web.Fees.InvalidDestination'; } @@ -638,7 +641,7 @@ sub do_delete_fee : Local { my $destination = $c->request->params->{destination}; my $offset = $c->request->params->{offset}; - $destination = $self->_normalize_destination($c, $destination); + $destination = $self->_normalize_destination($c, $destination) || $destination; if($c->model('Provisioning')->call_prov( $c, 'billing', 'set_billing_profile_fees', { handle => $bilprof, @@ -860,15 +863,18 @@ sub _normalize_destination : Private { my ($self, $c, $destination) = @_; if($destination =~ /^\d+$/) { + # E.164 number $destination = '^' . $destination . '.*$'; } elsif($destination =~ /^(?:[a-z0-9]+(?:-[a-z0-9]+)*\.)+[a-z]+$/i - or $destination =~ /^[\d.]+$/) + or $destination =~ /^[012]?[0-9]?[0-9](?:\.[012]?[0-9]?[0-9]){3}$/) { + # domain or IP address $destination =~ s/\./\\./g; $destination = '^.*@'. $destination .'$'; } elsif($destination =~ /^.+\@(?:[a-z0-9]+(?:-[a-z0-9]+)*\.)+[a-z]+$/i - or $destination =~ /^.+\@[\d.]+$/) + or $destination =~ /^.+\@[012]?[0-9]?[0-9](?:\.[012]?[0-9]?[0-9]){3}$/) { + # SIP URI $destination =~ s/\./\\./g; $destination = '^'. $destination .'$'; } else { @@ -881,13 +887,18 @@ sub _normalize_destination : Private { sub _denormalize_destination : Private { my ($self, $c, $destination) = @_; + my $backup = $destination; $destination =~ s/\\\././g; $destination =~ s/\$$//; $destination =~ s/^\^//; $destination =~ s/\.\*$//; $destination =~ s/^\.\*\@//; - return $destination; + if(defined $self->_normalize_destination($c, $destination)) { + return $destination; + } else { + return $backup; + } } diff --git a/lib/admin/Controller/domain.pm b/lib/admin/Controller/domain.pm index 7890a37..ca83a04 100644 --- a/lib/admin/Controller/domain.pm +++ b/lib/admin/Controller/domain.pm @@ -63,6 +63,8 @@ sub do_edit_domain : Local { my $domain = $c->request->params->{domain}; + $settings{local} = $c->request->params->{local} ? 1 : 0; + $settings{cc} = $c->request->params->{cc}; $messages{ecc} = 'Client.Voip.MalformedCc' unless $settings{cc} =~ /^\d+$/; @@ -108,6 +110,8 @@ sub do_create_domain : Local { my $domain = $c->request->params->{domain}; + $settings{local} = $c->request->params->{local} ? 1 : 0; + $settings{cc} = $c->request->params->{cc}; $messages{acc} = 'Client.Voip.MalformedCc' unless $settings{cc} =~ /^\d+$/; diff --git a/lib/admin/Controller/subscriber.pm b/lib/admin/Controller/subscriber.pm index bd5ffff..d6de21b 100644 --- a/lib/admin/Controller/subscriber.pm +++ b/lib/admin/Controller/subscriber.pm @@ -55,6 +55,7 @@ sub search : Local { $exact{$sf} = 1 if $c->request->params->{'exact_'.$sf}; } } + $filter{terminated} = 1 if $c->request->params->{terminated}; $c->session->{search_filter} = { %filter }; $c->session->{exact_filter} = { %exact }; } @@ -74,6 +75,7 @@ sub search : Local { $filter{$sf} =~ s/\%*$/\%/; } } + $c->stash->{terminated} = $filter{terminated}; my $offset = $c->request->params->{offset} || 0; $offset = 0 if $offset !~ /^\d+$/; @@ -355,7 +357,12 @@ sub update_subscriber : Local { $messages{number_sn} = 'Client.Voip.MalformedSn' unless $sn =~ /^[1-9][0-9]+$/; } + } else { + $settings{cc} = undef; + $settings{ac} = undef; + $settings{sn} = undef; } + my $timezone = $c->request->params->{timezone}; if(length $timezone) { $settings{timezone} = $timezone; diff --git a/lib/admin/View/Sipwise.pm b/lib/admin/View/Sipwise.pm index cb3e225..dc7d001 100644 --- a/lib/admin/View/Sipwise.pm +++ b/lib/admin/View/Sipwise.pm @@ -35,6 +35,7 @@ __PACKAGE__->config( }, }, }, + ENCODING => 'utf-8', ); =head1 BUGS AND LIMITATIONS diff --git a/root/css/admin.css b/root/css/admin.css index 3699f74..8e64396 100644 --- a/root/css/admin.css +++ b/root/css/admin.css @@ -252,11 +252,21 @@ h3 { width: 95px; } -/* decrease input text fields for cc/ac */ +/* decrease input text fields */ +.imedium { + width: 140px; +} + +/* decrease input text fields for ac */ .ishort { width: 50px; } +/* decrease input text fields for cc */ +.irealshort { + width: 30px; +} + /* increase spacing between password and show/hide href */ #contentplace .apass { vertical-align: middle; @@ -312,7 +322,8 @@ h3 { #contentplace .order_payments, #contentplace .registered_contacts, #contentplace .billing_fees, -#contentplace .billing_peaktimes +#contentplace .billing_peaktimes, +#contentplace .domains { width: 100%; border-spacing: 0px; @@ -356,3 +367,7 @@ h3 { #contentplace .padding6 { padding: 6px; } + +.topbottomspace { + margin: 5px 0; +} diff --git a/root/layout/footer b/root/layout/footer index 9315ddd..83798a2 100644 --- a/root/layout/footer +++ b/root/layout/footer @@ -1,6 +1,7 @@ diff --git a/root/static/images/sipwise_logo_96.png b/root/static/images/sipwise_logo_96.png index 24174ba33e324ae35a957472cc5924f7b3d411e5..0199cfed9670a235d15bc7e077a2302e24bb1eb1 100644 GIT binary patch literal 3399 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 match
- - -
+ + +
diff --git a/root/tt/domain.tt b/root/tt/domain.tt index ed3c120..c99e993 100644 --- a/root/tt/domain.tt +++ b/root/tt/domain.tt @@ -4,13 +4,14 @@ [% IF messages.edommsg %]
[% messages.edommsg %]
[% END %] [% IF messages.edomerr %]
[% messages.edomerr %]
[% END %] - +
- - - + + + [% id = 0 %] [% FOREACH domain = domains %] @@ -19,8 +20,16 @@ [% IF domain.domain == edit_domain %] - - + + + [% ELSE %] + [% IF domain.domain == edit_domain %] [% IF messages.ecc || messages.etimezone %] -
domaincountry codetimezone - + localcctimezone +
+ + + +
@@ -30,6 +39,10 @@
cancel + + [% domain.cc %] [% domain.timezone %] @@ -52,7 +65,7 @@
+
[% messages.ecc %] [% IF messages.ecc && messages.etimezone %]
[% END %] @@ -73,26 +86,40 @@ [% IF messages.cdommsg %]
[% messages.cdommsg %]
[% END %] [% IF messages.cdomerr %]
[% messages.cdomerr %]
[% END %] - +
- - - + + + - - - + + + + + - [% IF messages.acc || messages.atimezone %]
domaincountry codetimezone - + localcctimezone +
+ + + + + + + +
- +
diff --git a/root/tt/subscriber.tt b/root/tt/subscriber.tt index 29a1455..876a9a7 100644 --- a/root/tt/subscriber.tt +++ b/root/tt/subscriber.tt @@ -19,9 +19,14 @@ - +
+
+ +
+
+ @@ -32,7 +37,7 @@
- + [% FOREACH subscriber = subscriber_list %]
SIP URIAccount ID
SIP URIAccount ID