more work on singleton-based DB

1 files changed, 25 insertions, 65 deletions

diff --git a/include/sessions.php b/include/sessions.php
index bc8b7cff1..f6e8bfe61 100644
--- a/include/sessions.php
+++ b/include/sessions.php
@@ -2,7 +2,8 @@
 	// Original from http://www.daniweb.com/code/snippet43.html
 
 	require_once "config.php";
-	require_once "db.php";
+	require_once "classes/db.php";
+	require_once "autoload.php";
 	require_once "errorhandler.php";
 	require_once "lib/accept-to-gettext.php";
 	require_once "lib/gettext/gettext.inc";
@@ -22,14 +23,12 @@
 	ini_set("session.gc_maxlifetime", $session_expire);
 	ini_set("session.cookie_lifetime", min(0, SESSION_COOKIE_LIFETIME));
 
-	global $session_connection;
-
-	function session_get_schema_version($link, $nocache = false) {
+	function session_get_schema_version($nocache = false) {
 		global $schema_version;
 
 		if (!$schema_version) {
-			$result = db_query($link, "SELECT schema_version FROM ttrss_version");
-			$version = db_fetch_result($result, 0, "schema_version");
+			$result = Db::get()->query("SELECT schema_version FROM ttrss_version");
+			$version = Db::get()->fetch_result($result, 0, "schema_version");
 			$schema_version = $version;
 			return $version;
 		} else {
@@ -39,7 +38,6 @@
 
 	function validate_session($link) {
 		if (SINGLE_USER_MODE) return true;
-		if (!$link) return false;
 
 		if (VERSION != $_SESSION["version"]) return false;
 
@@ -64,21 +62,21 @@
 			return false;
 		}
 
-		if ($_SESSION["ref_schema_version"] != session_get_schema_version($link, true))
+		if ($_SESSION["ref_schema_version"] != session_get_schema_version(true))
 			return false;
 
 		if (sha1($_SERVER['HTTP_USER_AGENT']) != $_SESSION["user_agent"])
 			return false;
 
 		if ($_SESSION["uid"]) {
-			$result = db_query($link,
+			$result = Db::get()->query(
 				"SELECT pwd_hash FROM ttrss_users WHERE id = '".$_SESSION["uid"]."'");
 
 			// user not found
-			if (db_num_rows($result) == 0) {
+			if (Db::get()->num_rows($result) == 0) {
 				return false;
 			} else {
-				$pwd_hash = db_fetch_result($result, 0, "pwd_hash");
+				$pwd_hash = Db::get()->fetch_result($result, 0, "pwd_hash");
 
 				if ($pwd_hash != $_SESSION["pwd_hash"]) {
 					return false;
@@ -86,101 +84,63 @@
 			}
 		}
 
-/*		if ($_SESSION["cookie_lifetime"] && $_SESSION["uid"]) {
-
-			//print_r($_SESSION);
-
-			if (time() > $_SESSION["cookie_lifetime"]) {
-				return false;
-			}
-		} */
-
 		return true;
 	}
 
 
 	function ttrss_open ($s, $n) {
-		global $session_connection;
-
-		$session_connection = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
 		return true;
 	}
 
 	function ttrss_read ($id){
+		global $session_expire;
+
+		$res = Db::get()->query("SELECT data FROM ttrss_sessions WHERE id='$id'");
 
-		global $session_connection,$session_read;
+		if (Db::get()->num_rows($res) != 1) {
 
-		$query = "SELECT data FROM ttrss_sessions WHERE id='$id'";
+			$expire = time() + $session_expire;
 
-		$res = db_query($session_connection, $query);
+			Db::get()->query("INSERT INTO ttrss_sessions (id, data, expire)
+					VALUES ('$id', '', '$expire')");
 
-		if (db_num_rows($res) != 1) {
 		 	return "";
 		} else {
-			$session_read = db_fetch_assoc($res);
-			$session_read["data"] = base64_decode($session_read["data"]);
-			return $session_read["data"];
+			return base64_decode(Db::get()->fetch_result($res, 0, "data"));
 		}
+
 	}
 
 	function ttrss_write ($id, $data) {
+		global $session_expire;
 
-		if (! $data) {
-			return false;
-		}
-
-		global $session_connection, $session_read, $session_expire;
-
+		$data = base64_encode($data);
 		$expire = time() + $session_expire;
 
-		$data = db_escape_string($session_connection, base64_encode($data), false);
-
-		if ($session_read) {
-		 	$query = "UPDATE ttrss_sessions SET data='$data',
-					expire='$expire' WHERE id='$id'";
-		} else {
-		 	$query = "INSERT INTO ttrss_sessions (id, data, expire)
-					VALUES ('$id', '$data', '$expire')";
-		}
+		Db::get()->query("UPDATE ttrss_sessions SET data='$data', expire='$expire' WHERE id='$id'");
 
-		db_query($session_connection, $query);
 		return true;
 	}
 
 	function ttrss_close () {
-
-		global $session_connection;
-
-		//db_close($session_connection);
-
 		return true;
 	}
 
-	function ttrss_destroy ($id) {
-
-		global $session_connection;
-
-		$query = "DELETE FROM ttrss_sessions WHERE id = '$id'";
-
-		db_query($session_connection, $query);
+	function ttrss_destroy($id) {
+		Db::get()->query("DELETE FROM ttrss_sessions WHERE id = '$id'");
 
 		return true;
 	}
 
 	function ttrss_gc ($expire) {
-
-		global $session_connection;
-
-		$query = "DELETE FROM ttrss_sessions WHERE expire < " . time();
-
-		db_query($session_connection, $query);
+		Db::get()->query("DELETE FROM ttrss_sessions WHERE expire < " . time());
 	}
 
 	if (!SINGLE_USER_MODE /* && DB_TYPE == "pgsql" */) {
 		session_set_save_handler("ttrss_open",
 			"ttrss_close", "ttrss_read", "ttrss_write",
 			"ttrss_destroy", "ttrss_gc");
+		register_shutdown_function('session_write_close');
 	}
 
 	if (!defined('NO_SESSION_AUTOSTART')) {