diff options
author | ivan <ivan> | 2003-11-07 08:36:31 +0000 |
---|---|---|
committer | ivan <ivan> | 2003-11-07 08:36:31 +0000 |
commit | 26c21ea9dbbca328c91ab578c7c7c0c21927244e (patch) | |
tree | 081c6d075e28d8d89b78b4e67ad2ede0f8ca756f /FS/FS/cust_svc.pm | |
parent | 99d11ad690b5a0e35e9c5388fc1ae5935df3f12b (diff) |
finish fixing sqlradius_withdomain time calculations
Diffstat (limited to 'FS/FS/cust_svc.pm')
-rw-r--r-- | FS/FS/cust_svc.pm | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm index 6adb571..139dd9d 100644 --- a/FS/FS/cust_svc.pm +++ b/FS/FS/cust_svc.pm @@ -353,10 +353,13 @@ for records where B<svcdb> is not "svc_acct". sub seconds_since_sqlradacct { my($self, $start, $end) = @_; - my $username = $self->svc_x->username; + my $svc_x = $self->svc_x; - my @part_export = $self->part_svc->part_export('sqlradius') - or die "no sqlradius export configured for this service type"; + my @part_export = $self->part_svc->part_export('sqlradius'); + push @part_export, $self->part_svc->part_export('sqlradius_withdomain'); + die "no sqlradius or sqlradius_withdomain export configured for this". + "service type" + unless @part_export; #or return undef; my $seconds = 0; @@ -378,6 +381,15 @@ sub seconds_since_sqlradacct { $str2time = 'extract(epoch from '; } + my $username; + if ( $part_export->exporttype eq 'sqlradius' ) { + $username = $svc_x->username; + } elsif ( $part_export->exporttype eq 'sqlradius_withdomain' ) { + $username = $svc_x->email; + } else { + die 'unknown exporttype '. $part_export->exporttype; + } + my $query; #find closed sessions completely within the given range |