From 9594791782bb9adbf29018c444ea427fbaeb5ee4 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 13:08:36 +0400 Subject: experimental singleton-based Db connection --- classes/db/mysql.php | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 classes/db/mysql.php (limited to 'classes/db/mysql.php') diff --git a/classes/db/mysql.php b/classes/db/mysql.php new file mode 100644 index 000000000..512ea3894 --- /dev/null +++ b/classes/db/mysql.php @@ -0,0 +1,59 @@ +link = mysql_connect($host, $user, $pass); + if ($this->link) { + $result = mysql_select_db($db, $this->link); + if (!$result) { + die("Can't select DB: " . mysql_error($this->link)); + } + return $this->link; + } else { + die("Unable to connect to database (as $user to $host, database $db): " . mysql_error()); + } + } + + function escape_string($s, $strip_tags = true) { + return mysql_real_escape_string($s, $this->link); + } + + function query($query, $die_on_error = true) { + $result = mysql_query($query, $this->link); + if (!$result) { + $query = htmlspecialchars($query); + if ($die_on_error) { + die("Query $query failed: " . ($this->link ? mysql_error($link) : "No connection")); + } + } + return $result; + } + + function fetch_assoc($result) { + return mysql_fetch_assoc($result); + } + + + function num_rows($result) { + return mysql_num_rows($result); + } + + function fetch_result($result, $row, $param) { + return mysql_result($result, $row, $param); + } + + function close() { + return mysql_close($this->link); + } + + function affected_rows($result) { + return mysql_affected_rows($this->link); + } + + function last_error() { + return mysql_affected_rows($this->link); + } + +} +?> -- cgit v1.2.3-54-g00ecf From ba68b6815ab31d17cda113e7990eeb07558b02a9 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 14:23:35 +0400 Subject: db updates, remove init_connection() --- api/index.php | 2 +- backend.php | 2 +- classes/db.php | 5 +++++ classes/db/mysql.php | 10 ++++++++++ classes/db/pgsql.php | 8 ++++++++ classes/idb.php | 1 + include/functions.php | 38 +++++--------------------------------- index.php | 2 +- opml.php | 2 +- plugins/mobile/article.php | 2 +- plugins/mobile/backend.php | 2 +- plugins/mobile/cat.php | 2 +- plugins/mobile/feed.php | 2 +- plugins/mobile/home.php | 2 +- plugins/mobile/index.php | 2 +- plugins/mobile/prefs.php | 2 +- prefs.php | 2 +- public.php | 2 +- register.php | 2 +- update.php | 2 +- update_daemon2.php | 6 +++--- 21 files changed, 47 insertions(+), 51 deletions(-) (limited to 'classes/db/mysql.php') diff --git a/api/index.php b/api/index.php index 53b78b010..823b9527e 100644 --- a/api/index.php +++ b/api/index.php @@ -54,7 +54,7 @@ @session_start(); } - if (!init_connection($link)) return; + if (!init_plugins($link)) return; $method = strtolower($_REQUEST["op"]); diff --git a/backend.php b/backend.php index 6ee0e081f..40e40aeb3 100644 --- a/backend.php +++ b/backend.php @@ -49,7 +49,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!init_connection($link)) return; + if (!init_plugins($link)) return; header("Content-Type: text/json; charset=utf-8"); diff --git a/classes/db.php b/classes/db.php index 403cbc93a..71fc01ae1 100644 --- a/classes/db.php +++ b/classes/db.php @@ -16,6 +16,7 @@ class Db implements IDb { } $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT); + $this->adapter->init(); } private function __clone() { @@ -33,6 +34,10 @@ class Db implements IDb { return("'$str'"); } + function init() { + // + } + function connect($host, $user, $pass, $db, $port) { //return $this->adapter->connect($host, $user, $pass, $db, $port); } diff --git a/classes/db/mysql.php b/classes/db/mysql.php index 512ea3894..fa97dcff1 100644 --- a/classes/db/mysql.php +++ b/classes/db/mysql.php @@ -55,5 +55,15 @@ class Db_Mysql implements IDb { return mysql_affected_rows($this->link); } + function init() { + $this->query("SET time_zone = '+0:0'"); + + if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) { + $this->query("SET NAMES " . MYSQL_CHARSET); + } + + return true; + } + } ?> diff --git a/classes/db/pgsql.php b/classes/db/pgsql.php index 87c2abefd..c9ec33887 100644 --- a/classes/db/pgsql.php +++ b/classes/db/pgsql.php @@ -69,5 +69,13 @@ class Db_Pgsql implements IDb { return pg_last_error($this->link); } + function init() { + $this->query("set client_encoding = 'UTF-8'"); + pg_set_client_encoding("UNICODE"); + $this->query("set datestyle = 'ISO, european'"); + $this->query("set TIME ZONE 0"); + + return true; + } } ?> diff --git a/classes/idb.php b/classes/idb.php index 16f760bf6..1ca6925b4 100644 --- a/classes/idb.php +++ b/classes/idb.php @@ -1,6 +1,7 @@ 0; } - function init_connection_only($link) { - if ($link) { - if (DB_TYPE == "pgsql") { - pg_query($link, "set client_encoding = 'UTF-8'"); - pg_set_client_encoding("UNICODE"); - pg_query($link, "set datestyle = 'ISO, european'"); - pg_query($link, "set TIME ZONE 0"); - } else { - db_query($link, "SET time_zone = '+0:0'"); - - if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) { - db_query($link, "SET NAMES " . MYSQL_CHARSET); - } - } - - return true; - } - - return false; - } - - function init_connection($link) { - if ($link) { - init_connection_only($link); - - global $pluginhost; + function init_plugins($link) { + global $pluginhost; - $pluginhost = new PluginHost($link); - $pluginhost->load(PLUGINS, $pluginhost::KIND_ALL); + $pluginhost = new PluginHost($link); + $pluginhost->load(PLUGINS, $pluginhost::KIND_ALL); - return true; - } else { - print "Unable to connect to database:" . db_last_error(); - return false; - } + return true; } function format_tags_string($tags, $id) { diff --git a/index.php b/index.php index 066b25fa5..c21b46809 100644 --- a/index.php +++ b/index.php @@ -31,7 +31,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!init_connection($link)) return; + if (!init_plugins($link)) return; global $pluginhost; diff --git a/opml.php b/opml.php index b8c9fb6c5..ad866fbd5 100644 --- a/opml.php +++ b/opml.php @@ -11,7 +11,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!init_connection($link)) return; + if (!init_plugins($link)) return; $op = $_REQUEST['op']; diff --git a/plugins/mobile/article.php b/plugins/mobile/article.php index f6aed994f..c73c0fca5 100644 --- a/plugins/mobile/article.php +++ b/plugins/mobile/article.php @@ -18,7 +18,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - init_connection($link); + init_plugins($link); login_sequence($link, true); diff --git a/plugins/mobile/backend.php b/plugins/mobile/backend.php index a88e02a92..dc657ed40 100644 --- a/plugins/mobile/backend.php +++ b/plugins/mobile/backend.php @@ -23,7 +23,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - init_connection($link); + init_plugins($link); if (!$_SESSION["uid"]) return; diff --git a/plugins/mobile/cat.php b/plugins/mobile/cat.php index 7b5cf43f9..acd7f6f34 100644 --- a/plugins/mobile/cat.php +++ b/plugins/mobile/cat.php @@ -18,7 +18,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - init_connection($link); + init_plugins($link); login_sequence($link, true); diff --git a/plugins/mobile/feed.php b/plugins/mobile/feed.php index 6eae741ac..22590f195 100644 --- a/plugins/mobile/feed.php +++ b/plugins/mobile/feed.php @@ -18,7 +18,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - init_connection($link); + init_plugins($link); login_sequence($link, true); diff --git a/plugins/mobile/home.php b/plugins/mobile/home.php index 03fccb3e2..f0ebf6a11 100644 --- a/plugins/mobile/home.php +++ b/plugins/mobile/home.php @@ -18,7 +18,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - init_connection($link); + init_plugins($link); login_sequence($link, true); diff --git a/plugins/mobile/index.php b/plugins/mobile/index.php index 3feec7531..3fd496d04 100644 --- a/plugins/mobile/index.php +++ b/plugins/mobile/index.php @@ -18,7 +18,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - init_connection($link); + init_plugins($link); login_sequence($link, true); ?> diff --git a/plugins/mobile/prefs.php b/plugins/mobile/prefs.php index 323196254..e6d4a7b40 100644 --- a/plugins/mobile/prefs.php +++ b/plugins/mobile/prefs.php @@ -20,7 +20,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - init_connection($link); + init_plugins($link); login_sequence($link, true); ?> diff --git a/prefs.php b/prefs.php index e3b62da70..046d5eb76 100644 --- a/prefs.php +++ b/prefs.php @@ -21,7 +21,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!init_connection($link)) return; + if (!init_plugins($link)) return; login_sequence($link); diff --git a/public.php b/public.php index 8477f95fc..1a50538fb 100644 --- a/public.php +++ b/public.php @@ -30,7 +30,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!init_connection($link)) return; + if (!init_plugins($link)) return; if (ENABLE_GZIP_OUTPUT && function_exists("ob_gzhandler")) { ob_start("ob_gzhandler"); diff --git a/register.php b/register.php index 53627d912..9aec6dde7 100644 --- a/register.php +++ b/register.php @@ -19,7 +19,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!init_connection($link)) return; + if (!init_plugins($link)) return; if ($_REQUEST["format"] == "feed") { header("Content-Type: text/xml"); diff --git a/update.php b/update.php index 1c43cdb94..ffe54cc7c 100755 --- a/update.php +++ b/update.php @@ -21,7 +21,7 @@ // Create a database connection. $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - init_connection($link); + init_plugins($link); $longopts = array("feeds", "feedbrowser", diff --git a/update_daemon2.php b/update_daemon2.php index 77d05be66..e8a56eec9 100755 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -177,7 +177,7 @@ // It is unnecessary to start the fork loop if database is not ok. $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!init_connection($link)) die("Can't initialize db connection.\n"); + if (!init_plugins($link)) die("Can't initialize db connection.\n"); $schema_version = get_schema_version($link); @@ -203,7 +203,7 @@ /* Check if schema version changed */ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!init_connection($link)) die("Can't initialize db connection.\n"); + if (!init_plugins($link)) die("Can't initialize db connection.\n"); $test_schema_version = get_schema_version($link); db_close($link); @@ -255,7 +255,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!init_connection($link)) return; + if (!init_plugins($link)) return; // We disable stamp file, since it is of no use in a multiprocess update. // not really, tho for the time being -fox -- cgit v1.2.3-54-g00ecf From 404e2e3603c852a3f82a21c14b8888005e2b3f99 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 15:36:34 +0400 Subject: more work on singleton-based DB --- api/index.php | 1 + backend.php | 1 + classes/db.php | 8 ++-- classes/db/mysql.php | 3 ++ classes/db/pgsql.php | 2 + classes/sessionhandler.php | 73 +++++++++++++++++++++++++++++ include/autoload.php | 12 +++++ include/db.php | 114 ++++----------------------------------------- include/errorhandler.php | 8 ++-- include/functions.php | 11 ----- include/sessions.php | 90 ++++++++++------------------------- index.php | 1 + opml.php | 1 + prefs.php | 1 + public.php | 1 + register.php | 2 +- update.php | 1 + update_daemon2.php | 1 + 18 files changed, 143 insertions(+), 188 deletions(-) create mode 100644 classes/sessionhandler.php create mode 100644 include/autoload.php (limited to 'classes/db/mysql.php') diff --git a/api/index.php b/api/index.php index 823b9527e..d28ab763a 100644 --- a/api/index.php +++ b/api/index.php @@ -13,6 +13,7 @@ define('TTRSS_SESSION_NAME', 'ttrss_api_sid'); define('NO_SESSION_AUTOSTART', true); + require_once "autoload.php"; require_once "db.php"; require_once "db-prefs.php"; require_once "functions.php"; diff --git a/backend.php b/backend.php index 40e40aeb3..b583d379e 100644 --- a/backend.php +++ b/backend.php @@ -37,6 +37,7 @@ @$csrf_token = $_REQUEST['csrf_token']; + require_once "autoload.php"; require_once "sessions.php"; require_once "functions.php"; require_once "config.php"; diff --git a/classes/db.php b/classes/db.php index 71fc01ae1..558d3e6b7 100644 --- a/classes/db.php +++ b/classes/db.php @@ -2,6 +2,7 @@ class Db implements IDb { private static $instance; private $adapter; + private $link; private function __construct() { switch (DB_TYPE) { @@ -12,11 +13,11 @@ class Db implements IDb { $this->adapter = new Db_Pgsql(); break; default: - die("Unknown DB_TYPE: " . DB_TYPE); + user_error("Unknown DB_TYPE: " . DB_TYPE); } - $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT); - $this->adapter->init(); + $this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT); + } private function __clone() { @@ -40,6 +41,7 @@ class Db implements IDb { function connect($host, $user, $pass, $db, $port) { //return $this->adapter->connect($host, $user, $pass, $db, $port); + return $this->link; } function escape_string($s, $strip_tags = true) { diff --git a/classes/db/mysql.php b/classes/db/mysql.php index fa97dcff1..64c35ebdc 100644 --- a/classes/db/mysql.php +++ b/classes/db/mysql.php @@ -9,6 +9,9 @@ class Db_Mysql implements IDb { if (!$result) { die("Can't select DB: " . mysql_error($this->link)); } + + $this->init(); + return $this->link; } else { die("Unable to connect to database (as $user to $host, database $db): " . mysql_error()); diff --git a/classes/db/pgsql.php b/classes/db/pgsql.php index c9ec33887..0f38fb8cb 100644 --- a/classes/db/pgsql.php +++ b/classes/db/pgsql.php @@ -23,6 +23,8 @@ class Db_Pgsql implements IDb { die("Unable to connect to database (as $user to $host, database $db):" . pg_last_error()); } + $this->init(); + return $this->link; } diff --git a/classes/sessionhandler.php b/classes/sessionhandler.php new file mode 100644 index 000000000..66d8dd86c --- /dev/null +++ b/classes/sessionhandler.php @@ -0,0 +1,73 @@ +db = Db::get(); + + session_set_save_handler("SessionHandler::open", "SessionHandler::close", + "SessionHandler::read", "SessionHandler::write", "SessionHandler::destroy", + "SessionHandler::gc"); + } + + public static function open($save_path, $name) { } + + + public static function read ($id){ + + $query = "SELECT data FROM ttrss_sessions WHERE id='$id'"; + + $res = $this->db->query("SELECT data FROM ttrss_sessions WHERE id='$id'"); + + if ($this->db->num_rows($res) != 1) { + + "INSERT INTO ttrss_sessions (id, data, expire) + VALUES ('$id', '$data', '$expire')"; + + + + } else { + $data = $this->db->fetch_result($res, 0, "data"); + return base64_decode($data); + } + + } + + public static function write($id, $data) { + if (! $data) { + return false; + } + + $data = $this->db->escape_string( base64_encode($data), false); + + $expire = time() + max(SESSION_COOKIE_LIFETIME, 86400); + + $query = "UPDATE ttrss_sessions SET data='$data', + expire = '$expire' WHERE id='$id'"; + + $this->db->query( $query); + return true; + } + + public static function close () { } + + public static function destroy($session_id) { + $this->db->query("DELETE FROM ttrss_sessions WHERE id = '$session_id'"); + return true; + } + + public static function gc($maxLifeTime) { + $this->db->query("DELETE FROM ttrss_sessions WHERE expire < " time() - $maxLifeTime); + return true; + } + +} +?> diff --git a/include/autoload.php b/include/autoload.php new file mode 100644 index 000000000..40c63d547 --- /dev/null +++ b/include/autoload.php @@ -0,0 +1,12 @@ + diff --git a/include/db.php b/include/db.php index a70a1d878..cfa4ccda5 100644 --- a/include/db.php +++ b/include/db.php @@ -1,138 +1,44 @@ connect($host, $user, $pass, $db, 0); } function db_escape_string($link, $s, $strip_tags = true) { - if ($strip_tags) $s = strip_tags($s); - - if (DB_TYPE == "pgsql") { - return pg_escape_string($link, $s); - } else { - return mysql_real_escape_string($s, $link); - } + return Db::get()->escape_string($s, $strip_tags); } function db_query($link, $query, $die_on_error = true) { - if (DB_TYPE == "pgsql") { - $result = pg_query($link, $query); - if (!$result) { - $query = htmlspecialchars($query); // just in case - if ($die_on_error) { - die("Query $query failed [$result]: " . ($link ? pg_last_error($link) : "No connection")); - } - } - return $result; - } else if (DB_TYPE == "mysql") { - $result = mysql_query($query, $link); - if (!$result) { - $query = htmlspecialchars($query); - if ($die_on_error) { - die("Query $query failed: " . ($link ? mysql_error($link) : "No connection")); - } - } - return $result; - } + return Db::get()->query($query, $die_on_error); } function db_fetch_assoc($result) { - if (DB_TYPE == "pgsql") { - return pg_fetch_assoc($result); - } else if (DB_TYPE == "mysql") { - return mysql_fetch_assoc($result); - } + return Db::get()->fetch_assoc($result); } function db_num_rows($result) { - if (DB_TYPE == "pgsql") { - return pg_num_rows($result); - } else if (DB_TYPE == "mysql") { - return mysql_num_rows($result); - } + return Db::get()->num_rows($result); } function db_fetch_result($result, $row, $param) { - if (DB_TYPE == "pgsql") { - return pg_fetch_result($result, $row, $param); - } else if (DB_TYPE == "mysql") { - // I hate incoherent naming of PHP functions - return mysql_result($result, $row, $param); - } -} - -function db_unescape_string($str) { - $tmp = str_replace("\\\"", "\"", $str); - $tmp = str_replace("\\'", "'", $tmp); - return $tmp; + return Db::get()->fetch_result($result, $row, $param); } function db_close($link) { - if (DB_TYPE == "pgsql") { - - return pg_close($link); - - } else if (DB_TYPE == "mysql") { - return mysql_close($link); - } + return Db::get()->close(); } function db_affected_rows($link, $result) { - if (DB_TYPE == "pgsql") { - return pg_affected_rows($result); - } else if (DB_TYPE == "mysql") { - return mysql_affected_rows($link); - } + return Db::get()->affected_rows($result); } function db_last_error($link) { - if (DB_TYPE == "pgsql") { - return pg_last_error($link); - } else if (DB_TYPE == "mysql") { - return mysql_error($link); - } + return Db::get()->last_error(); } function db_quote($str){ - return("'$str'"); + return Db::get()->quote($str); } ?> diff --git a/include/errorhandler.php b/include/errorhandler.php index f7fadc172..45496b18b 100644 --- a/include/errorhandler.php +++ b/include/errorhandler.php @@ -1,7 +1,7 @@ diff --git a/include/functions.php b/include/functions.php index 0a686e71e..f0d5e85fa 100644 --- a/include/functions.php +++ b/include/functions.php @@ -10,17 +10,6 @@ $fetch_last_content_type = false; $pluginhost = false; - function __autoload($class) { - $class_file = str_replace("_", "/", strtolower(basename($class))); - - $file = dirname(__FILE__)."/../classes/$class_file.php"; - - if (file_exists($file)) { - require $file; - } - - } - mb_internal_encoding("UTF-8"); date_default_timezone_set('UTC'); if (defined('E_DEPRECATED')) { 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')) { diff --git a/index.php b/index.php index c21b46809..66e236dae 100644 --- a/index.php +++ b/index.php @@ -19,6 +19,7 @@ set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR . get_include_path()); + require_once "autoload.php"; require_once "sessions.php"; require_once "functions.php"; require_once "sanity_check.php"; diff --git a/opml.php b/opml.php index ad866fbd5..709cfd4cc 100644 --- a/opml.php +++ b/opml.php @@ -2,6 +2,7 @@ set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR . get_include_path()); + require_once "autoload.php"; require_once "functions.php"; require_once "sessions.php"; require_once "sanity_check.php"; diff --git a/prefs.php b/prefs.php index 046d5eb76..7a7d2842c 100644 --- a/prefs.php +++ b/prefs.php @@ -12,6 +12,7 @@ exit; } + require_once "autoload.php"; require_once "sessions.php"; require_once "functions.php"; require_once "sanity_check.php"; diff --git a/public.php b/public.php index 1a50538fb..ae6ae44b2 100644 --- a/public.php +++ b/public.php @@ -17,6 +17,7 @@ $_REQUEST = array_map('stripslashes_deep', $_REQUEST); } + require_once "autoload.php"; require_once "sessions.php"; require_once "functions.php"; require_once "sanity_check.php"; diff --git a/register.php b/register.php index 9aec6dde7..d7c60d4f0 100644 --- a/register.php +++ b/register.php @@ -8,7 +8,7 @@ get_include_path()); require_once 'classes/ttrssmailer.php'; - + require_once "autoload.php"; require_once "functions.php"; require_once "sessions.php"; require_once "sanity_check.php"; diff --git a/update.php b/update.php index ffe54cc7c..d9009f965 100755 --- a/update.php +++ b/update.php @@ -7,6 +7,7 @@ chdir(dirname(__FILE__)); + require_once "autoload.php"; require_once "functions.php"; require_once "rssfuncs.php"; require_once "config.php"; diff --git a/update_daemon2.php b/update_daemon2.php index e8a56eec9..6d13add00 100755 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -14,6 +14,7 @@ define('DAEMON_EXTENDED_DEBUG', true); } + require_once "autoload.php"; require_once "functions.php"; require_once "rssfuncs.php"; require_once "sanity_check.php"; -- cgit v1.2.3-54-g00ecf From aca75cb5cb323535099c7aef46a78ea3cec082f2 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 16:05:52 +0400 Subject: reinstate error handlers; better DB error reporting on failed queries --- classes/db.php | 7 +------ classes/db/mysql.php | 6 ++---- classes/db/pgsql.php | 5 ++--- classes/idb.php | 1 - classes/logger/sql.php | 3 ++- include/errorhandler.php | 15 ++++++++++----- 6 files changed, 17 insertions(+), 20 deletions(-) (limited to 'classes/db/mysql.php') diff --git a/classes/db.php b/classes/db.php index 558d3e6b7..c3b627096 100644 --- a/classes/db.php +++ b/classes/db.php @@ -13,11 +13,10 @@ class Db implements IDb { $this->adapter = new Db_Pgsql(); break; default: - user_error("Unknown DB_TYPE: " . DB_TYPE); + die("Unknown DB_TYPE: " . DB_TYPE); } $this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT); - } private function __clone() { @@ -35,10 +34,6 @@ class Db implements IDb { return("'$str'"); } - function init() { - // - } - function connect($host, $user, $pass, $db, $port) { //return $this->adapter->connect($host, $user, $pass, $db, $port); return $this->link; diff --git a/classes/db/mysql.php b/classes/db/mysql.php index 64c35ebdc..241d2a063 100644 --- a/classes/db/mysql.php +++ b/classes/db/mysql.php @@ -25,10 +25,8 @@ class Db_Mysql implements IDb { function query($query, $die_on_error = true) { $result = mysql_query($query, $this->link); if (!$result) { - $query = htmlspecialchars($query); - if ($die_on_error) { - die("Query $query failed: " . ($this->link ? mysql_error($link) : "No connection")); - } + user_error("Query $query failed: " . ($this->link ? mysql_error($this->link) : "No connection"), + $die_on_error ? E_USER_ERROR : E_USER_WARNING); } return $result; } diff --git a/classes/db/pgsql.php b/classes/db/pgsql.php index 0f38fb8cb..bafd54ab2 100644 --- a/classes/db/pgsql.php +++ b/classes/db/pgsql.php @@ -39,9 +39,8 @@ class Db_Pgsql implements IDb { if (!$result) { $query = htmlspecialchars($query); // just in case - if ($die_on_error) { - die("Query $query failed [$result]: " . ($this->link ? pg_last_error($this->link) : "No connection")); - } + user_error("Query $query failed: " . ($this->link ? pg_last_error($this->link) : "No connection"), + $die_on_error ? E_USER_ERROR : E_USER_WARNING); } return $result; } diff --git a/classes/idb.php b/classes/idb.php index 1ca6925b4..16f760bf6 100644 --- a/classes/idb.php +++ b/classes/idb.php @@ -1,7 +1,6 @@ escape_string($errno); $errstr = Db::get()->escape_string($errstr); $file = Db::get()->escape_string($file); @@ -21,8 +22,8 @@ class Logger_SQL { ($errno, '$errstr', '$file', '$line', '$context', $owner_uid, NOW())"); return Db::get()->affected_rows($result) != 0; - } + return false; } diff --git a/include/errorhandler.php b/include/errorhandler.php index 45496b18b..b1a0d3d0c 100644 --- a/include/errorhandler.php +++ b/include/errorhandler.php @@ -1,7 +1,7 @@ log_error($errno, $errstr, $file, $line, $context); + if ($logger->log_error($errno, $errstr, $file, $line, $context)) { + return true; + } } + return false; } + + return false; } -//register_shutdown_function('ttrss_fatal_handler'); -//set_error_handler('ttrss_error_handler'); +register_shutdown_function('ttrss_fatal_handler'); +set_error_handler('ttrss_error_handler'); ?> -- cgit v1.2.3-54-g00ecf From eefaa2df381686f771396baae2d0ae71b345c2e7 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 17:00:24 +0400 Subject: remove db_connect, db_close; CLI fixes --- backend.php | 4 ---- classes/db/mysql.php | 1 + include/db.php | 8 -------- include/errorhandler.php | 4 +++- index.php | 4 ---- opml.php | 4 ---- prefs.php | 4 ---- public.php | 4 ---- register.php | 2 -- update_daemon2.php | 5 ----- 10 files changed, 4 insertions(+), 36 deletions(-) (limited to 'classes/db/mysql.php') diff --git a/backend.php b/backend.php index b06cca2d2..d3d8622d9 100644 --- a/backend.php +++ b/backend.php @@ -48,8 +48,6 @@ $script_started = microtime(true); - $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!init_plugins()) return; header("Content-Type: text/json; charset=utf-8"); @@ -154,6 +152,4 @@ header("Content-Type: text/json"); print json_encode(array("error" => array("code" => 7))); - // We close the connection to database. - db_close(); ?> diff --git a/classes/db/mysql.php b/classes/db/mysql.php index 241d2a063..fe5d05e2f 100644 --- a/classes/db/mysql.php +++ b/classes/db/mysql.php @@ -4,6 +4,7 @@ class Db_Mysql implements IDb { function connect($host, $user, $pass, $db, $port) { $this->link = mysql_connect($host, $user, $pass); + if ($this->link) { $result = mysql_select_db($db, $this->link); if (!$result) { diff --git a/include/db.php b/include/db.php index 11e7312ad..72c78474a 100644 --- a/include/db.php +++ b/include/db.php @@ -1,9 +1,5 @@ connect($host, $user, $pass, $db, 0); -} - function db_escape_string( $s, $strip_tags = true) { return Db::get()->escape_string($s, $strip_tags); } @@ -25,10 +21,6 @@ function db_fetch_result($result, $row, $param) { return Db::get()->fetch_result($result, $row, $param); } -function db_close() { - return Db::get()->close(); -} - function db_affected_rows( $result) { return Db::get()->affected_rows($result); } diff --git a/include/errorhandler.php b/include/errorhandler.php index b1a0d3d0c..2c8d35f83 100644 --- a/include/errorhandler.php +++ b/include/errorhandler.php @@ -6,7 +6,7 @@ require_once "classes/logger/sql.php"; function ttrss_error_handler($errno, $errstr, $file, $line, $context) { global $logger; - if (error_reporting() == 0) return false; + if (error_reporting() == 0 || !$errno) return false; if (!$logger) $logger = new Logger_SQL(); @@ -30,6 +30,8 @@ function ttrss_fatal_handler() { $line = $error["line"]; $errstr = $error["message"]; + if (!$errno) return false; + $context = debug_backtrace(); $file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1); diff --git a/index.php b/index.php index cb95b96f0..d8b584071 100644 --- a/index.php +++ b/index.php @@ -30,8 +30,6 @@ $mobile = new Mobile_Detect(); - $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!init_plugins()) return; global $pluginhost; @@ -285,7 +283,5 @@ - - diff --git a/opml.php b/opml.php index c8fbf1c39..b93221614 100644 --- a/opml.php +++ b/opml.php @@ -10,8 +10,6 @@ require_once "db.php"; require_once "db-prefs.php"; - $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!init_plugins()) return; $op = $_REQUEST['op']; @@ -34,6 +32,4 @@ } } - db_close(); - ?> diff --git a/prefs.php b/prefs.php index 54d5ebad8..826728315 100644 --- a/prefs.php +++ b/prefs.php @@ -20,8 +20,6 @@ require_once "config.php"; require_once "db-prefs.php"; - $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!init_plugins()) return; login_sequence(); @@ -154,7 +152,5 @@ - - diff --git a/public.php b/public.php index fa8ea29b8..6ace943c4 100644 --- a/public.php +++ b/public.php @@ -29,8 +29,6 @@ $script_started = microtime(true); - $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!init_plugins()) return; if (ENABLE_GZIP_OUTPUT && function_exists("ob_gzhandler")) { @@ -61,6 +59,4 @@ header("Content-Type: text/plain"); print json_encode(array("error" => array("code" => 7))); - // We close the connection to database. - db_close(); ?> diff --git a/register.php b/register.php index a8fdb483a..5bc6563b0 100644 --- a/register.php +++ b/register.php @@ -17,8 +17,6 @@ $action = $_REQUEST["action"]; - $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!init_plugins()) return; if ($_REQUEST["format"] == "feed") { diff --git a/update_daemon2.php b/update_daemon2.php index f5e031c9e..a1d7e7d66 100755 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -178,8 +178,6 @@ $schema_version = get_schema_version(); - db_close(); - if ($schema_version != SCHEMA_VERSION) { die("Schema version is wrong, please upgrade the database.\n"); } @@ -199,7 +197,6 @@ /* Check if schema version changed */ - init_plugins(); $test_schema_version = get_schema_version(); if ($test_schema_version != $schema_version) { @@ -289,8 +286,6 @@ } } - db_close(); - // We are in a fork. // We wait a little before exiting to avoid to be faster than our parent process. sleep(1); -- cgit v1.2.3-54-g00ecf From ae35bb87ebcf08007a6086f136b98cba2448d34f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 18:56:13 +0400 Subject: support mysqli when available --- classes/db.php | 8 ++++-- classes/db/mysql.php | 4 ++- classes/db/mysqli.php | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ install/index.php | 2 +- 4 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 classes/db/mysqli.php (limited to 'classes/db/mysql.php') diff --git a/classes/db.php b/classes/db.php index 6dc31a22e..c9d9ad5ea 100644 --- a/classes/db.php +++ b/classes/db.php @@ -7,7 +7,11 @@ class Db implements IDb { private function __construct() { switch (DB_TYPE) { case "mysql": - $this->adapter = new Db_Mysql(); + if (function_exists("mysqli_connect")) { + $this->adapter = new Db_Mysqli(); + } else { + $this->adapter = new Db_Mysql(); + } break; case "pgsql": $this->adapter = new Db_Pgsql(); @@ -16,7 +20,7 @@ class Db implements IDb { die("Unknown DB_TYPE: " . DB_TYPE); } - $this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT); + $this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : false); } private function __clone() { diff --git a/classes/db/mysql.php b/classes/db/mysql.php index fe5d05e2f..aab05aca2 100644 --- a/classes/db/mysql.php +++ b/classes/db/mysql.php @@ -20,6 +20,8 @@ class Db_Mysql implements IDb { } function escape_string($s, $strip_tags = true) { + if ($strip_tags) $s = strip_tags($s); + return mysql_real_escape_string($s, $this->link); } @@ -54,7 +56,7 @@ class Db_Mysql implements IDb { } function last_error() { - return mysql_affected_rows($this->link); + return mysql_error(); } function init() { diff --git a/classes/db/mysqli.php b/classes/db/mysqli.php new file mode 100644 index 000000000..e82f66300 --- /dev/null +++ b/classes/db/mysqli.php @@ -0,0 +1,74 @@ +link = mysqli_connect($host, $user, $pass, $db, $port); + + if ($this->link) { + $this->init(); + + return $this->link; + } else { + die("Unable to connect to database (as $user to $host, database $db): " . mysqli_error()); + } + } + + function escape_string($s, $strip_tags = true) { + if ($strip_tags) $s = strip_tags($s); + + return mysqli_real_escape_string($this->link, $s); + } + + function query($query, $die_on_error = true) { + $result = mysqli_query($this->link, $query); + if (!$result) { + user_error("Query $query failed: " . ($this->link ? mysqli_error($this->link) : "No connection"), + $die_on_error ? E_USER_ERROR : E_USER_WARNING); + } + + return $result; + } + + function fetch_assoc($result) { + return mysqli_fetch_assoc($result); + } + + + function num_rows($result) { + return mysqli_num_rows($result); + } + + function fetch_result($result, $row, $param) { + if (mysqli_data_seek($result, $row)) { + $line = mysqli_fetch_assoc($result); + return $line[$param]; + } else { + return false; + } + } + + function close() { + return mysqli_close($this->link); + } + + function affected_rows($result) { + return mysqli_affected_rows($this->link); + } + + function last_error() { + return mysqli_error(); + } + + function init() { + $this->query("SET time_zone = '+0:0'"); + + if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) { + $this->query("SET NAMES " . MYSQL_CHARSET); + } + + return true; + } + +} +?> diff --git a/install/index.php b/install/index.php index 1aae5da83..99339aca2 100644 --- a/install/index.php +++ b/install/index.php @@ -44,7 +44,7 @@ array_push($errors, "PHP support for JSON is required, but was not found."); } - if ($db_type == "mysql" && !function_exists("mysql_connect")) { + if ($db_type == "mysql" && !function_exists("mysql_connect") && !function_exists("mysqli_connect")) { array_push($errors, "PHP support for MySQL is required for configured $db_type in config.php."); } -- cgit v1.2.3-54-g00ecf