new filter action: set starred, rename add filter button

diff --git a/backend.php b/backend.php
index 7fe0dddab486c1e2d0e4aa69218cc7786231d675..3a62fe68404ece76f6facffa2c846a76daf7e313 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -2284,7 +2284,7 @@
 
                print "<input type=\"submit\" 
                        class=\"button\" onclick=\"javascript:addFilter()\" 
-                       value=\"Add filter\">";
+                       value=\"Create filter\">";
 
                print "</div>";
 

diff --git a/functions.php b/functions.php
index e11eafcb24ed1c177a9692827e110b7aac7ce0db..06b142d73fb5fe3f12a02ee3618d82642e9fab07 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -529,12 +529,18 @@
                                                        $unread = 'false';
                                                        $last_read_qpart = 'NOW()';
                                                }                                               
+
+                                               if ($filter_name == 'mark') {
+                                                       $marked = 'true';
+                                               } else {
+                                                       $marked = 'false';
+                                               }
                                                
                                                $result = db_query($link,
                                                        "INSERT INTO ttrss_user_entries 
-                                                               (ref_id, owner_uid, feed_id, unread, last_read) 
+                                                               (ref_id, owner_uid, feed_id, unread, last_read, marked) 
                                                        VALUES ('$ref_id', '$owner_uid', '$feed', $unread,
-                                                               $last_read_qpart)");
+                                                               $last_read_qpart, $marked)");
                                        }
                                        
                                        $post_needs_update = false;

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index d53eb60cdee8720cc9b2c58cad3f7c6921e285df..e1d61009c4dc4f71315634ca82d96f64061cad58 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -137,6 +137,9 @@ insert into ttrss_filter_actions (id,name,description) values (1, 'filter',
 insert into ttrss_filter_actions (id,name,description) values (2, 'catchup', 
        'Mark as read');
 
+insert into ttrss_filter_actions (id,name,description) values (3, 'mark', 
+       'Set starred');
+
 create table ttrss_filters (id integer not null primary key auto_increment,
        owner_uid integer not null, 
        feed_id integer default null,

diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index b8c813c4762c4b397bc8982069f23e7f5fd3708e..1726ecc8e9fb0896e4596e726af86557816b7c46 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -131,6 +131,9 @@ insert into ttrss_filter_actions (id,name,description) values (1, 'filter',
 insert into ttrss_filter_actions (id,name,description) values (2, 'catchup', 
        'Mark as read');
 
+insert into ttrss_filter_actions (id,name,description) values (3, 'mark', 
+       'Set starred');
+
 create table ttrss_filters (id serial not null primary key,    
        owner_uid integer not null references ttrss_users(id) on delete cascade,
        feed_id integer references ttrss_feeds(id) on delete cascade default null,

diff --git a/schema/upgrade-1.1.5-1.1.7-mysql.sql b/schema/upgrade-1.1.5-1.1.7-mysql.sql
index aa74eb34357b84abcea3c05104636c0ae5add156..bfccc3358f78115db982681092c9f9de23f08d34 100644 (file)
--- a/schema/upgrade-1.1.5-1.1.7-mysql.sql
+++ b/schema/upgrade-1.1.5-1.1.7-mysql.sql
@@ -3,5 +3,8 @@ insert into ttrss_themes (theme_name, theme_path) values ('Old-skool', 'compat')
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ON_CATCHUP_SHOW_NEXT_FEED', 1, 'false', 'On catchup show next feed',2,
        'When "Mark as read" button is clicked in toolbar, automatically open next feed with unread articles.');
 
+insert into ttrss_filter_actions (id,name,description) values (3, 'mark', 
+       'Set starred');
+
 update ttrss_version set schema_version = 8;
 

diff --git a/schema/upgrade-1.1.5-1.1.7-pgsql.sql b/schema/upgrade-1.1.5-1.1.7-pgsql.sql
index 88b1ecf358c7b789e07d0a8301fb0dd10e5b0fe3..4a2237a3f778f73c98ee535970b9c1787559a899 100644 (file)
--- a/schema/upgrade-1.1.5-1.1.7-pgsql.sql
+++ b/schema/upgrade-1.1.5-1.1.7-pgsql.sql
@@ -5,6 +5,9 @@ insert into ttrss_themes (theme_name, theme_path) values ('Old-skool', 'compat')
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ON_CATCHUP_SHOW_NEXT_FEED', 1, 'false', 'On catchup show next feed',2,
        'When "Mark as read" button is clicked in toolbar, automatically open next feed with unread articles.');
 
+insert into ttrss_filter_actions (id,name,description) values (3, 'mark', 
+       'Set starred');
+
 update ttrss_version set schema_version = 8;
 
 commit;