logout.php: Pull out DB code

* Move DB code for removing a session in logout.php to a new function in
acctfuncs.inc.php
* Add ability for clear_expired_sessions function to check for DB connection
* Centralization of DB code important in a future transition to PDO interface

Signed-off-by: canyonknight <canyonknight@gmail.com>
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>

1 files changed, 16 insertions, 1 deletions

diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php
index 7a18f76a..ecb9f99c 100644
--- a/web/lib/acctfuncs.inc.php
+++ b/web/lib/acctfuncs.inc.php
@@ -681,10 +681,25 @@ function user_is_privileged($id, $dbh) {
 
 }
 
+# Remove session on logout
+function delete_session_id($sid, $dbh=NULL) {
+	if(!$dbh) {
+		$dbh = db_connect();
+	}
+
+	$q = "DELETE FROM Sessions WHERE SessionID = '";
+	$q.= db_escape_string($sid) . "'";
+	db_query($q, $dbh);
+}
+
 # Clear out old expired sessions.
-function clear_expired_sessions( $dbh ) {
+function clear_expired_sessions($dbh=NULL) {
 	global $LOGIN_TIMEOUT;
 
+	if(!$dbh) {
+		$dbh = db_connect();
+	}
+
 	$q = "DELETE FROM Sessions WHERE LastUpdateTS < (UNIX_TIMESTAMP() - $LOGIN_TIMEOUT)";
 	db_query($q, $dbh);