From 99076cc92a72f9c578c95d527b14b741434b4a8f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 09:24:59 +0000
Subject: adding freeside-sqlradius-seconds

---
 FS/bin/freeside-sqlradius-seconds | 57 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 FS/bin/freeside-sqlradius-seconds

(limited to 'FS/bin/freeside-sqlradius-seconds')

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
new file mode 100644
index 000000000..e65b87f89
--- /dev/null
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -0,0 +1,57 @@
+#!/usr/bin/perl -Tw
+
+use strict;
+use Date::Parse;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearchs);
+use FS::svc_acct;
+
+my $fs_user = shift or die &usage;
+adminsuidsetup( $fs_user );
+
+my $target_user = shift or die &usage;
+my $start = shift or die &usage;
+my $stop = shift || time;
+
+my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
+die "username $target_user not found\n" unless $svc_acct;
+
+print $svc_acct->seconds_since_sqlradacct( str2time($start), str2time($stop) );
+
+sub usage {
+  die "Usage:\n\n  freeside-sqlradius-seconds freeside_username target_username start_date stop_date\n";
+}
+
+
+=head1 NAME
+
+freeside-sqlradius-seconds - Real-time radacct import daemon
+
+=head1 SYNOPSIS
+
+  freeside-sqlradius-seconds freeside_username target_username start_date [ stop_date ]
+
+=head1 DESCRIPTION
+
+Returns the number of seconds the specified username has been online between
+start_date (inclusive) and stop_date (exclusive).
+See L<FS::svc_acct/seconds_since_sqlradacct>
+
+B<freeside_username> is a username added by freeside-adduser.
+B<target_username> is the username of the user account to query.
+B<start_date> and B<stop_date> are in any format Date::Parse is happy with.
+B<stop_date> defaults to now if not specified.
+
+=head1 BUGS
+
+Selection of the account in question is rather simplistic in that
+B<target_username> doesn't necessarily identify a unique account (and wouldn't
+even if a domain was specified), and no sqlradius export is checked for.
+
+=head1 SEE ALSO
+
+L<FS::svc_acct/seconds_since_sqlradacct>
+
+=cut
+
+1;
-- 
cgit v1.2.1


From 414b0f5b52ac15a4fdec9706727ff541d3bca039 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 09:30:52 +0000
Subject: carriage return helps alot

---
 FS/bin/freeside-sqlradius-seconds | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'FS/bin/freeside-sqlradius-seconds')

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index e65b87f89..f785e23c2 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -16,7 +16,8 @@ my $stop = shift || time;
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
 
-print $svc_acct->seconds_since_sqlradacct( str2time($start), str2time($stop) );
+print $svc_acct->seconds_since_sqlradacct( str2time($start), str2time($stop) ).
+      "\n";
 
 sub usage {
   die "Usage:\n\n  freeside-sqlradius-seconds freeside_username target_username start_date stop_date\n";
-- 
cgit v1.2.1


From d86fad39ef5038a76c87e15b03b579f5151eb55b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 09:35:36 +0000
Subject: doh

---
 FS/bin/freeside-sqlradius-seconds | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'FS/bin/freeside-sqlradius-seconds')

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index f785e23c2..e40dc91b6 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -16,7 +16,9 @@ my $stop = shift || time;
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
 
-print $svc_acct->seconds_since_sqlradacct( str2time($start), str2time($stop) ).
+print $svc_acct->seconds_since_sqlradacct(
+                                           str2time($start),
+                                           $stop ? str2time($stop) : time  ).
       "\n";
 
 sub usage {
-- 
cgit v1.2.1


From eb3e4b97673b20b626774b9e000c5c327c991d5b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 09:37:12 +0000
Subject: grr double doh

---
 FS/bin/freeside-sqlradius-seconds | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS/bin/freeside-sqlradius-seconds')

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index e40dc91b6..d2358cd5e 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -11,7 +11,7 @@ adminsuidsetup( $fs_user );
 
 my $target_user = shift or die &usage;
 my $start = shift or die &usage;
-my $stop = shift || time;
+my $stop = scalar(@_) ? shift : '';
 
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
-- 
cgit v1.2.1


From d37105c93eae1366ee72ef93ae3d79cc5b04ade6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 09:47:06 +0000
Subject: is this broken or is the calculation?

---
 FS/bin/freeside-sqlradius-seconds | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'FS/bin/freeside-sqlradius-seconds')

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index d2358cd5e..0539cb4d2 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -10,16 +10,13 @@ my $fs_user = shift or die &usage;
 adminsuidsetup( $fs_user );
 
 my $target_user = shift or die &usage;
-my $start = shift or die &usage;
-my $stop = scalar(@_) ? shift : '';
+my $start = scalar(@_) && str2time(shift) or die &usage;
+my $stop =  scalar(@_) ?  str2time(shift) :  time;
 
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
 
-print $svc_acct->seconds_since_sqlradacct(
-                                           str2time($start),
-                                           $stop ? str2time($stop) : time  ).
-      "\n";
+print $svc_acct->seconds_since_sqlradacct( $start, $stop ). "\n";
 
 sub usage {
   die "Usage:\n\n  freeside-sqlradius-seconds freeside_username target_username start_date stop_date\n";
-- 
cgit v1.2.1


From 9f981d37086cea91e17aa2aefeee43388c60eb19 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 09:48:46 +0000
Subject: sigh

---
 FS/bin/freeside-sqlradius-seconds | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'FS/bin/freeside-sqlradius-seconds')

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index 0539cb4d2..31450bd2c 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -10,8 +10,8 @@ my $fs_user = shift or die &usage;
 adminsuidsetup( $fs_user );
 
 my $target_user = shift or die &usage;
-my $start = scalar(@_) && str2time(shift) or die &usage;
-my $stop =  scalar(@_) ?  str2time(shift) :  time;
+my $start = scalar(@_) ? str2time(shift) : die &usage;
+my $stop =  scalar(@_) ? str2time(shift) :  time;
 
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
-- 
cgit v1.2.1


From 0d6147067e8d5317d01692f8588b3a0167c664c8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 09:52:46 +0000
Subject: sheesh

---
 FS/bin/freeside-sqlradius-seconds | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'FS/bin/freeside-sqlradius-seconds')

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index 31450bd2c..a61e97730 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -10,8 +10,9 @@ my $fs_user = shift or die &usage;
 adminsuidsetup( $fs_user );
 
 my $target_user = shift or die &usage;
-my $start = scalar(@_) ? str2time(shift) : die &usage;
-my $stop =  scalar(@_) ? str2time(shift) :  time;
+my $start = shift or die &usage;
+$start = str2time($start);
+my $stop =  scalar(@_) ? str2time(shift) : time;
 
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
-- 
cgit v1.2.1


From 869f3b5401b5111789bf03a7a4cc5699ad2993a7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 10:42:26 +0000
Subject: doh!  but finally fixed

---
 FS/bin/freeside-sqlradius-seconds | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS/bin/freeside-sqlradius-seconds')

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index a61e97730..1c978fa8a 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -12,7 +12,7 @@ adminsuidsetup( $fs_user );
 my $target_user = shift or die &usage;
 my $start = shift or die &usage;
 $start = str2time($start);
-my $stop =  scalar(@_) ? str2time(shift) : time;
+my $stop =  scalar(@ARGV) ? str2time(shift) : time;
 
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
-- 
cgit v1.2.1