new option: FRESH_ARTICLE_MAX_AGE (bump schema)

diff --git a/functions.php b/functions.php
index 272d50c5dd64e00a1317638f515c860517952edd..0de5c1289c70342e44273daa3a343e1fdd2bdfae 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -1648,11 +1648,13 @@
 
                                        if ($feed == -3) {
 
+                                               $intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE");
+
                                                if (DB_TYPE == "pgsql") {
-                                                       $match_part .= " AND date_entered > NOW() - INTERVAL '1 day' "; 
+                                                       $match_part .= " AND date_entered > NOW() - INTERVAL '$intl hour' "; 
                                                } else {
                                                        $match_part .= " AND date_entered > DATE_SUB(NOW(), 
-                                                               INTERVAL 1 DAY) ";
+                                                               INTERVAL $intl HOUR) ";
                                                }
 
                                                db_query($link, "UPDATE ttrss_user_entries 
@@ -1856,10 +1858,12 @@
                } else if ($n_feed == -3) {
                        $match_part = "unread = true";
 
+                       $intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE");
+
                        if (DB_TYPE == "pgsql") {
-                               $match_part .= " AND date_entered > NOW() - INTERVAL '1 day' "; 
+                               $match_part .= " AND date_entered > NOW() - INTERVAL '$intl hour' "; 
                        } else {
-                               $match_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL 1 DAY) ";
+                               $match_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
                        }
 
                } else if ($n_feed > 0) {
@@ -2637,10 +2641,12 @@
                        } else if ($feed == -3) { // fresh virtual feed
                                $query_strategy_part = "unread = true";
 
+                               $intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE");
+
                                if (DB_TYPE == "pgsql") {
-                                       $query_strategy_part .= " AND date_entered > NOW() - INTERVAL '1 day' "; 
+                                       $query_strategy_part .= " AND date_entered > NOW() - INTERVAL '$intl hour' "; 
                                } else {
-                                       $query_strategy_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL 1 DAY) ";
+                                       $query_strategy_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
                                }
 
                                $vfeed_query_part = "ttrss_feeds.title AS feed_title,";

diff --git a/sanity_check.php b/sanity_check.php
index 7d41ea73aee2307a9d13c87fe661daa0ff19dc33..44a3c4f69bbd289cc1718d64331c956d82fc1b98 100644 (file)
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -2,7 +2,7 @@
        require_once "functions.php";
 
        define('EXPECTED_CONFIG_VERSION', 8);
-       define('SCHEMA_VERSION', 20);
+       define('SCHEMA_VERSION', 21);
 
        if (!file_exists("config.php")) {
                print __("<b>Fatal Error</b>: You forgot to copy 

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index dfa489c4268f1c12e9dc70d6a22acf325c36ce9f..f2841a009f4b072d4ff9759bdc6af6fb27a22421 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -196,7 +196,7 @@ create table ttrss_tags (id integer primary key auto_increment,
 
 create table ttrss_version (schema_version int not null) TYPE=InnoDB;
 
-insert into ttrss_version values (20);
+insert into ttrss_version values (21);
 
 create table ttrss_prefs_types (id integer not null primary key, 
        type_name varchar(100) not null) TYPE=InnoDB;
@@ -294,6 +294,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_PUBLISH_KEY', 2, '', '', 1);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('FRESH_ARTICLE_MAX_AGE', 3, '24', 'Maximum age of fresh articles (in hours)',2);
+
 create table ttrss_user_prefs (
    owner_uid integer not null,
    pref_name varchar(250),

diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index f7ad3e4bba21321f74f9ccbd197666cd58fc8386..021e13398016887668a7de2aba01316cb355803f 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -177,7 +177,7 @@ create index ttrss_tags_owner_uid_index on ttrss_tags(owner_uid);
 
 create table ttrss_version (schema_version int not null);
 
-insert into ttrss_version values (20);
+insert into ttrss_version values (21);
 
 create table ttrss_prefs_types (id integer not null primary key, 
        type_name varchar(100) not null);
@@ -271,6 +271,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_PUBLISH_KEY', 2, '', '', 1);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('FRESH_ARTICLE_MAX_AGE', 3, '24', 'Maximum age of fresh articles (in hours)',2);
+
 create table ttrss_user_prefs (
        owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
        pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE,

diff --git a/schema/versions/mysql/21.sql b/schema/versions/mysql/21.sql
new file mode 100644 (file)
index 0000000..f64d822
--- /dev/null
+++ b/schema/versions/mysql/21.sql
@@ -0,0 +1,3 @@
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('FRESH_ARTICLE_MAX_AGE', 3, '24', 'Maximum age of fresh articles (in hours)',2);
+
+update ttrss_version set schema_version = 21;

diff --git a/schema/versions/pgsql/21.sql b/schema/versions/pgsql/21.sql
new file mode 100644 (file)
index 0000000..f64d822
--- /dev/null
+++ b/schema/versions/pgsql/21.sql
@@ -0,0 +1,3 @@
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('FRESH_ARTICLE_MAX_AGE', 3, '24', 'Maximum age of fresh articles (in hours)',2);
+
+update ttrss_version set schema_version = 21;