From 8abbddb7272e3f0fe355d93b232825bc94f9e843 Mon Sep 17 00:00:00 2001
From: Daniel Tiefnig <dtiefnig@sipwise.com>
Date: Fri, 3 Feb 2012 13:39:47 +0000
Subject: [PATCH] fix subscriber matching in call lists

---
 lib/admin/Controller/subscriber.pm |  2 +-
 lib/admin/Utils.pm                 | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/admin/Controller/subscriber.pm b/lib/admin/Controller/subscriber.pm
index 860c21d..28f5023 100644
--- a/lib/admin/Controller/subscriber.pm
+++ b/lib/admin/Controller/subscriber.pm
@@ -1265,7 +1265,7 @@ sub call_data : Local {
                                                             );
     }
 
-    $c->stash->{call_list} = admin::Utils::prepare_call_list($c, $calls, $listfilter, $bilprof);
+    $c->stash->{call_list} = admin::Utils::prepare_call_list($c, $$subscriber{username}, $$subscriber{domain}, $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 dde6869..ed25881 100644
--- a/lib/admin/Utils.pm
+++ b/lib/admin/Utils.pm
@@ -129,7 +129,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, $call_list, $filter, $bilprof) = @_;
+    my ($c, $username, $domain, $call_list, $filter, $bilprof) = @_;
     my $callentries = [];
 
     my @time = localtime time;
@@ -174,8 +174,8 @@ sub prepare_call_list {
         }
 
         if(defined $$call{source_user}
-           and $$call{source_user} eq $c->session->{subscriber}{username}
-           and $$call{source_domain} eq $c->session->{subscriber}{domain})
+           and $$call{source_user} eq $username
+           and $$call{source_domain} eq $domain)
         {
             if($$call{call_status} eq 'ok') {
                 $callentry{direction_icon} = 'anruf_aus_small.gif';
@@ -193,8 +193,8 @@ sub prepare_call_list {
             $callentry{partner_number} = $callentry{partner};
 
         } elsif(defined $$call{destination_user}
-                and $$call{destination_user} eq $c->session->{subscriber}{username}
-                and $$call{destination_domain} eq $c->session->{subscriber}{domain})
+                and $$call{destination_user} eq $username
+                and $$call{destination_domain} eq $domain)
         {
             if($$call{call_status} eq 'ok') {
                 $callentry{direction_icon} = 'anruf_ein_small.gif';