curl_setopt($ch, CURLOPT_ENCODING, "");
curl_setopt($ch, CURLOPT_REFERER, $url);
+ if (!ini_get("safe_mode") && !ini_get("open_basedir")) {
+ curl_setopt($ch, CURLOPT_COOKIEJAR, "/dev/null");
+ }
+
+ if (defined('_CURL_HTTP_PROXY')) {
+ curl_setopt($ch, CURLOPT_PROXY, _CURL_HTTP_PROXY);
+ }
+
if ($post_query) {
curl_setopt($ch, CURLOPT_POST, true);
curl_setopt($ch, CURLOPT_POSTFIELDS, $post_query);
}
function load_user_plugins($owner_uid) {
- if ($owner_uid) {
+ if ($owner_uid && SCHEMA_VERSION >= 100) {
$plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
PluginHost::getInstance()->load($plugins, PluginHost::KIND_USER, $owner_uid);
if (SINGLE_USER_MODE) {
@session_start();
authenticate_user("admin", null);
+ startup_gettext();
load_user_plugins($_SESSION["uid"]);
} else {
if (!validate_session()) $_SESSION["uid"] = false;
db_query("UPDATE ttrss_user_entries
SET unread = false,last_read = NOW() WHERE (SELECT COUNT(*)
- FROM ttrss_user_labels2 WHERE article_id = ref_id) > 0
- AND unread = true AND $date_qpart AND owner_uid = $owner_uid");
+ FROM ttrss_user_labels2, ttrss_entries WHERE article_id = ref_id AND id = ref_id AND $date_qpart) > 0
+ AND unread = true AND owner_uid = $owner_uid");
}
} else if ($feed > 0) {
$intl = get_pref("FRESH_ARTICLE_MAX_AGE", $owner_uid);
if (DB_TYPE == "pgsql") {
- $match_part .= " AND updated > NOW() - INTERVAL '$intl hour' ";
+ $match_part .= " AND date_entered > NOW() - INTERVAL '$intl hour' ";
} else {
- $match_part .= " AND updated > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
+ $match_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
}
$need_entries = true;
$from_where = "ttrss_entries.id = ttrss_user_entries.ref_id AND";
} else {
$from_qpart = "ttrss_user_entries";
+ $from_where = "";
}
$query = "SELECT count(int_id) AS unread
$search_query_part = "";
- $keywords = explode(" ", $search);
+ $keywords = str_getcsv($search, " ");
$query_keywords = array();
$search_words = array();
}
- $content_query_part = "content, content AS content_preview, ";
+ $content_query_part = "content, ";
if (is_numeric($feed)) {
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
<title>Tiny Tiny RSS - ".$line["title"]."</title>
<link rel=\"stylesheet\" type=\"text/css\" href=\"css/tt-rss.css\">
+ <link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
+ <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">
+
<script type=\"text/javascript\">
function openSelectedAttachment(elem) {
try {
curl_setopt($curl, CURLOPT_TIMEOUT, 60);
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+ if (defined('_CURL_HTTP_PROXY')) {
+ curl_setopt($curl, CURLOPT_PROXY, _CURL_HTTP_PROXY);
+ }
+
if ((OPENSSL_VERSION_NUMBER >= 0x0090808f) && (OPENSSL_VERSION_NUMBER < 0x10000000)) {
curl_setopt($curl, CURLOPT_SSLVERSION, 3);
}