From a94818a2379fa11d12bb44a1cf014f514070e3bb Mon Sep 17 00:00:00 2001
From: Robert Anderson <randerson@lbsd.net>
Date: Wed, 1 Jul 2009 11:47:10 +0000
Subject: [PATCH] Revert of r413, some user's don't need passwords
---
webgui/include/ajax/functions/AdminUserLogs.php | 10 +++++-----
webgui/include/ajax/functions/AdminUserTopups.php | 4 ++--
webgui/include/ajax/functions/WiSPUserLogs.php | 12 ++++++------
webgui/include/ajax/functions/WiSPUserTopups.php | 4 ++--
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/webgui/include/ajax/functions/AdminUserLogs.php b/webgui/include/ajax/functions/AdminUserLogs.php
index 401c9036..f6b5beb0 100644
--- a/webgui/include/ajax/functions/AdminUserLogs.php
+++ b/webgui/include/ajax/functions/AdminUserLogs.php
@@ -23,10 +23,10 @@ function getAdminUserLogs($params) {
);
$res = DBSelectSearch("
- SELECT
+ SELECT
accounting.ID,
- accounting.EventTimestamp,
- accounting.AcctStatusType,
+ accounting.EventTimestamp,
+ accounting.AcctStatusType,
accounting.ServiceType,
accounting.FramedProtocol,
accounting.NASPortType,
@@ -40,9 +40,9 @@ function getAdminUserLogs($params) {
accounting.AcctOutputOctets,
accounting.AcctOutputGigawords,
accounting.AcctTerminateCause
- FROM
+ FROM
accounting, users
- WHERE
+ WHERE
users.Username = accounting.Username
AND
users.ID = ".DBQuote($params[0])."
diff --git a/webgui/include/ajax/functions/AdminUserTopups.php b/webgui/include/ajax/functions/AdminUserTopups.php
index be518c9b..a5288191 100644
--- a/webgui/include/ajax/functions/AdminUserTopups.php
+++ b/webgui/include/ajax/functions/AdminUserTopups.php
@@ -50,7 +50,7 @@ function removeAdminUserTopup($params) {
return NULL;
}
-
+
# Return specific topup row
function getAdminUserTopup($params) {
global $db;
@@ -96,7 +96,7 @@ function getAdminUserTopups($params) {
$res = DBSelectSearch("
SELECT
- ID, Timestamp, Type, Value, ValidFrom, ValidTo
+ ID, Timestamp, Type, Value, ValidFrom, ValidTo
FROM
topups
WHERE
diff --git a/webgui/include/ajax/functions/WiSPUserLogs.php b/webgui/include/ajax/functions/WiSPUserLogs.php
index e65967e0..8cc5ce29 100644
--- a/webgui/include/ajax/functions/WiSPUserLogs.php
+++ b/webgui/include/ajax/functions/WiSPUserLogs.php
@@ -23,10 +23,10 @@ function getWiSPUserLogs($params) {
);
$res = DBSelectSearch("
- SELECT
+ SELECT
accounting.ID,
- accounting.EventTimestamp,
- accounting.AcctStatusType,
+ accounting.EventTimestamp,
+ accounting.AcctStatusType,
accounting.ServiceType,
accounting.FramedProtocol,
accounting.NASPortType,
@@ -40,9 +40,9 @@ function getWiSPUserLogs($params) {
accounting.AcctOutputOctets,
accounting.AcctOutputGigawords,
accounting.AcctTerminateCause
- FROM
+ FROM
accounting, users
- WHERE
+ WHERE
users.Username = accounting.Username
AND
users.ID = ".DBQuote($params[0])."
@@ -84,7 +84,7 @@ function getWiSPUserLogs($params) {
$item['ID'] = $row->id;
- # Convert to ISO format
+ # Convert to ISO format
$date = new DateTime($row->eventtimestamp);
$value = $date->format("Y-m-d H:i:s");
$item['EventTimestamp'] = $value;
diff --git a/webgui/include/ajax/functions/WiSPUserTopups.php b/webgui/include/ajax/functions/WiSPUserTopups.php
index 69d712e2..b006ba81 100644
--- a/webgui/include/ajax/functions/WiSPUserTopups.php
+++ b/webgui/include/ajax/functions/WiSPUserTopups.php
@@ -50,7 +50,7 @@ function removeWiSPUserTopup($params) {
return NULL;
}
-
+
# Return specific topup row
function getWiSPUserTopup($params) {
global $db;
@@ -96,7 +96,7 @@ function getWiSPUserTopups($params) {
$res = DBSelectSearch("
SELECT
- ID, Timestamp, Type, Value, ValidFrom, ValidTo
+ ID, Timestamp, Type, Value, ValidFrom, ValidTo
FROM
topups
WHERE
--
GitLab