From 58fa1bbc00f1e8ba48ea30332d61bbbe99c21398 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 20 Apr 2011 11:40:41 +0400 Subject: initial schema work on linked instances and shared feedbrowser --- schema/versions/pgsql/84.sql | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 schema/versions/pgsql/84.sql (limited to 'schema/versions/pgsql') diff --git a/schema/versions/pgsql/84.sql b/schema/versions/pgsql/84.sql new file mode 100644 index 000000000..1ff253f73 --- /dev/null +++ b/schema/versions/pgsql/84.sql @@ -0,0 +1,19 @@ +begin; + +create table ttrss_linked_instances (id serial not null primary key, + access_key varchar(250) not null, + access_url text not null); + +create table ttrss_linked_feeds ( + feed_url text not null, + title text not null, + created timestamp not null, + updated timestamp not null, + instance_id integer not null references ttrss_linked_instances(id) ON DELETE CASCADE, + subscribers integer not null); + +drop table ttrss_scheduled_updates; + +update ttrss_version set schema_version = 84; + +commit; -- cgit v1.2.3-54-g00ecf From afb875ccd704dec355b73eecb2ded23f047414d8 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 20 Apr 2011 12:06:30 +0400 Subject: add rpc method to export feedbrowser data; update schema --- modules/backend-rpc.php | 32 ++++++++++++++++++++++++++++++++ schema/ttrss_schema_mysql.sql | 1 + schema/ttrss_schema_pgsql.sql | 1 + schema/versions/mysql/84.sql | 1 + schema/versions/pgsql/84.sql | 1 + 5 files changed, 36 insertions(+) (limited to 'schema/versions/pgsql') diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index f21ca5814..8b4fb04c7 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -834,6 +834,38 @@ return; } + if ($subop == "fbExport") { + + // TODO: change to _POST + $access_key = db_escape_string($_REQUEST["key"]); + + // TODO: rate limit checking using last_connected + $result = db_query($link, "SELECT id FROM ttrss_linked_instances + WHERE access_key = '$access_key'"); + + if (db_num_rows($result) == 1) { + + $instance_id = db_fetch_result($result, 0, "id"); + + $result = db_query($link, "SELECT feed_url, title, subscribers + FROM ttrss_feedbrowser_cache ORDER BY subscribers DESC LIMIT 100"); + + $feeds = array(); + + while ($line = db_fetch_assoc($result)) { + array_push($feeds, $line); + } + + db_query($link, "UPDATE ttrss_linked_instances SET last_connected = NOW() + WHERE id = '$instance_id'"); + + print json_encode(array("feeds" => $feeds)); + } else { + print json_encode(array("error" => array("code" => 6))); + } + return; + } + print json_encode(array("error" => array("code" => 7, "message" => "Unknown method: $subop"))); } diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 2a6e89c8d..91475e602 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -429,6 +429,7 @@ create table ttrss_access_keys (id integer not null primary key auto_increment, foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) TYPE=InnoDB DEFAULT CHARSET=UTF8; create table ttrss_linked_instances (id integer not null primary key auto_increment, + last_connected datetime not null, access_key varchar(250) not null, access_url text not null) TYPE=InnoDB DEFAULT CHARSET=UTF8; diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index d6cc924f0..a7cee5363 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -389,6 +389,7 @@ create table ttrss_access_keys (id serial not null primary key, owner_uid integer not null references ttrss_users(id) on delete cascade); create table ttrss_linked_instances (id serial not null primary key, + last_connected timestamp not null, access_key varchar(250) not null, access_url text not null); diff --git a/schema/versions/mysql/84.sql b/schema/versions/mysql/84.sql index 631daa03b..7a0ccbfb9 100644 --- a/schema/versions/mysql/84.sql +++ b/schema/versions/mysql/84.sql @@ -1,6 +1,7 @@ begin; create table ttrss_linked_instances (id integer not null primary key auto_increment, + last_connected timestamp not null, access_key varchar(250) not null, access_url text not null) TYPE=InnoDB DEFAULT CHARSET=UTF8; diff --git a/schema/versions/pgsql/84.sql b/schema/versions/pgsql/84.sql index 1ff253f73..77212317b 100644 --- a/schema/versions/pgsql/84.sql +++ b/schema/versions/pgsql/84.sql @@ -1,6 +1,7 @@ begin; create table ttrss_linked_instances (id serial not null primary key, + last_connected datetime not null, access_key varchar(250) not null, access_url text not null); -- cgit v1.2.3-54-g00ecf From cfc0647184933b042b9929ede09f52e7d3f3318f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 20 Apr 2011 14:46:53 +0400 Subject: schema: add status codes --- schema/ttrss_schema_mysql.sql | 2 ++ schema/ttrss_schema_pgsql.sql | 2 ++ schema/versions/mysql/84.sql | 2 ++ schema/versions/pgsql/84.sql | 2 ++ 4 files changed, 8 insertions(+) (limited to 'schema/versions/pgsql') diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 91475e602..a3a7b695b 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -430,6 +430,8 @@ create table ttrss_access_keys (id integer not null primary key auto_increment, create table ttrss_linked_instances (id integer not null primary key auto_increment, last_connected datetime not null, + last_status_in integer not null, + last_status_out integer not null, access_key varchar(250) not null, access_url text not null) TYPE=InnoDB DEFAULT CHARSET=UTF8; diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index a7cee5363..1e60d3a1b 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -390,6 +390,8 @@ create table ttrss_access_keys (id serial not null primary key, create table ttrss_linked_instances (id serial not null primary key, last_connected timestamp not null, + last_status_in integer not null, + last_status_out integer not null, access_key varchar(250) not null, access_url text not null); diff --git a/schema/versions/mysql/84.sql b/schema/versions/mysql/84.sql index 7a0ccbfb9..3255d6f56 100644 --- a/schema/versions/mysql/84.sql +++ b/schema/versions/mysql/84.sql @@ -2,6 +2,8 @@ begin; create table ttrss_linked_instances (id integer not null primary key auto_increment, last_connected timestamp not null, + last_status_in integer not null, + last_status_out integer not null, access_key varchar(250) not null, access_url text not null) TYPE=InnoDB DEFAULT CHARSET=UTF8; diff --git a/schema/versions/pgsql/84.sql b/schema/versions/pgsql/84.sql index 77212317b..56c3359c5 100644 --- a/schema/versions/pgsql/84.sql +++ b/schema/versions/pgsql/84.sql @@ -2,6 +2,8 @@ begin; create table ttrss_linked_instances (id serial not null primary key, last_connected datetime not null, + last_status_in integer not null, + last_status_out integer not null, access_key varchar(250) not null, access_url text not null); -- cgit v1.2.3-54-g00ecf