[freeside-commits] branch master updated. 130b7fb03bc8fcc6c6a1b29b36f65d53333ec05a

[Ivan]

The branch, master has been updated
       via  130b7fb03bc8fcc6c6a1b29b36f65d53333ec05a (commit)
      from  fb33bc6850eb5ebf1f63d79afd503202b277b9a3 (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 130b7fb03bc8fcc6c6a1b29b36f65d53333ec05a
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Feb 11 13:18:59 2013 -0800

    fix RADIUS open sessions report (modern mysql & Pg?), RT#14218

diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
index 58cc5be..18ee304 100644
--- a/FS/FS/part_export/sqlradius.pm
+++ b/FS/FS/part_export/sqlradius.pm
@@ -727,17 +727,21 @@ sub usage_sessions {
     push @where, " CalledStationID LIKE 'sip:$prefix\%'";
   }
 
-  if ( $start ) {
-    push @where, "$str2time AcctStopTime ) >= ?";
-    push @param, $start;
-  }
-  if ( $end ) {
-    push @where, "$str2time AcctStopTime ) <= ?";
-    push @param, $end;
-  }
   if ( $opt->{open_sessions} ) {
     push @where, 'AcctStopTime IS NULL';
+  } else {
+
+    if ( $start ) {
+      push @where, "$str2time AcctStopTime ) >= ?";
+      push @param, $start;
+    }
+    if ( $end ) {
+      push @where, "$str2time AcctStopTime ) <= ?";
+      push @param, $end;
+    }
+
   }
+
   if ( $opt->{starttime_start} ) {
     push @where, "$str2time AcctStartTime ) >= ?";
     push @param, $opt->{starttime_start};
@@ -756,10 +760,14 @@ sub usage_sessions {
   my $orderby = 'ORDER BY AcctStartTime DESC';
   $orderby = '' if $summarize;
 
-  my $sth = $dbh->prepare('SELECT '. join(', ', @fields).
-                          "  FROM radacct $where $groupby $orderby
-                        ") or die $dbh->errstr;                                 
-  $sth->execute(@param) or die $sth->errstr;
+  my $sql = 'SELECT '. join(', ', @fields).
+            "  FROM radacct $where $groupby $orderby";
+  if ( $DEBUG ) {
+    warn $sql;
+    warn join(',', @param);
+  }
+  my $sth = $dbh->prepare($sql) or die $dbh->errstr;
+  $sth->execute(@param)         or die $sth->errstr;
 
   [ map { { %$_ } } @{ $sth->fetchall_arrayref({}) } ];
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/part_export/sqlradius.pm |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 deletions(-)