From cf57eb3c5d30042412f11c56e1e9c7b2ac105d91 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 4 Apr 2013 09:01:17 +0400 Subject: all articles: allow archived --- include/functions.php | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/functions.php b/include/functions.php index f4f6ed209..5870649ce 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2412,6 +2412,7 @@ $vfeed_query_part = "ttrss_feeds.title AS feed_title,"; } else if ($feed == -4) { // all articles virtual feed + $allow_archived = true; $query_strategy_part = "true"; $vfeed_query_part = "ttrss_feeds.title AS feed_title,"; } else if ($feed <= LABEL_BASE_INDEX) { // labels -- cgit v1.2.3 From a78cb4b18b44c65084826062e8ee2683e1696d18 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 4 Apr 2013 09:05:59 +0400 Subject: release 1.7.7 --- include/version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/version.php b/include/version.php index a937ea527..edb51075c 100644 --- a/include/version.php +++ b/include/version.php @@ -1,3 +1,3 @@ -- cgit v1.2.3 From 9772c52a629ebccdafb09c50681a23cea1a2e7b5 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 4 Apr 2013 12:21:29 +0400 Subject: fix operation without curl --- include/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/functions.php b/include/functions.php index 5870649ce..02cefd4d8 100644 --- a/include/functions.php +++ b/include/functions.php @@ -318,7 +318,7 @@ global $fetch_last_error; global $fetch_last_error_code; - if (!defined('NO_CURL') && !function_exists('curl_init') && !ini_get("open_basedir")) { + if (!defined('NO_CURL') && function_exists('curl_init') && !ini_get("open_basedir")) { if (ini_get("safe_mode")) { $ch = curl_init(geturl($url)); -- cgit v1.2.3 From 9fb91a20437c0a53a7d6aaf8b020ab051fbf9ce2 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 4 Apr 2013 12:21:37 +0400 Subject: release 1.7.8 --- include/version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/version.php b/include/version.php index edb51075c..61851dffb 100644 --- a/include/version.php +++ b/include/version.php @@ -1,3 +1,3 @@ -- cgit v1.2.3 From 810205625b8afb7e08b2829723426f021e0a5c1b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 4 Apr 2013 12:55:15 +0400 Subject: session validation: check for tt-rss version --- include/functions.php | 1 + include/sessions.php | 3 +++ 2 files changed, 4 insertions(+) (limited to 'include') diff --git a/include/functions.php b/include/functions.php index 02cefd4d8..71fd16542 100644 --- a/include/functions.php +++ b/include/functions.php @@ -630,6 +630,7 @@ @session_start(); $_SESSION["uid"] = $user_id; + $_SESSION["version"] = VERSION; $result = db_query($link, "SELECT login,access_level,pwd_hash FROM ttrss_users WHERE id = '$user_id'"); diff --git a/include/sessions.php b/include/sessions.php index 15178915a..0edda4ec7 100644 --- a/include/sessions.php +++ b/include/sessions.php @@ -5,6 +5,7 @@ require_once "db.php"; require_once "lib/accept-to-gettext.php"; require_once "lib/gettext/gettext.inc"; + require_once "version.php"; $session_expire = max(SESSION_COOKIE_LIFETIME, 86400); $session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME; @@ -38,6 +39,8 @@ if (SINGLE_USER_MODE) return true; if (!$link) return false; + if (VERSION != $_SESSION["version"]) return false; + $check_ip = $_SESSION['ip_address']; switch (SESSION_CHECK_ADDRESS) { -- cgit v1.2.3