From d6d7a0d42a367ea8f516e0c16317a286cee71a3e Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Tue, 6 Oct 2015 19:44:16 +0000 Subject: [PATCH] (captiveportal, new) work in progress script base --- src/opnsense/scripts/OPNsense/CaptivePortal/lib/db.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/opnsense/scripts/OPNsense/CaptivePortal/lib/db.py b/src/opnsense/scripts/OPNsense/CaptivePortal/lib/db.py index 54a6e3983..95645b41f 100644 --- a/src/opnsense/scripts/OPNsense/CaptivePortal/lib/db.py +++ b/src/opnsense/scripts/OPNsense/CaptivePortal/lib/db.py @@ -78,7 +78,6 @@ class DB(object): response['ipAddress'] = ip_address response['macAddress'] = mac_address response['startTime'] = time.time() # record creation = sign-in time - response['last_accessed'] = time.time() # last accessed_time = sign-in time response['sessionId'] = base64.b64encode(os.urandom(16)) # generate a new random session id cur = self._connection.cursor() @@ -90,8 +89,8 @@ class DB(object): """, response) # add new session - cur.execute("""INSERT INTO cp_clients(zoneid, authenticated_via, sessionid, username, ip_address, mac_address, created, last_accessed) - VALUES (:zoneid, :authenticated_via, :sessionId, :userName, :ipAddress, :macAddress, :startTime, :last_accessed) + cur.execute("""INSERT INTO cp_clients(zoneid, authenticated_via, sessionid, username, ip_address, mac_address, created) + VALUES (:zoneid, :authenticated_via, :sessionId, :userName, :ipAddress, :macAddress, :startTime) """, response) self._connection.commit() @@ -144,7 +143,7 @@ class DB(object): , CASE WHEN si.packets_out IS NULL THEN 0 ELSE si.packets_out END packets_out , CASE WHEN si.bytes_in IS NULL THEN 0 ELSE si.bytes_in END bytes_in , CASE WHEN si.bytes_out IS NULL THEN 0 ELSE si.bytes_out END bytes_out - , CASE WHEN si.last_accessed IS NULL THEN 0 ELSE si.last_accessed END last_accessed + , CASE WHEN si.last_accessed IS NULL THEN cc.created ELSE si.last_accessed END last_accessed FROM cp_clients cc LEFT JOIN session_info si ON si.zoneid = cc.zoneid AND si.sessionid = cc.sessionid WHERE cc.zoneid = :zoneid