From 64fafac1a4e80404ea1957f77f45643704807336 Mon Sep 17 00:00:00 2001
From: Robert Anderson <randerson@lbsd.net>
Date: Tue, 10 Mar 2009 11:23:02 +0000
Subject: [PATCH] Add attributes as hash
---
smradius/modules/userdb/mod_userdb_sql.pm | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/smradius/modules/userdb/mod_userdb_sql.pm b/smradius/modules/userdb/mod_userdb_sql.pm
index fc4dfba0..fc6956c4 100644
--- a/smradius/modules/userdb/mod_userdb_sql.pm
+++ b/smradius/modules/userdb/mod_userdb_sql.pm
@@ -90,7 +90,7 @@ sub init
SELECT
Name, Operator, Value
FROM
- @TP@users_attributes
+ @TP@user_attributes
WHERE
UserID = %{user.ID}
';
@@ -174,6 +174,8 @@ sub get
$template->{'user'}->{'Username'} = $user->{'Username'};
$template->{'user'}->{'ID'} = $user->{'_UserDB_Data'}->{'id'};
+ # Attributes to return
+ my %attributes = ();
# Replace template entries
my @dbDoParams = templateReplace($config->{'userdb_get_group_attributes_query'},$template);
@@ -186,10 +188,10 @@ sub get
# Loop with group attributes
while (my $row = $sth->fetchrow_hashref()) {
- addAttribute($server,$user->{'Attributes'},$row);
+ addAttribute($server,\%attributes,hashifyLCtoMC($row,qw(Name Operator Value)));
}
- $sth->DBFreeRes();
+ DBFreeRes($sth);
@@ -204,13 +206,12 @@ sub get
# Loop with group attributes
while (my $row = $sth->fetchrow_hashref()) {
- addAttribute($server,$user->{'Attributes'},$row);
+ addAttribute($server,\%attributes,hashifyLCtoMC($row,qw(Name Operator Value)));
}
- $sth->DBFreeRes();
-
+ DBFreeRes($sth);
-# return $userDetails;
+ return \%attributes;
}
--
GitLab