new option: CONFIRM_FEED_CATCHUP (closes #106)

diff --git a/functions.php b/functions.php
index e92c638d63c02e5d8c2a2dd4fd2e12c6884b9aad..a80c5bda3d4d052f60bec8673f71820664965164 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -2084,6 +2084,9 @@
                print "<param key=\"feeds_sort_by_unread\" value=\"" . 
                        sprintf("%d", get_pref($link, "FEEDS_SORT_BY_UNREAD")) . "\"/>";
 
+               print "<param key=\"confirm_feed_catchup\" value=\"" . 
+                       sprintf("%d", get_pref($link, "CONFIRM_FEED_CATCHUP")) . "\"/>";
+
                print "</init-params>";
        }
 

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 961abe81158aa5bc919e960270a22d27ebb3ae50..50c3013fb9837083666e7c27fccbb6b51e824f76 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -263,6 +263,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,help_text) values('DIGEST_ENABLE', 1, 'false', 'Enable e-mail digest',1,
 'This option enables sending daily digest of new (and unread) headlines on your configured e-mail address');
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CONFIRM_FEED_CATCHUP', 1, 'true', 'Confirm marking feed as read',3);
+
 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 b08644581723b11c04c56284269a6e823c8c27db..9b4988bbbc63ba8efb0f80ccba8ef2bbd7c31c3d 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -243,6 +243,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,help_text) values('DIGEST_ENABLE', 1, 'false', 'Enable e-mail digest',1,
 'This option enables sending daily digest of new (and unread) headlines on your configured e-mail address');
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CONFIRM_FEED_CATCHUP', 1, 'true', 'Confirm marking feed as read',3);
+
 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/upgrade-1.2.2-1.2.3-mysql.sql b/schema/upgrade-1.2.2-1.2.3-mysql.sql
index 5839e8faafa6a93262ff747a8ef2ce94b0997151..e951f482ffc33731cc1f673b33ad13c60b679511 100644 (file)
--- a/schema/upgrade-1.2.2-1.2.3-mysql.sql
+++ b/schema/upgrade-1.2.2-1.2.3-mysql.sql
@@ -6,5 +6,7 @@ update ttrss_feeds set include_in_digest = true;
 alter table ttrss_feeds change include_in_digest include_in_digest bool not null;
 alter table ttrss_feeds alter column include_in_digest set default true;
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CONFIRM_FEED_CATCHUP', 1, 'true', 'Confirm marking feed as read',3);
+
 update ttrss_version set schema_version = 10;
 

diff --git a/schema/upgrade-1.2.2-1.2.3-pgsql.sql b/schema/upgrade-1.2.2-1.2.3-pgsql.sql
index 9f292ec3d3a05bbd9ed5b3b47ff8afc98c35a1ed..764b4b7632f6b1f1d53ca1b6b374a49d29848202 100644 (file)
--- a/schema/upgrade-1.2.2-1.2.3-pgsql.sql
+++ b/schema/upgrade-1.2.2-1.2.3-pgsql.sql
@@ -6,5 +6,7 @@ update ttrss_feeds set include_in_digest = true;
 alter table ttrss_feeds alter column include_in_digest set not null;
 alter table ttrss_feeds alter column include_in_digest set default true;
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CONFIRM_FEED_CATCHUP', 1, 'true', 'Confirm marking feed as read',3);
+
 update ttrss_version set schema_version = 10;
 

diff --git a/tt-rss.js b/tt-rss.js
index 771114d5b9e07288b5f25945bfc59d3f391e64a3..597dd2fa40367d707714158b923e280330c364c9 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -571,7 +571,7 @@ function catchupCurrentFeed() {
                str = "Mark all articles in this category as read?";
        } */
 
-       if (confirm(str)) {
+       if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
                return viewCurrentFeed('MarkAllRead')
        }
 }