diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.php | 2 | ||||
| -rw-r--r-- | include/rssfuncs.php | 10 | ||||
| -rw-r--r-- | include/sessions.php | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/include/functions.php b/include/functions.php index 2f3daea10..9b93aed80 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1,6 +1,6 @@ <?php define('EXPECTED_CONFIG_VERSION', 26); - define('SCHEMA_VERSION', 126); + define('SCHEMA_VERSION', 127); define('LABEL_BASE_INDEX', -1024); define('PLUGIN_FEED_BASE_INDEX', -128); diff --git a/include/rssfuncs.php b/include/rssfuncs.php index 4cd0f6888..9d3d89c7f 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -683,6 +683,7 @@ "link" => $entry_link, "tags" => $entry_tags, "author" => $entry_author, + "force_catchup" => false, // ugly hack for the time being "language" => $entry_language, // read only "feed" => array("id" => $feed, "fetch_url" => $fetch_url, @@ -737,6 +738,9 @@ $entry_author = db_escape_string($article["author"]); $entry_link = db_escape_string($article["link"]); $entry_content = $article["content"]; // escaped below + $entry_force_catchup = $article["force_catchup"]; + + _debug("force catchup: $entry_force_catchup"); if ($cache_images && is_writable(CACHE_DIR . '/images')) cache_images($entry_content, $site_url, $debug_enabled); @@ -861,7 +865,7 @@ _debug("user record not found, creating...", $debug_enabled); - if ($score >= -500 && !find_article_filter($article_filters, 'catchup')) { + if ($score >= -500 && !find_article_filter($article_filters, 'catchup') && !$entry_force_catchup) { $unread = 'true'; $last_read_qpart = 'NULL'; } else { @@ -883,7 +887,7 @@ // N-grams - if (DB_TYPE == "pgsql" and defined('_NGRAM_TITLE_DUPLICATE_THRESHOLD')) { + /* if (DB_TYPE == "pgsql" and defined('_NGRAM_TITLE_DUPLICATE_THRESHOLD')) { $result = db_query("SELECT COUNT(*) AS similar FROM ttrss_entries,ttrss_user_entries @@ -898,7 +902,7 @@ if ($ngram_similar > 0) { $unread = 'false'; } - } + } */ $last_marked = ($marked == 'true') ? 'NOW()' : 'NULL'; $last_published = ($published == 'true') ? 'NOW()' : 'NULL'; diff --git a/include/sessions.php b/include/sessions.php index 66214afe7..12925a511 100644 --- a/include/sessions.php +++ b/include/sessions.php @@ -39,7 +39,7 @@ function validate_session() { if (SINGLE_USER_MODE) return true; - if (VERSION_STATIC != $_SESSION["version"]) return false; + //if (VERSION_STATIC != $_SESSION["version"]) return false; $check_ip = $_SESSION['ip_address']; @@ -68,11 +68,11 @@ return false; } - if (sha1($_SERVER['HTTP_USER_AGENT']) != $_SESSION["user_agent"]) { + /* if (sha1($_SERVER['HTTP_USER_AGENT']) != $_SESSION["user_agent"]) { $_SESSION["login_error_msg"] = __("Session failed to validate (user agent changed)"); return false; - } + } */ if ($_SESSION["uid"]) { $result = Db::get()->query( |