multi-select for agent on RADIUS usage report, RT#73050

1 files changed, 6 insertions, 2 deletions

diff --git a/httemplate/search/sqlradius_usage.html b/httemplate/search/sqlradius_usage.html
index e5b1fa7a0..648f7849f 100644
--- a/httemplate/search/sqlradius_usage.html
+++ b/httemplate/search/sqlradius_usage.html
@@ -74,12 +74,16 @@ if ( $opt{'agentnum'} =~ /^(\d+)$/ ) {
   my @agentnums = grep /^(\d+)$/, $cgi->param('agentnum');
 
   if ( ! @agentnums ) {
-    @include_agents = qsearch('agent', {});
+    @include_agents = qsearch({ 'table'     => 'agent',
+                                'hashref'   => { 'disabled'=>'' },
+                                'extra_sql' => ' AND '. $curuser->agentnums_sql,
+                             });
   } elsif ( scalar(@agentnums) == 1 ) {
     $agentnum = $agentnums[0];
   } else {
     @include_agents = qsearch({ 'table'     => 'agent',
-                                'extra_sql' => 'WHERE agentnum IN ('.
+                                'hashref'   => { 'disabled' => '', },
+                                'extra_sql' => 'AND agentnum IN ('.
                                                  join(',',@agentnums). ') '.
                                                ' AND '. $curuser->agentnums_sql,
                              });