diff options
author | Andrew Dolgov <[email protected]> | 2013-03-15 19:54:18 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-03-15 19:54:18 +0400 |
commit | 8c0496f74c60e47d9e2f87bb107d79b99c0070aa (patch) | |
tree | 4261c954aebeb4176074c8afc2f40b362ba56b15 /include/functions.php | |
parent | a48d8533bf6a353972248720cf19ffb5ba55041f (diff) |
Revert "Rewrote database support to classes, Fixed strict warning in sanitizedummy.php"
This reverts commit 65d0cc64a2ca1ce259fbba501b13deaf1870e540.
Diffstat (limited to 'include/functions.php')
-rw-r--r-- | include/functions.php | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/include/functions.php b/include/functions.php index 4dc286eb6..54b840329 100644 --- a/include/functions.php +++ b/include/functions.php @@ -6,17 +6,14 @@ $pluginhost = false; function __autoload($class) { - $class_file1 = str_replace("_", "/", basename($class)); // PSR-0 - $class_file2 = str_replace("_", "/", strtolower(basename($class))); + $class_file = str_replace("_", "/", strtolower(basename($class))); - $file1 = dirname(__FILE__)."/../classes/$class_file1.php"; - $file2 = dirname(__FILE__)."/../classes/$class_file2.php"; + $file = dirname(__FILE__)."/../classes/$class_file.php"; - if (file_exists($file1)) { - require $file1; - } elseif (file_exists($file2)) { - require $file2; + if (file_exists($file)) { + require $file; } + } mb_internal_encoding("UTF-8"); @@ -202,6 +199,8 @@ ttrss_entries.date_updated < NOW() - INTERVAL '$purge_interval days'"); } + $rows = pg_affected_rows($result); + } else { /* $result = db_query($link, "DELETE FROM ttrss_user_entries WHERE @@ -217,8 +216,9 @@ $query_limit ttrss_entries.date_updated < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)"); + $rows = mysql_affected_rows($link); + } - $rows = db_affected_rows($link, $result); ccache_update($link, $feed_id, $owner_uid); @@ -952,7 +952,7 @@ } function sql_random_function() { - if (DB_TYPE == "mysql") { + if (DB_TYPE == "mysql") { return "RAND()"; } else { return "RANDOM()"; @@ -3208,13 +3208,24 @@ } function init_connection($link) { - global $db; - if ($db) { - $db->init(); + 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); + } + } global $pluginhost; - $pluginhost = new PluginHost($db->getLink()); + $pluginhost = new PluginHost($link); $pluginhost->load(PLUGINS, $pluginhost::KIND_ALL); return true; @@ -3903,4 +3914,4 @@ return in_array($interface, class_implements($class)); } -?>
\ No newline at end of file +?> |