[freeside-commits] branch master updated. d4e7a23cc00ce65a85c824efbaf569199c40299b
Ivan
ivan at 420.am
Wed Dec 11 14:58:41 PST 2013
The branch, master has been updated
via d4e7a23cc00ce65a85c824efbaf569199c40299b (commit)
from 771afd921a4a9c2b0358663774d1d5ce0a499cc8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d4e7a23cc00ce65a85c824efbaf569199c40299b
Author: Ivan Kohler <ivan at freeside.biz>
Date: Wed Dec 11 14:58:40 2013 -0800
RADIUS usage for svc_broadband: show on service view, RT#26451
diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
index 6de72ca..5d84f37 100644
--- a/FS/FS/part_export/sqlradius.pm
+++ b/FS/FS/part_export/sqlradius.pm
@@ -667,7 +667,7 @@ sub usage_sessions {
$opt = shift;
$start = $opt->{stoptime_start};
$end = $opt->{stoptime_end};
- $svc_acct = $opt->{svc_acct};
+ $svc_acct = $opt->{svc} || $opt->{svc_acct};
$ip = $opt->{ip};
$prefix = $opt->{prefix};
$summarize = $opt->{summarize};
diff --git a/httemplate/search/sqlradius.cgi b/httemplate/search/sqlradius.cgi
index 2298473..c8f7932 100644
--- a/httemplate/search/sqlradius.cgi
+++ b/httemplate/search/sqlradius.cgi
@@ -9,7 +9,7 @@
% qsearch( 'part_export', { 'exporttype' => 'sqlradius' } ),
% qsearch( 'part_export', { 'exporttype' => 'sqlradius_withdomain' } )
% ) {
-% %user2svc_acct = ();
+% %user2svc = ();
%
% my $efields = tie my %efields, 'Tie::IxHash', %fields;
% delete $efields{'framedipaddress'} if $part_export->option('hide_ip');
@@ -54,7 +54,7 @@
% 'session_status' => $status,
% 'starttime_start' => $starttime_beginning,
% 'starttime_end' => $starttime_ending,
-% 'svc_acct' => $cgi_svc_acct,
+% 'svc' => $cgi_svc,
% 'ip' => $ip,
% 'prefix' => $prefix,
% 'summarize' => $summarize,
@@ -132,9 +132,10 @@ if ( $cgi->param('starttime_ending')
$starttime_ending = parse_datetime($1); # + 86399;
}
-my $cgi_svc_acct = '';
+my $cgi_svc = '';
if ( $cgi->param('svcnum') =~ /^(\d+)$/ ) {
- $cgi_svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $1 } );
+ $cgi_svc = qsearchs( 'svc_acct', { 'svcnum' => $1 } )
+ || qsearchs( 'svc_broadband', { 'svcnum' => $1 } );
} elsif ( $cgi->param('username') =~ /^([^@]+)\@([^@]+)$/ ) {
my %search = { 'username' => $1 };
my $svc_domain = qsearchs('svc_domain', { 'domain' => $2 } );
@@ -143,10 +144,10 @@ if ( $cgi->param('svcnum') =~ /^(\d+)$/ ) {
} else {
delete $search{'username'};
}
- $cgi_svc_acct = qsearchs( 'svc_acct', \%search )
+ $cgi_svc = qsearchs( 'svc_acct', \%search )
if keys %search;
} elsif ( $cgi->param('username') =~ /^(.+)$/ ) {
- $cgi_svc_acct = qsearchs( 'svc_acct', { 'username' => $1 } );
+ $cgi_svc = qsearchs( 'svc_acct', { 'username' => $1 } );
}
my $ip = '';
@@ -167,55 +168,85 @@ if ( $prefix =~ /^(\d+)$/ ) {
# field formatting subroutines
###
-my %user2svc_acct = ();
+my %user2svc = ();
my $user_format = sub {
my ( $user, $session, $part_export ) = @_;
- my $svc_acct = '';
- if ( exists $user2svc_acct{$user} ) {
- $svc_acct = $user2svc_acct{$user};
+ my $svc = '';
+ if ( exists $user2svc{$user} ) {
+ $svc = $user2svc{$user};
} else {
- my %search = ();
- if ( $part_export->exporttype eq 'sqlradius_withdomain' ) {
- my $domain;
- if ( $user =~ /^([^@]+)\@([^@]+)$/ ) {
- $search{'username'} = $1;
- $domain = $2;
- } else {
- $search{'username'} = $user;
- $domain = $session->{'realm'};
- }
- my $svc_domain = qsearchs('svc_domain', { 'domain' => $domain } );
- if ( $svc_domain ) {
- $search{'domsvc'} = $svc_domain->svcnum;
- } else {
- delete $search{'username'};
- }
- } elsif ( $part_export->exporttype eq 'sqlradius' ) {
- $search{'username'} = $user;
- } else {
- die 'unknown export type '. $part_export->exporttype.
- " for $part_export\n";
- }
- if ( keys %search ) {
- my @svc_acct =
+
+ if ( $part_export->exporttype eq 'broadband_sqlradius' ) {
+
+ ( my $mac = $user ) =~ s/[^0-9a-f]//ig;
+
+ my @svc_broadband =
grep { qsearchs( 'export_svc', {
'exportnum' => $part_export->exportnum,
'svcpart' => $_->cust_svc->svcpart,
} )
- } qsearch( 'svc_acct', \%search );
- if ( @svc_acct ) {
- warn 'multiple svc_acct records for user $user found; '.
+ } qsearch( 'svc_broadband', {
+ mac_addr => { op=>'ILIKE', value=>$mac }
+ });
+
+ if ( @svc_broadband ) {
+ warn 'multiple svc_broadband records for user $user found; '.
'using first arbitrarily'
- if scalar(@svc_acct) > 1;
- $user2svc_acct{$user} = $svc_acct = shift @svc_acct;
+ if scalar(@svc_broadband) > 1;
+ $user2svc{$user} = $svc = shift @svc_broadband;
}
- }
+
+ } else {
+
+ my %search = ();
+ if ( $part_export->exporttype eq 'sqlradius_withdomain' ) {
+ my $domain;
+ if ( $user =~ /^([^@]+)\@([^@]+)$/ ) {
+ $search{'username'} = $1;
+ $domain = $2;
+ } else {
+ $search{'username'} = $user;
+ $domain = $session->{'realm'};
+ }
+ my $svc_domain = qsearchs('svc_domain', { 'domain' => $domain } );
+ if ( $svc_domain ) {
+ $search{'domsvc'} = $svc_domain->svcnum;
+ } else {
+ delete $search{'username'};
+ }
+ } elsif ( $part_export->exporttype eq 'sqlradius' ) {
+ $search{'username'} = $user;
+ } else {
+ die 'unknown export type '. $part_export->exporttype.
+ " for $part_export\n";
+ }
+ if ( keys %search ) {
+ my @svc_acct =
+ grep { qsearchs( 'export_svc', {
+ 'exportnum' => $part_export->exportnum,
+ 'svcpart' => $_->cust_svc->svcpart,
+ } )
+ } qsearch( 'svc_acct', \%search );
+ if ( @svc_acct ) {
+ warn 'multiple svc_acct records for user $user found; '.
+ 'using first arbitrarily'
+ if scalar(@svc_acct) > 1;
+ $user2svc{$user} = $svc = shift @svc_acct;
+ }
+ }
+
+ }
+
}
- if ( $svc_acct ) {
- my $svcnum = $svc_acct->svcnum;
- qq(<A HREF="${p}view/svc_acct.cgi?$svcnum"><B>$user</B></A>);
+ if ( $svc ) {
+
+ #i should use svc_link, but that's expensive per-user
+ my $svcnum = $svc->svcnum;
+ my $table = $svc->table;
+ qq(<A HREF="${p}view/$table.cgi?$svcnum"><B>$user</B></A>);
+
} else {
"<B>$user</B>";
}
@@ -224,9 +255,9 @@ my $user_format = sub {
my $customer_format = sub {
my( $unused, $session ) = @_;
- return ' ' unless exists $user2svc_acct{$session->{'username'}};
- my $svc_acct = $user2svc_acct{$session->{'username'}};
- my $cust_pkg = $svc_acct->cust_svc->cust_pkg;
+ return ' ' unless exists $user2svc{$session->{'username'}};
+ my $svc = $user2svc{$session->{'username'}};
+ my $cust_pkg = $svc->cust_svc->cust_pkg;
return ' ' unless $cust_pkg;
my $cust_main = $cust_pkg->cust_main;
diff --git a/httemplate/view/elements/svc_Common.html b/httemplate/view/elements/svc_Common.html
index bc1cd45..d34ed50 100644
--- a/httemplate/view/elements/svc_Common.html
+++ b/httemplate/view/elements/svc_Common.html
@@ -50,6 +50,14 @@ function areyousure(href) {
% }
+% if ( $opt{radius_usage} ) {
+ <& svc_radius_usage.html,
+ 'svc' => $svc_x,
+ 'part_svc' => $part_svc,
+ 'cust_pkg' => $cust_pkg,
+ &>
+% }
+
<% mt('Service #') |h %><B><% $svcnum %></B>
% if ( $custnum ) {
% my $url = $opt{'edit_url'} || $p. 'edit/'. $opt{'table'}. '.cgi?';
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 858ccbe..7474779 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -23,8 +23,8 @@
% }
-<& svc_acct/radius_usage.html,
- 'svc_acct' => $svc_acct,
+<& elements/svc_radius_usage.html,
+ 'svc' => $svc_acct,
'part_svc' => $part_svc,
'cust_pkg' => $cust_pkg,
%gopt,
diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index 7d6520e..3325416 100644
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -1,8 +1,9 @@
<& elements/svc_Common.html,
- table => 'svc_broadband',
- labels => \%labels,
- fields => \@fields,
+ table => 'svc_broadband',
+ labels => \%labels,
+ fields => \@fields,
svc_callback => \&svc_callback,
+ radius_usage => 1,
&>
<%init>
-----------------------------------------------------------------------
Summary of changes:
FS/FS/part_export/sqlradius.pm | 2 +-
httemplate/search/sqlradius.cgi | 123 +++++++++++++++++++-----------
httemplate/view/elements/svc_Common.html | 8 ++
httemplate/view/svc_acct.cgi | 4 +-
httemplate/view/svc_broadband.cgi | 7 +-
5 files changed, 92 insertions(+), 52 deletions(-)
More information about the freeside-commits
mailing list