";
+ print "
";
+
+ print "
" . __("Published articles and generated feeds") . "
";
print "
".__('Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below.')."
";
@@ -1519,6 +1521,13 @@
print "
";
+ print "
" . __("Articles shared by URL") . "
";
+
+ print "
" . __("You can disable all articles shared by unique URLs here.") . "
";
+
+ print "
";
+
print "
"; #pane
if (defined('CONSUMER_KEY') && CONSUMER_KEY != '') {
diff --git a/prefs.js b/prefs.js
index 1cf29432..8a2a018e 100644
--- a/prefs.js
+++ b/prefs.js
@@ -1590,6 +1590,24 @@ function clearFeedAccessKeys() {
return false;
}
+function clearArticleAccessKeys() {
+
+ var ok = confirm(__("This will invalidate all previously shared article URLs. Continue?"));
+
+ if (ok) {
+ notify_progress("Clearing URLs...");
+
+ var query = "?op=rpc&subop=clearArticleKeys";
+
+ new Ajax.Request("backend.php", {
+ parameters: query,
+ onComplete: function(transport) {
+ notify_info("Shared URLs cleared.");
+ } });
+ }
+
+ return false;
+}
function resetFeedOrder() {
try {
notify_progress("Loading, please wait...");
diff --git a/sanity_check.php b/sanity_check.php
index 9df2fb04..9009cbc2 100644
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -2,7 +2,7 @@
require_once "functions.php";
define('EXPECTED_CONFIG_VERSION', 23);
- define('SCHEMA_VERSION', 85);
+ define('SCHEMA_VERSION', 86);
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 66f5f4b2..a8f9939d 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -152,6 +152,7 @@ create index ttrss_entries_updated_idx on ttrss_entries(updated);
create table ttrss_user_entries (
int_id integer not null primary key auto_increment,
ref_id integer not null,
+ uuid varchar(200) not null,
feed_id int,
orig_feed_id int,
owner_uid integer not null,
@@ -254,7 +255,7 @@ create table ttrss_tags (id integer primary key auto_increment,
create table ttrss_version (schema_version int not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
-insert into ttrss_version values (85);
+insert into ttrss_version values (86);
create table ttrss_enclosures (id integer primary key auto_increment,
content_url text not null,
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 68742653..b8ede02d 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -137,6 +137,7 @@ create index ttrss_entries_updated_idx on ttrss_entries(updated);
create table ttrss_user_entries (
int_id serial not null primary key,
ref_id integer not null references ttrss_entries(id) ON DELETE CASCADE,
+ uuid varchar(200) not null,
feed_id int references ttrss_feeds(id) ON DELETE CASCADE,
orig_feed_id integer references ttrss_archived_feeds(id) ON DELETE SET NULL,
owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
@@ -225,7 +226,7 @@ create index ttrss_tags_post_int_id_idx on ttrss_tags(post_int_id);
create table ttrss_version (schema_version int not null);
-insert into ttrss_version values (85);
+insert into ttrss_version values (86);
create table ttrss_enclosures (id serial not null primary key,
content_url text not null,
diff --git a/tt-rss.css b/tt-rss.css
index 42b0af15..bc08dd8e 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1,4 +1,4 @@
-body#ttrssMain, body#ttrssPrefs, body#ttrssLogin {
+body#ttrssMain, body#ttrssPrefs, body#ttrssLogin, body {
background : white;
color : black;
margin : 0px;
diff --git a/viewfeed.js b/viewfeed.js
index c36b06a6..1d47c2ad 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -2184,6 +2184,7 @@ function precache_headlines() {
feed_precache_timeout_id = false;
}, 3000);
+ x
}, 1000);
}
@@ -2191,3 +2192,25 @@ function precache_headlines() {
exception_error("precache_headlines", e);
}
}
+
+function shareArticle(id) {
+ try {
+ if (dijit.byId("shareArticleDlg"))
+ dijit.byId("shareArticleDlg").destroyRecursive();
+
+ var query = "backend.php?op=dlg&id=shareArticle¶m=" + param_escape(id);
+
+ dialog = new dijit.Dialog({
+ id: "shareArticleDlg",
+ title: __("Share article by URL"),
+ style: "width: 600px",
+ href: query});
+
+ dialog.show();
+
+ } catch (e) {
+ exception_error("emailArticle", e);
+ }
+}
+
+