".__("Error: SQL expression is blank.")."
"; - return; - } - - print "Query returned $num_matches matches$showing_msg:
"; - - $result = db_query($link, - "SELECT ttrss_entries.title, - (SELECT title FROM ttrss_feeds WHERE id = feed_id) AS feed_title - FROM ttrss_entries,ttrss_user_entries,ttrss_feeds - WHERE ($expr) AND - ttrss_user_entries.ref_id = ttrss_entries.id - AND ttrss_user_entries.feed_id = ttrss_feeds.id - AND ttrss_user_entries.owner_uid = " . $_SESSION["uid"] . " - ORDER BY date_entered LIMIT 10", false); - - print "Query didn't return any matches.
"; - } - - print ""; - print " - "; + print "
"; } else { print ""; diff --git a/prefs.js b/prefs.js index 88ebc3ee3..d78e3b9d7 100644 --- a/prefs.js +++ b/prefs.js @@ -135,28 +135,36 @@ function filterlist_callback() { } function labellist_callback() { - var container = document.getElementById('prefContent'); - if (xmlhttp.readyState == 4) { - closeInfoBox(); - container.innerHTML=xmlhttp.responseText; - if (active_label) { - var row = document.getElementById("LILRR-" + active_label); - if (row) { - if (!row.className.match("Selected")) { - row.className = row.className + "Selected"; - } + + try { + + var container = document.getElementById('prefContent'); + if (xmlhttp.readyState == 4) { + closeInfoBox(); + container.innerHTML=xmlhttp.responseText; + + if (document.getElementById("prefLabelList")) { + var elems = document.getElementById("prefLabelList").getElementsByTagName("SPAN"); + + for (var i = 0; i < elems.length; i++) { + if (elems[i].id && elems[i].id.match("LILT-")) { + + var id = elems[i].id.replace("LILT-", ""); + new Ajax.InPlaceEditor(elems[i], + 'backend.php?op=pref-labels&subop=save&id=' + id); + } + } } - var checkbox = document.getElementById("LICHK-" + active_label); - - if (checkbox) { - checkbox.checked = true; + + if (typeof correctPNG != 'undefined') { + correctPNG(); } + notify(""); + remove_splash(); } - if (typeof correctPNG != 'undefined') { - correctPNG(); - } - notify(""); - remove_splash(); + + } catch (e) { + exception_error("labellist_callback", e); } } @@ -304,34 +312,32 @@ function updateUsersList(sort_key) { function addLabel() { + try { + if (!xmlhttp_ready(xmlhttp)) { printLockingError(); return } - var form = document.forms['label_edit_form']; + var caption = prompt(__("Please enter label caption:"), ""); - var sql_exp = form.sql_exp.value; - var description = form.description.value; - - if (sql_exp == "") { - alert(__("Can't create label: missing SQL expression.")); - return false; - } - - if (description == "") { + if (caption == "") { alert(__("Can't create label: missing caption.")); return false; } - var query = Form.serialize("label_edit_form"); - // we can be called from some other tab active_tab = "labelConfig"; + var query = "caption=" + param_escape(caption); + xmlhttp.open("GET", "backend.php?op=pref-labels&subop=add&" + query, true); xmlhttp.onreadystatechange=infobox_submit_callback; xmlhttp.send(null); + + } catch (e) { + exception_error("addLabel", e); + } } function addFeed() { @@ -1834,10 +1840,10 @@ function pref_hotkey_handler(e) { return false; } - if (keycode == 76) { // l +/* if (keycode == 76) { // l displayDlg("quickAddLabel"); return false; - } + } */ if (keycode == 85) { // u // no-op diff --git a/prefs.php b/prefs.php index 68beff4c2..72500d87a 100644 --- a/prefs.php +++ b/prefs.php @@ -140,10 +140,8 @@ window.onload = init; onclick="selectTab('pubItems')"> -->
- - = 10) { ?> diff --git a/sanity_check.php b/sanity_check.php index 0ba47b064..b9c8c333f 100644 --- a/sanity_check.php +++ b/sanity_check.php @@ -2,7 +2,7 @@ require_once "functions.php"; define('EXPECTED_CONFIG_VERSION', 17); - define('SCHEMA_VERSION', 50); + define('SCHEMA_VERSION', 51); if (!file_exists("config.php")) { print __("Fatal Error: You forgot to copy diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 4d081db0f..9bfb0a075 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -189,6 +189,9 @@ insert into ttrss_filter_actions (id,name,description) values (5, 'publish', insert into ttrss_filter_actions (id,name,description) values (6, 'score', 'Modify score'); +insert into ttrss_filter_actions (id,name,description) values (7, 'label', + 'Assign label'); + create table ttrss_filters (id integer not null primary key auto_increment, owner_uid integer not null, feed_id integer default null, @@ -232,7 +235,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 (50); +insert into ttrss_version values (51); create table ttrss_enclosures (id serial not null primary key, content_url text not null, @@ -389,4 +392,16 @@ create table ttrss_feedbrowser_cache ( feed_url text not null, subscribers integer not null); +create table ttrss_labels2 (id integer not null primary key auto_increment, + owner_uid integer not null, + caption varchar(250) not null, + foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE +) TYPE=InnoDB; + +create table ttrss_user_labels2 (label_id integer not null, + article_id integer not null, + foreign key (label_id) references ttrss_labels2(id) ON DELETE CASCADE, + foreign key (article_id) references ttrss_entries(id) ON DELETE CASCADE +) TYPE=InnoDB; + commit; diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index 319e64211..9778a044f 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -1,3 +1,5 @@ +drop table ttrss_user_labels2; +drop table ttrss_labels2; drop table ttrss_feedbrowser_cache; drop table ttrss_version; drop table ttrss_labels; @@ -175,6 +177,9 @@ insert into ttrss_filter_actions (id,name,description) values (5, 'publish', insert into ttrss_filter_actions (id,name,description) values (6, 'score', 'Modify score'); +insert into ttrss_filter_actions (id,name,description) values (7, 'label', + 'Assign label'); + 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, @@ -208,7 +213,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 (50); +insert into ttrss_version values (51); create table ttrss_enclosures (id serial not null primary key, content_url text not null, @@ -358,4 +363,14 @@ create table ttrss_feedbrowser_cache ( feed_url text not null primary key, subscribers integer not null); +create table ttrss_labels2 (id serial not null primary key, + owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE, + caption varchar(250) not null +); + +create table ttrss_user_labels2 ( + label_id integer not null references ttrss_labels2(id) ON DELETE CASCADE, + article_id integer not null references ttrss_entries(id) ON DELETE CASCADE +); + commit; diff --git a/schema/versions/mysql/51.sql b/schema/versions/mysql/51.sql new file mode 100644 index 000000000..46d0543ff --- /dev/null +++ b/schema/versions/mysql/51.sql @@ -0,0 +1,16 @@ +create table ttrss_labels2 (id integer not null primary key auto_increment, + owner_uid integer not null, + caption varchar(250) not null, + foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE +) TYPE=InnoDB; + +create table ttrss_user_labels2 (label_id integer not null, + article_id integer not null, + foreign key (label_id) references ttrss_labels2(id) ON DELETE CASCADE, + foreign key (article_id) references ttrss_entries(id) ON DELETE CASCADE +) TYPE=InnoDB; + +insert into ttrss_filter_actions (id,name,description) values (7, 'label', + 'Assign label'); + +update ttrss_version set schema_version = 51; diff --git a/schema/versions/pgsql/51.sql b/schema/versions/pgsql/51.sql new file mode 100644 index 000000000..dd566072b --- /dev/null +++ b/schema/versions/pgsql/51.sql @@ -0,0 +1,18 @@ +begin; + +create table ttrss_labels2 (id serial not null primary key, + owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE, + caption varchar(250) not null +); + +create table ttrss_user_labels2 ( + label_id integer not null references ttrss_labels2(id) ON DELETE CASCADE, + article_id integer not null references ttrss_entries(id) ON DELETE CASCADE +); + +insert into ttrss_filter_actions (id,name,description) values (7, 'label', + 'Assign label'); + +update ttrss_version set schema_version = 51; + +commit; diff --git a/viewfeed.js b/viewfeed.js index c7194ab1b..a93f886de 100644 --- a/viewfeed.js +++ b/viewfeed.js @@ -1159,31 +1159,6 @@ function catchupSelection() { } } - -function labelFromSearch(search, search_mode, match_on, feed_id, is_cat) { - - if (!xmlhttp_ready(xmlhttp_rpc)) { - printLockingError(); - } - - var title = prompt(__("Please enter label title:"), ""); - - if (title) { - - var query = "backend.php?op=labelFromSearch&search=" + param_escape(search) + - "&smode=" + param_escape(search_mode) + "&match=" + param_escape(match_on) + - "&feed=" + param_escape(feed_id) + "&is_cat=" + param_escape(is_cat) + - "&title=" + param_escape(title); - - debug("LFS: " + query); - - new Ajax.Request(query, { - onComplete: function(transport) { - dlg_frefresh_callback(transport); - } }); - } -} - function editArticleTags(id, feed_id, cdm_enabled) { _tag_active_post_id = id; _tag_active_feed_id = feed_id;