[freeside-commits] freeside/FS/FS/part_export sqlradius.pm, 1.47, 1.48 phone_sqlradius.pm, 1.3, 1.4

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/FS/FS/part_export
In directory wavetail.420.am:/tmp/cvs-serv21974/FS/FS/part_export

Modified Files:
	sqlradius.pm phone_sqlradius.pm 
Log Message:
RADIUS group enhancements, overlimit_groups changes, etc. RT13432

Index: phone_sqlradius.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_export/phone_sqlradius.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -d -r1.3 -r1.4
--- phone_sqlradius.pm	24 Nov 2008 10:47:13 -0000	1.3
+++ phone_sqlradius.pm	1 Jul 2011 06:54:02 -0000	1.4
@@ -36,13 +36,6 @@
   #  label => 'Show the Called-Station-ID on session reports',
   #},
 
-  #N/A
-  #'overlimit_groups' => { label => 'Radius groups to assign to svc_acct which has exceeded its bandwidth or time limit', } ,
-  #'groups_susp_reason' => { label =>
-  #                           'Radius group mapping to reason (via template user) (svcnum|username|username at domain  reasonnum|reason)',
-  #                          type  => 'textarea',
-  #                        },
-
 ;
 
 %info = (

Index: sqlradius.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_export/sqlradius.pm,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -w -d -r1.47 -r1.48
--- sqlradius.pm	11 May 2011 15:23:55 -0000	1.47
+++ sqlradius.pm	1 Jul 2011 06:54:02 -0000	1.48
@@ -14,6 +14,7 @@
 
 $DEBUG = 0;
 
+my %groups;
 tie %options, 'Tie::IxHash',
   'datasrc'  => { label=>'DBI data source ' },
   'username' => { label=>'Database username' },
@@ -47,7 +48,21 @@
     type  => 'checkbox',
     label => 'Show the Called-Station-ID on session reports',
   },
-  'overlimit_groups' => { label => 'Radius groups to assign to svc_acct which has exceeded its bandwidth or time limit (if not overridden by overlimit_groups global or per-agent config)', } ,
+  'overlimit_groups' => {
+      label => 'Radius groups to assign to svc_acct which has exceeded its bandwidth or time limit (if not overridden by overlimit_groups global or per-agent config)', 
+      type  => 'select',
+      multi => 1,
+      option_label  => sub {
+        $groups{$_[0]};
+      },
+      option_values => sub {
+        %groups = (
+              map { $_->groupnum, $_->long_description } 
+                  qsearch('radius_group', {}),
+            );
+            sort keys (%groups);
+      },
+   } ,
   'groups_susp_reason' => { label =>
                              'Radius group mapping to reason (via template user) (svcnum|username|username at domain  reasonnum|reason)',
                             type  => 'textarea',