summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevinse <levinse>2011-06-24 02:48:44 +0000
committerlevinse <levinse>2011-06-24 02:48:44 +0000
commitda199f671b3f990c1c81e2806a9a04b1877d9c90 (patch)
tree3d4962e47160f25cde9202c36555af8baf61bcb8
parent30f9308a0b5b482e1d1f11444078309834a66dd6 (diff)
re-write RADIUS groups, RT13274
-rw-r--r--FS/FS/svc_acct.pm8
1 files changed, 7 insertions, 1 deletions
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 9a2f0092b..e8c797afa 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -2563,7 +2563,13 @@ sub radius_groups {
unless ref($self->usergroup) eq 'ARRAY';
#when provisioning records, export callback runs in svc_Common.pm before
#radius_usergroup records can be inserted...
- @{$self->usergroup};
+ my $groups = join(',',@{$self->usergroup});
+ my @groups;
+ return @groups unless length($groups);
+ @groups = qsearch({ 'table' => 'radius_group',
+ 'extra_sql' => "where groupnum in ($groups)",
+ });
+ map { $_->groupname } @groups;
} else {
my $format = shift || '';
my @groups = qsearch({ 'table' => 'radius_usergroup',