projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UI to disable message templates, #26035
[freeside.git]
/
FS
/
FS
/
part_export
/
sqlradius.pm
diff --git
a/FS/FS/part_export/sqlradius.pm
b/FS/FS/part_export/sqlradius.pm
index
18ee304
..
c8a963d
100644
(file)
--- a/
FS/FS/part_export/sqlradius.pm
+++ b/
FS/FS/part_export/sqlradius.pm
@@
-9,6
+9,7
@@
use FS::part_export;
use FS::svc_acct;
use FS::export_svc;
use Carp qw( cluck );
use FS::svc_acct;
use FS::export_svc;
use Carp qw( cluck );
+use NEXT;
@ISA = qw(FS::part_export);
@EXPORT_OK = qw( sqlradius_connect );
@ISA = qw(FS::part_export);
@EXPORT_OK = qw( sqlradius_connect );
@@
-133,12
+134,14
@@
sub export_username { # override for other svcdb
sub radius_reply { #override for other svcdb
my($self, $svc_acct) = (shift, shift);
sub radius_reply { #override for other svcdb
my($self, $svc_acct) = (shift, shift);
- $svc_acct->radius_reply;
+ my %every = $svc_acct->EVERY::radius_reply;
+ map { @$_ } values %every;
}
sub radius_check { #override for other svcdb
my($self, $svc_acct) = (shift, shift);
}
sub radius_check { #override for other svcdb
my($self, $svc_acct) = (shift, shift);
- $svc_acct->radius_check;
+ my %every = $svc_acct->EVERY::radius_check;
+ map { @$_ } values %every;
}
sub _export_insert {
}
sub _export_insert {
@@
-194,8
+197,8
@@
sub _export_replace {
foreach my $table (qw(reply check)) {
my $method = "radius_$table";
foreach my $table (qw(reply check)) {
my $method = "radius_$table";
- my %new = $
new->$method(
);
- my %old = $
old->$method(
);
+ my %new = $
self->$method($new
);
+ my %old = $
self->$method($old
);
if ( grep { !exists $old{$_} #new attributes
|| $new{$_} ne $old{$_} #changed
} keys %new
if ( grep { !exists $old{$_} #new attributes
|| $new{$_} ne $old{$_} #changed
} keys %new
@@
-597,7
+600,8
@@
New-style: pass a hashref with the following keys:
=item stoptime_end - Upper bound for AcctStopTime, as a UNIX timestamp
=item stoptime_end - Upper bound for AcctStopTime, as a UNIX timestamp
-=item open_sessions - Only show records with no AcctStopTime (typically used without stoptime_* options and with starttime_* options instead)
+=item session_status - 'closed' to only show records with AcctStopTime,
+'open' to only show records I<without> AcctStopTime, empty to show both.
=item starttime_start - Lower bound for AcctStartTime, as a UNIX timestamp
=item starttime_start - Lower bound for AcctStartTime, as a UNIX timestamp
@@
-727,20
+731,26
@@
sub usage_sessions {
push @where, " CalledStationID LIKE 'sip:$prefix\%'";
}
push @where, " CalledStationID LIKE 'sip:$prefix\%'";
}
- if ( $opt->{open_sessions} ) {
- push @where, 'AcctStopTime IS NULL';
- } else {
-
+ my $acctstoptime = '';
+ if ( $opt->{session_status} ne 'open' ) {
if ( $start ) {
if ( $start ) {
-
push @where,
"$str2time AcctStopTime ) >= ?";
+
$acctstoptime .=
"$str2time AcctStopTime ) >= ?";
push @param, $start;
push @param, $start;
+ $acctstoptime .= ' AND ' if $end;
}
if ( $end ) {
}
if ( $end ) {
-
push @where,
"$str2time AcctStopTime ) <= ?";
+
$acctstoptime .=
"$str2time AcctStopTime ) <= ?";
push @param, $end;
}
push @param, $end;
}
-
}
}
+ if ( $opt->{session_status} ne 'closed' ) {
+ if ( $acctstoptime ) {
+ $acctstoptime = "( ( $acctstoptime ) OR AcctStopTime IS NULL )";
+ } else {
+ $acctstoptime = 'AcctStopTime IS NULL';
+ }
+ }
+ push @where, $acctstoptime;
if ( $opt->{starttime_start} ) {
push @where, "$str2time AcctStartTime ) >= ?";
if ( $opt->{starttime_start} ) {
push @where, "$str2time AcctStartTime ) >= ?";