From fcb964be3ab6f5c7b7b9419033bcf6aa9d209ae8 Mon Sep 17 00:00:00 2001 From: Daniel Tiefnig Date: Mon, 24 Oct 2011 16:53:46 +0000 Subject: [PATCH] don't store subscriber and account in session - fixes issue #853 --- lib/admin/Controller/subscriber.pm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/admin/Controller/subscriber.pm b/lib/admin/Controller/subscriber.pm index 71046a5..94535cb 100644 --- a/lib/admin/Controller/subscriber.pm +++ b/lib/admin/Controller/subscriber.pm @@ -1032,16 +1032,17 @@ sub call_data : Local { $c->stash->{template} = 'tt/subscriber_call_data.tt'; my $subscriber_id = $c->request->params->{subscriber_id}; + my $subscriber; return unless $c->model('Provisioning')->call_prov( $c, 'voip', 'get_subscriber_by_id', { subscriber_id => $subscriber_id }, - \$c->session->{subscriber} + \$subscriber ); - $c->stash->{subscriber} = $c->session->{subscriber}; + $c->stash->{subscriber} = $subscriber; $c->stash->{subscriber}{subscriber_id} = $subscriber_id; my @localized_months = ( "foo" ); - my $cts = $c->session->{subscriber}{create_timestamp}; + my $cts = $$subscriber{create_timestamp}; if($cts =~ s/^(\d{4}-\d\d)-\d\d \d\d:\d\d:\d\d/$1/) { my ($cyear, $cmonth) = split /-/, $cts; my ($nyear, $nmonth) = (localtime)[5,4]; @@ -1162,8 +1163,8 @@ sub call_data : Local { my $calls; return unless $c->model('Provisioning')->call_prov( $c, 'voip', 'get_subscriber_calls', - { username => $c->session->{subscriber}{username}, - domain => $c->session->{subscriber}{domain}, + { username => $$subscriber{username}, + domain => $$subscriber{domain}, filter => { start_date => $sdate, end_date => $edate, } @@ -1171,13 +1172,14 @@ sub call_data : Local { \$calls ); + my $account; return unless $c->model('Provisioning')->call_prov( $c, 'billing', 'get_voip_account_by_id', - { id => $c->session->{subscriber}{account_id} }, - \$c->session->{voip_account} + { id => $$subscriber{account_id} }, + \$account ); - if(eval { defined $c->session->{voip_account}{billing_profile} }) { + if(eval { defined $$account{billing_profile} }) { return 1 unless $c->model('Provisioning')->call_prov($c, 'billing', 'get_billing_profile', - { handle => $c->session->{voip_account}{billing_profile} }, + { handle => $$account{billing_profile} }, \$c->session->{voip_account}{billing_profile} ); }