[freeside-commits] branch master updated. d06f67ed49d71e8d2c957d877fe738a8cac0cfe2

[Ivan]

The branch, master has been updated
       via  d06f67ed49d71e8d2c957d877fe738a8cac0cfe2 (commit)
       via  8a6bdb6425eac988c19822f301a5849468f85f2e (commit)
      from  6a42226f7f1779974316111cb178a3c6a6d74931 (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 d06f67ed49d71e8d2c957d877fe738a8cac0cfe2
Merge: 8a6bdb6 6a42226
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Mar 26 19:00:33 2013 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 8a6bdb6425eac988c19822f301a5849468f85f2e
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Mar 26 19:00:27 2013 -0700

    fix RADIUS report fallout from adding closed session option, RT#22169, RT#21483

diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
index db66c39..833dd9a 100644
--- a/FS/FS/part_export/sqlradius.pm
+++ b/FS/FS/part_export/sqlradius.pm
@@ -741,8 +741,11 @@ sub usage_sessions {
     }
   }
   if ( $opt->{session_status} ne 'closed' ) {
-    $acctstoptime = "( $acctstoptime ) OR " if $acctstoptime;
-    $acctstoptime .= 'AcctStopTime IS NULL';
+    if ( $acctstoptime ) {
+      $acctstoptime = "( ( $acctstoptime ) OR AcctStopTime IS NULL )";
+    } else {
+      $acctstoptime = 'AcctStopTime IS NULL';
+    }
   }
   push @where, $acctstoptime;
 

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

Summary of changes:
 FS/FS/part_export/sqlradius.pm |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)