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.
remotes/svn/trunk
Andreas Granig 13 years ago
parent e78e2ff6d7
commit e5081856fc

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

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

Loading…
Cancel
Save