merge r13596+r13599+changelog from trunk

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 <apogrebennyk@sipwise.com>  Tue, 23 Apr 2013 13:39:41 +0200
+
 ngcp-www-admin (3.6.2) unstable; urgency=low
 
   [ agranig ]

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};
 

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}} };

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';