diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.php | 8 | ||||
| -rw-r--r-- | include/localized_schema.php | 2 | ||||
| -rw-r--r-- | include/rssfuncs.php | 7 | ||||
| -rw-r--r-- | include/sessions.php | 5 |
4 files changed, 17 insertions, 5 deletions
diff --git a/include/functions.php b/include/functions.php index 7d1cf6b9a..039048095 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1,6 +1,6 @@ <?php define('EXPECTED_CONFIG_VERSION', 26); - define('SCHEMA_VERSION', 111); + define('SCHEMA_VERSION', 114); define('LABEL_BASE_INDEX', -1024); define('PLUGIN_FEED_BASE_INDEX', -128); @@ -83,7 +83,8 @@ "pl_PL" => "Polski", "ru_RU" => "Русский", "pt_BR" => "Portuguese/Brazil", - "zh_CN" => "Simplified Chinese"); + "zh_CN" => "Simplified Chinese", + "fi_FI" => "Suomi"); return $tr; } @@ -641,6 +642,7 @@ $_SESSION["uid"]); $_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"]; + $_SESSION["user_agent"] = sha1($_SERVER['HTTP_USER_AGENT']); $_SESSION["pwd_hash"] = db_fetch_result($result, 0, "pwd_hash"); $_SESSION["last_version_check"] = time(); @@ -3213,7 +3215,7 @@ $cat_id = (int)getFeedCategory($link, $feed_id); $result = db_query($link, "SELECT * FROM ttrss_filters2 WHERE - owner_uid = $owner_uid AND enabled = true"); + owner_uid = $owner_uid AND enabled = true ORDER BY order_id, title"); $check_cats = join(",", array_merge( getParentCategories($link, $cat_id, $owner_uid), diff --git a/include/localized_schema.php b/include/localized_schema.php index 674acabcf..51d11f79a 100644 --- a/include/localized_schema.php +++ b/include/localized_schema.php @@ -1,4 +1,4 @@ -<?php # This file has been generated at: Sun Mar 31 12:47:29 MSK 2013 +<?php # This file has been generated at: Mon Apr 1 19:15:55 MSK 2013 __("Title"); __("Title or Content"); diff --git a/include/rssfuncs.php b/include/rssfuncs.php index 5c37b7523..ce197156c 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -283,10 +283,12 @@ _debug("update_rss_feed: fetching [$fetch_url] (ts: $cache_timestamp/$last_updated_timestamp)"); } + $force_refetch = isset($_REQUEST["force_refetch"]); + $feed_data = fetch_file_contents($fetch_url, false, $auth_login, $auth_pass, false, $no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT, - max($last_updated_timestamp, $cache_timestamp)); + $force_refetch ? 0 : max($last_updated_timestamp, $cache_timestamp)); if ($debug_enabled) { _debug("update_rss_feed: fetch done."); @@ -1298,6 +1300,9 @@ if ($filter_match) { foreach ($filter["actions"] AS $action) { array_push($matches, $action); + + // if Stop action encountered, perform no further processing + if ($action["type"] == "stop") return $matches; } } } diff --git a/include/sessions.php b/include/sessions.php index 81a5a7383..dd1ca663d 100644 --- a/include/sessions.php +++ b/include/sessions.php @@ -3,6 +3,8 @@ require_once "config.php"; require_once "db.php"; + require_once "lib/accept-to-gettext.php"; + require_once "lib/gettext/gettext.inc"; $session_expire = max(SESSION_COOKIE_LIFETIME, 86400); $session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME; @@ -57,6 +59,9 @@ if ($_SESSION["ref_schema_version"] != session_get_schema_version($link, true)) return false; + if (sha1($_SERVER['HTTP_USER_AGENT']) != $_SESSION["user_agent"]) + return false; + if ($_SESSION["uid"]) { $result = db_query($link, "SELECT pwd_hash FROM ttrss_users WHERE id = '".$_SESSION["uid"]."'"); |