public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-14 03:35:56 +00:00
Code Issues Releases Wiki Activity

Rewrote database support to classes, Fixed strict warning in sanitizedummy.php

Browse Source
This commit is contained in:
Markus Birth
2013-03-15 10:51:33 +01:00
parent 22890cceca
commit 65d0cc64a2
7 changed files with 271 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
include/functions.php
View File

@@ -6,14 +6,17 @@
$pluginhost = false;
function __autoload($class) {
$class_file = str_replace("_", "/", strtolower(basename($class)));
$class_file1 = str_replace("_", "/", basename($class)); // PSR-0
$class_file2 = str_replace("_", "/", strtolower(basename($class)));
$file = dirname(__FILE__)."/../classes/$class_file.php";
$file1 = dirname(__FILE__)."/../classes/$class_file1.php";
$file2 = dirname(__FILE__)."/../classes/$class_file2.php";
if (file_exists($file)) {
require $file;
if (file_exists($file1)) {
require $file1;
} elseif (file_exists($file2)) {
require $file2;
}
}
mb_internal_encoding("UTF-8");
@@ -199,8 +202,6 @@
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
@@ -216,9 +217,8 @@
$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,24 +3208,13 @@
}
function init_connection($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);
}
}
global $db;
if ($db) {
$db->init();
global $pluginhost;
$pluginhost = new PluginHost($link);
$pluginhost = new PluginHost($db->getLink());
$pluginhost->load(PLUGINS, $pluginhost::KIND_ALL);
return true;
@@ -3914,4 +3903,4 @@
return in_array($interface, class_implements($class));
}
?>
?>