diff --git a/webgui/include/ajax/functions/AdminUserLogs.php b/webgui/include/ajax/functions/AdminUserLogs.php index f6b5beb0808a64accc0b4beb2db23adbafed2e9e..401c9036780172eee9c24bae29fa8bdcb24ecd9f 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 a5288191398caf9e1318ae851fd020b3deaa8d40..be518c9bb4b72742dd25fbe6fe2e9ace7ddf21c5 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 8cc5ce293057e7e4e1cd13ec772e823d0266a682..e65967e0b07ba1b058b4365beaa062603b7e760e 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 b006ba817c2ceb657a6cdfb5d0b4021a307786c9..69d712e26efa1f0e013db9c5f5ad3ad8c3813212 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