From 60662634c4f7e9d11a63671e7dfc5e2cbed02941 Mon Sep 17 00:00:00 2001
From: Robert Anderson <randerson@lbsd.net>
Date: Wed, 15 Jul 2009 07:56:54 +0000
Subject: [PATCH] Fixed indentation and table prefixes
---
.../modules/accounting/mod_accounting_sql.pm | 171 ++++++++-------
.../modules/system/mod_config_sql_topups.pm | 14 +-
smradius/modules/userdb/mod_userdb_sql.pm | 38 ++--
smradiusd.conf | 203 +++++++++---------
4 files changed, 220 insertions(+), 206 deletions(-)
diff --git a/smradius/modules/accounting/mod_accounting_sql.pm b/smradius/modules/accounting/mod_accounting_sql.pm
index 09c513dd..11fa1eae 100644
--- a/smradius/modules/accounting/mod_accounting_sql.pm
+++ b/smradius/modules/accounting/mod_accounting_sql.pm
@@ -48,7 +48,7 @@ our $pluginInfo = {
# Cleanup run by smadmin
Cleanup => \&cleanup,
-
+
# Accounting database
Accounting_log => \&acct_log,
Accounting_getUsage => \&getUsage
@@ -76,92 +76,95 @@ sub init
# Default configs...
$config->{'accounting_start_query'} = '
- INSERT INTO @TP@accounting
- (
- Username,
- ServiceType,
- FramedProtocol,
- NASPort,
- NASPortType,
- CallingStationID,
- CalledStationID,
- NASPortID,
- AcctSessionID,
- FramedIPAddress,
- AcctAuthentic,
- EventTimestamp,
- AcctStatusType,
- NASIdentifier,
- NASIPAddress,
- AcctDelayTime
- )
- VALUES
- (
- %{request.User-Name},
- %{request.Service-Type},
- %{request.Framed-Protocol},
- %{request.NAS-Port},
- %{request.NAS-Port-Type},
- %{request.Calling-Station-Id},
- %{request.Called-Station-Id},
- %{request.NAS-Port-Id},
- %{request.Acct-Session-Id},
- %{request.Framed-IP-Address},
- %{request.Acct-Authentic},
- %{request.Timestamp},
- %{request.Acct-Status-Type},
- %{request.NAS-Identifier},
- %{request.NAS-IP-Address},
- %{request.Acct-Delay-Time}
- )
+ INSERT INTO
+ @TP@accounting
+ (
+ Username,
+ ServiceType,
+ FramedProtocol,
+ NASPort,
+ NASPortType,
+ CallingStationID,
+ CalledStationID,
+ NASPortID,
+ AcctSessionID,
+ FramedIPAddress,
+ AcctAuthentic,
+ EventTimestamp,
+ AcctStatusType,
+ NASIdentifier,
+ NASIPAddress,
+ AcctDelayTime
+ )
+ VALUES
+ (
+ %{request.User-Name},
+ %{request.Service-Type},
+ %{request.Framed-Protocol},
+ %{request.NAS-Port},
+ %{request.NAS-Port-Type},
+ %{request.Calling-Station-Id},
+ %{request.Called-Station-Id},
+ %{request.NAS-Port-Id},
+ %{request.Acct-Session-Id},
+ %{request.Framed-IP-Address},
+ %{request.Acct-Authentic},
+ %{request.Timestamp},
+ %{request.Acct-Status-Type},
+ %{request.NAS-Identifier},
+ %{request.NAS-IP-Address},
+ %{request.Acct-Delay-Time}
+ )
';
$config->{'accounting_update_query'} = '
- UPDATE @TP@accounting
- SET
- AcctSessionTime = %{request.Acct-Session-Time},
- AcctInputOctets = %{request.Acct-Input-Octets},
- AcctInputGigawords = %{request.Acct-Input-Gigawords},
- AcctInputPackets = %{request.Acct-Input-Packets},
- AcctOutputOctets = %{request.Acct-Output-Octets},
- AcctOutputGigawords = %{request.Acct-Output-Gigawords},
- AcctOutputPackets = %{request.Acct-Output-Packets},
- AcctStatusType = %{request.Acct-Status-Type}
- WHERE
- UserName = %{request.User-Name}
- AND AcctSessionID = %{request.Acct-Session-Id}
- AND NASIPAddress = %{request.NAS-IP-Address}
+ UPDATE
+ @TP@accounting
+ SET
+ AcctSessionTime = %{request.Acct-Session-Time},
+ AcctInputOctets = %{request.Acct-Input-Octets},
+ AcctInputGigawords = %{request.Acct-Input-Gigawords},
+ AcctInputPackets = %{request.Acct-Input-Packets},
+ AcctOutputOctets = %{request.Acct-Output-Octets},
+ AcctOutputGigawords = %{request.Acct-Output-Gigawords},
+ AcctOutputPackets = %{request.Acct-Output-Packets},
+ AcctStatusType = %{request.Acct-Status-Type}
+ WHERE
+ Username = %{request.User-Name}
+ AND AcctSessionID = %{request.Acct-Session-Id}
+ AND NASIPAddress = %{request.NAS-IP-Address}
';
$config->{'accounting_stop_query'} = '
- UPDATE @TP@accounting
- SET
- AcctSessionTime = %{request.Acct-Session-Time},
- AcctInputOctets = %{request.Acct-Input-Octets},
- AcctInputGigawords = %{request.Acct-Input-Gigawords},
- AcctInputPackets = %{request.Acct-Input-Packets},
- AcctOutputOctets = %{request.Acct-Output-Octets},
- AcctOutputGigawords = %{request.Acct-Output-Gigawords},
- AcctOutputPackets = %{request.Acct-Output-Packets},
- AcctStatusType = %{request.Acct-Status-Type},
- AcctTerminateCause = %{request.Acct-Terminate-Cause}
- WHERE
- UserName = %{request.User-Name}
- AND AcctSessionID = %{request.Acct-Session-Id}
- AND NASIPAddress = %{request.NAS-IP-Address}
+ UPDATE
+ @TP@accounting
+ SET
+ AcctSessionTime = %{request.Acct-Session-Time},
+ AcctInputOctets = %{request.Acct-Input-Octets},
+ AcctInputGigawords = %{request.Acct-Input-Gigawords},
+ AcctInputPackets = %{request.Acct-Input-Packets},
+ AcctOutputOctets = %{request.Acct-Output-Octets},
+ AcctOutputGigawords = %{request.Acct-Output-Gigawords},
+ AcctOutputPackets = %{request.Acct-Output-Packets},
+ AcctStatusType = %{request.Acct-Status-Type},
+ AcctTerminateCause = %{request.Acct-Terminate-Cause}
+ WHERE
+ Username = %{request.User-Name}
+ AND AcctSessionID = %{request.Acct-Session-Id}
+ AND NASIPAddress = %{request.NAS-IP-Address}
';
$config->{'accounting_usage_query'} = '
- SELECT
- SUM(AcctInputOctets) AS InputOctets,
- SUM(AcctOutputOctets) AS OutputOctets,
- SUM(AcctInputGigawords) AS InputGigawords,
- SUM(AcctOutputGigawords) AS OutputGigawords,
- SUM(AcctSessionTime) AS SessionTime
- FROM
- @TP@accounting
- WHERE
- Username = %{request.User-Name}
+ SELECT
+ SUM(AcctInputOctets) AS InputOctets,
+ SUM(AcctOutputOctets) AS OutputOctets,
+ SUM(AcctInputGigawords) AS InputGigawords,
+ SUM(AcctOutputGigawords) AS OutputGigawords,
+ SUM(AcctSessionTime) AS SessionTime
+ FROM
+ @TP@accounting
+ WHERE
+ Username = %{request.User-Name}
';
# Setup SQL queries
@@ -422,8 +425,16 @@ sub cleanup
for ($i = 0; $i < $count; $i++) {
@dbDoParams = ('
INSERT INTO
- @TP@accounting_summary (Username,PeriodKey,AcctSessionTime,AcctInputOctets,AcctInputGigawords,
- AcctOutputOctets,AcctOutputGigawords)
+ @TP@accounting_summary
+ (
+ Username,
+ PeriodKey,
+ AcctSessionTime,
+ AcctInputOctets,
+ AcctInputGigawords,
+ AcctOutputOctets,
+ AcctOutputGigawords
+ )
VALUES
(?,?,?,?,?,?,?)
',
diff --git a/smradius/modules/system/mod_config_sql_topups.pm b/smradius/modules/system/mod_config_sql_topups.pm
index e307b5e7..6cfbe38c 100644
--- a/smradius/modules/system/mod_config_sql_topups.pm
+++ b/smradius/modules/system/mod_config_sql_topups.pm
@@ -75,11 +75,11 @@ sub init
# Default configs...
$config->{'get_topups_summary_query'} = '
- SELECT
+ SELECT
@TP@topups_summary.Balance,
@TP@topups.Type,
@TP@topups.ID
- FROM
+ FROM
@TP@topups_summary,
@TP@topups,
@TP@users
@@ -92,11 +92,11 @@ sub init
';
$config->{'get_topups_query'} = '
- SELECT
+ SELECT
@TP@topups.ID,
@TP@topups.Type,
@TP@topups.Value
- FROM
+ FROM
@TP@topups,
@TP@users
WHERE
@@ -381,11 +381,11 @@ sub cleanup
# Get user traffic and uptime limits
$sth = DBSelect('
SELECT
- @TP@user_attributes.Name, @TP@user_attributes.Value
+ @TP@user_attributes.Name, @TP@user_attributes.Value
FROM
- @TP@user_attributes, @TP@users
+ @TP@user_attributes, @TP@users
WHERE
- @TP@users.Username = ?
+ @TP@users.Username = ?
',
$userName
);
diff --git a/smradius/modules/userdb/mod_userdb_sql.pm b/smradius/modules/userdb/mod_userdb_sql.pm
index 794f52bc..c2784dcf 100644
--- a/smradius/modules/userdb/mod_userdb_sql.pm
+++ b/smradius/modules/userdb/mod_userdb_sql.pm
@@ -42,7 +42,7 @@ our (@ISA,@EXPORT,@EXPORT_OK);
our $pluginInfo = {
Name => "SQL User Database",
Init => \&init,
-
+
# User database
User_find => \&find,
User_get => \&get,
@@ -67,30 +67,30 @@ sub init
# Default configs...
$config->{'userdb_find_query'} = '
- SELECT
- ID
- FROM
- @TP@users
- WHERE
- UserName = %{requet.User-Name}
+ SELECT
+ ID
+ FROM
+ @TP@users
+ WHERE
+ Username = %{request.User-Name}
';
-
+
$config->{'userdb_get_group_attributes_query'} = '
- SELECT
+ SELECT
group_attributes.Name, group_attributes.Operator, group_attributes.Value
- FROM
- @TP@group_attributes, @TP@users_to_groups
- WHERE
+ FROM
+ @TP@group_attributes, @TP@users_to_groups
+ WHERE
users_to_groups.UserID = %{userdb.id}
AND group_attributes.GroupID = users_to_groups.GroupID
';
-
+
$config->{'userdb_get_user_attributes_query'} = '
- SELECT
+ SELECT
Name, Operator, Value
- FROM
- @TP@user_attributes
- WHERE
+ FROM
+ @TP@user_attributes
+ WHERE
UserID = %{userdb.ID}
';
@@ -212,7 +212,7 @@ sub get
$server->log(LOG_ERR,"Failed to get group attributes: ".awitpt::db::dblayer::Error());
return -1;
}
-
+
# Loop with group attributes
while (my $row = $sth->fetchrow_hashref()) {
addAttribute($server,\%attributes,hashifyLCtoMC($row,qw(Name Operator Value)));
@@ -230,7 +230,7 @@ sub get
$server->log(LOG_ERR,"Failed to get user attributes: ".awitpt::db::dblayer::Error());
return -1;
}
-
+
# Loop with group attributes
while (my $row = $sth->fetchrow_hashref()) {
addAttribute($server,\%attributes,hashifyLCtoMC($row,qw(Name Operator Value)));
diff --git a/smradiusd.conf b/smradiusd.conf
index ef095ace..6ed7cdb2 100644
--- a/smradiusd.conf
+++ b/smradiusd.conf
@@ -131,10 +131,10 @@ EOT
[mod_config_sql]
get_config_query=<<EOT
- SELECT
+ SELECT
Name, Operator, Value
- FROM
- @TP@realm_attributes
+ FROM
+ @TP@realm_attributes
EOT
@@ -142,92 +142,95 @@ EOT
[mod_accounting_sql]
accounting_start_query=<<EOT
- INSERT INTO @TP@accounting
- (
- Username,
- ServiceType,
- FramedProtocol,
- NASPort,
- NASPortType,
- CallingStationID,
- CalledStationID,
- NASPortID,
- AcctSessionID,
- FramedIPAddress,
- AcctAuthentic,
- EventTimestamp,
- AcctStatusType,
- NASIdentifier,
- NASIPAddress,
- AcctDelayTime
- )
- VALUES
- (
- %{request.User-Name},
- %{request.Service-Type},
- %{request.Framed-Protocol},
- %{request.NAS-Port},
- %{request.NAS-Port-Type},
- %{request.Calling-Station-Id},
- %{request.Called-Station-Id},
- %{request.NAS-Port-Id},
- %{request.Acct-Session-Id},
- %{request.Framed-IP-Address},
- %{request.Acct-Authentic},
- %{request.Timestamp},
- %{request.Acct-Status-Type},
- %{request.NAS-Identifier},
- %{request.NAS-IP-Address},
- %{request.Acct-Delay-Time}
- )
+ INSERT INTO
+ @TP@accounting
+ (
+ Username,
+ ServiceType,
+ FramedProtocol,
+ NASPort,
+ NASPortType,
+ CallingStationID,
+ CalledStationID,
+ NASPortID,
+ AcctSessionID,
+ FramedIPAddress,
+ AcctAuthentic,
+ EventTimestamp,
+ AcctStatusType,
+ NASIdentifier,
+ NASIPAddress,
+ AcctDelayTime
+ )
+ VALUES
+ (
+ %{request.User-Name},
+ %{request.Service-Type},
+ %{request.Framed-Protocol},
+ %{request.NAS-Port},
+ %{request.NAS-Port-Type},
+ %{request.Calling-Station-Id},
+ %{request.Called-Station-Id},
+ %{request.NAS-Port-Id},
+ %{request.Acct-Session-Id},
+ %{request.Framed-IP-Address},
+ %{request.Acct-Authentic},
+ %{request.Timestamp},
+ %{request.Acct-Status-Type},
+ %{request.NAS-Identifier},
+ %{request.NAS-IP-Address},
+ %{request.Acct-Delay-Time}
+ )
EOT
accounting_update_query=<<EOT
- UPDATE @TP@accounting
- SET
- AcctSessionTime = %{request.Acct-Session-Time},
- AcctInputOctets = %{request.Acct-Input-Octets},
- AcctInputGigawords = %{request.Acct-Input-Gigawords},
- AcctInputPackets = %{request.Acct-Input-Packets},
- AcctOutputOctets = %{request.Acct-Output-Octets},
- AcctOutputGigawords = %{request.Acct-Output-Gigawords},
- AcctOutputPackets = %{request.Acct-Output-Packets},
- AcctStatusType = %{request.Acct-Status-Type}
- WHERE
- UserName = %{request.User-Name}
- AND AcctSessionID = %{request.Acct-Session-Id}
- AND NASIPAddress = %{request.NAS-IP-Address}
+ UPDATE
+ @TP@accounting
+ SET
+ AcctSessionTime = %{request.Acct-Session-Time},
+ AcctInputOctets = %{request.Acct-Input-Octets},
+ AcctInputGigawords = %{request.Acct-Input-Gigawords},
+ AcctInputPackets = %{request.Acct-Input-Packets},
+ AcctOutputOctets = %{request.Acct-Output-Octets},
+ AcctOutputGigawords = %{request.Acct-Output-Gigawords},
+ AcctOutputPackets = %{request.Acct-Output-Packets},
+ AcctStatusType = %{request.Acct-Status-Type}
+ WHERE
+ Username = %{request.User-Name}
+ AND AcctSessionID = %{request.Acct-Session-Id}
+ AND NASIPAddress = %{request.NAS-IP-Address}
EOT
accounting_stop_query=<<EOT
- UPDATE @TP@accounting
- SET
- AcctSessionTime = %{request.Acct-Session-Time},
- AcctInputOctets = %{request.Acct-Input-Octets},
- AcctInputGigawords = %{request.Acct-Input-Gigawords},
- AcctInputPackets = %{request.Acct-Input-Packets},
- AcctOutputOctets = %{request.Acct-Output-Octets},
- AcctOutputGigawords = %{request.Acct-Output-Gigawords},
- AcctOutputPackets = %{request.Acct-Output-Packets},
- AcctStatusType = %{request.Acct-Status-Type},
- AcctTerminateCause = %{request.Acct-Terminate-Cause}
- WHERE
- UserName = %{request.User-Name}
- AND AcctSessionID = %{request.Acct-Session-Id}
- AND NASIPAddress = %{request.NAS-IP-Address}
+ UPDATE
+ @TP@accounting
+ SET
+ AcctSessionTime = %{request.Acct-Session-Time},
+ AcctInputOctets = %{request.Acct-Input-Octets},
+ AcctInputGigawords = %{request.Acct-Input-Gigawords},
+ AcctInputPackets = %{request.Acct-Input-Packets},
+ AcctOutputOctets = %{request.Acct-Output-Octets},
+ AcctOutputGigawords = %{request.Acct-Output-Gigawords},
+ AcctOutputPackets = %{request.Acct-Output-Packets},
+ AcctStatusType = %{request.Acct-Status-Type},
+ AcctTerminateCause = %{request.Acct-Terminate-Cause}
+ WHERE
+ Username = %{request.User-Name}
+ AND AcctSessionID = %{request.Acct-Session-Id}
+ AND NASIPAddress = %{request.NAS-IP-Address}
EOT
accounting_usage_query=<<EOT
- SELECT
- SUM(AcctInputOctets) AS InputOctets,
- SUM(AcctOutputOctets) AS OutputOctets,
- SUM(AcctInputGigawords) AS InputGigawords,
- SUM(AcctOutputGigawords) AS OutputGigawords,
- SUM(AcctSessionTime) AS SessionTime
- FROM
- @TP@accounting
- WHERE
- Username = %{request.User-Name}
+ SELECT
+ SUM(AcctInputOctets) AS InputOctets,
+ SUM(AcctOutputOctets) AS OutputOctets,
+ SUM(AcctInputGigawords) AS InputGigawords,
+ SUM(AcctOutputGigawords) AS OutputGigawords,
+ SUM(AcctSessionTime) AS SessionTime
+ FROM
+ @TP@accounting
+ WHERE
+ Username = %{request.User-Name}
EOT
@@ -237,31 +240,31 @@ EOT
[mod_userdb_sql]
userdb_find_query=<<EOT
- SELECT
- ID
- FROM
- @TP@users
- WHERE
- UserName = %{request.User-Name}
+ SELECT
+ ID
+ FROM
+ @TP@users
+ WHERE
+ Username = %{request.User-Name}
EOT
userdb_get_group_attributes_query=<<EOT
- SELECT
- group_attributes.Name, group_attributes.Operator, group_attributes.Value
- FROM
- @TP@group_attributes, @TP@users_to_groups
- WHERE
- users_to_groups.UserID = %{userdb.id}
- AND group_attributes.GroupID = users_to_groups.GroupID
+ SELECT
+ group_attributes.Name, group_attributes.Operator, group_attributes.Value
+ FROM
+ @TP@group_attributes, @TP@users_to_groups
+ WHERE
+ users_to_groups.UserID = %{userdb.id}
+ AND group_attributes.GroupID = users_to_groups.GroupID
EOT
-
+
userdb_get_user_attributes_query=<<EOT
- SELECT
- Name, Operator, Value
- FROM
- @TP@user_attributes
- WHERE
- UserID = %{userdb.id}
+ SELECT
+ Name, Operator, Value
+ FROM
+ @TP@user_attributes
+ WHERE
+ UserID = %{userdb.id}
EOT
--
GitLab