diff --git a/plugins/instances/init.php b/plugins/instances/init.php
deleted file mode 100644
index 7b65d6d4a..000000000
--- a/plugins/instances/init.php
+++ /dev/null
@@ -1,460 +0,0 @@
- "Connection failed",
- 1 => "Success",
- 2 => "Invalid object received",
- 16 => "Access denied" );
-
- function about() {
- return array(1.0,
- "Support for linking tt-rss instances together and sharing popular feeds.",
- "fox",
- true);
- }
-
- function init($host) {
- $this->host = $host;
-
- $host->add_hook($host::HOOK_PREFS_TABS, $this);
- $host->add_handler("pref-instances", "*", $this);
- $host->add_handler("public", "fbexport", $this);
- $host->add_command("get-feeds", "receive popular feeds from linked instances", $this);
- $host->add_hook($host::HOOK_UPDATE_TASK, $this);
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- */
- function hook_update_task($args) {
- _debug("Get linked feeds...");
- $this->get_linked_feeds();
- }
-
- // Status codes:
- // -1 - never connected
- // 0 - no data received
- // 1 - data received successfully
- // 2 - did not receive valid data
- // >10 - server error, code + 10 (e.g. 16 means server error 6)
-
- function get_linked_feeds($instance_id = false) {
- if ($instance_id)
- $instance_qpart = "id = '$instance_id' AND ";
- else
- $instance_qpart = "";
-
- if (DB_TYPE == "pgsql") {
- $date_qpart = "last_connected < NOW() - INTERVAL '6 hours'";
- } else {
- $date_qpart = "last_connected < DATE_SUB(NOW(), INTERVAL 6 HOUR)";
- }
-
- $result = db_query("SELECT id, access_key, access_url FROM ttrss_linked_instances
- WHERE $instance_qpart $date_qpart ORDER BY last_connected");
-
- while ($line = db_fetch_assoc($result)) {
- $id = $line['id'];
-
- _debug("Updating: " . $line['access_url'] . " ($id)");
-
- $fetch_url = $line['access_url'] . '/public.php?op=fbexport';
- $post_query = 'key=' . $line['access_key'];
-
- $feeds = fetch_file_contents($fetch_url, false, false, false, $post_query);
-
- // try doing it the old way
- if (!$feeds) {
- $fetch_url = $line['access_url'] . '/backend.php?op=fbexport';
- $feeds = fetch_file_contents($fetch_url, false, false, false, $post_query);
- }
-
- if ($feeds) {
- $feeds = json_decode($feeds, true);
-
- if ($feeds) {
- if ($feeds['error']) {
- $status = $feeds['error']['code'] + 10;
-
- // access denied
- if ($status == 16) {
- db_query("DELETE FROM ttrss_linked_feeds
- WHERE instance_id = '$id'");
- }
- } else {
- $status = 1;
-
- if (count($feeds['feeds']) > 0) {
-
- db_query("DELETE FROM ttrss_linked_feeds
- WHERE instance_id = '$id'");
-
- foreach ($feeds['feeds'] as $feed) {
- $feed_url = db_escape_string($feed['feed_url']);
- $title = db_escape_string($feed['title']);
- $subscribers = db_escape_string($feed['subscribers']);
- $site_url = db_escape_string($feed['site_url']);
-
- db_query("INSERT INTO ttrss_linked_feeds
- (feed_url, site_url, title, subscribers, instance_id, created, updated)
- VALUES
- ('$feed_url', '$site_url', '$title', '$subscribers', '$id', NOW(), NOW())");
- }
- } else {
- // received 0 feeds, this might indicate that
- // the instance on the other hand is rebuilding feedbrowser cache
- // we will try again later
-
- // TODO: maybe perform expiration based on updated here?
- }
-
- _debug("Processed " . count($feeds['feeds']) . " feeds.");
- }
- } else {
- $status = 2;
- }
-
- } else {
- $status = 0;
- }
-
- _debug("Status: $status");
-
- db_query("UPDATE ttrss_linked_instances SET
- last_status_out = '$status', last_connected = NOW() WHERE id = '$id'");
-
- }
- }
-
-
- function get_feeds() {
- $this->get_linked_feeds(false);
- }
-
- function get_prefs_js() {
- return file_get_contents(dirname(__FILE__) . "/instances.js");
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- */
- function hook_prefs_tabs($args) {
- if ($_SESSION["access_level"] >= 10 || SINGLE_USER_MODE) {
- ?>".__("Instance")."";
-
- print "";
-
- print "";
-
- }
-
- function editSave() {
- $id = db_escape_string($_REQUEST["id"]);
- $access_url = db_escape_string($_REQUEST["access_url"]);
- $access_key = db_escape_string($_REQUEST["access_key"]);
-
- db_query("UPDATE ttrss_linked_instances SET
- access_key = '$access_key', access_url = '$access_url',
- last_connected = '1970-01-01'
- WHERE id = '$id'");
-
- }
-
- function index() {
-
- if (!function_exists('curl_init')) {
- print "";
- print_error("This functionality requires CURL functions. Please enable CURL in your PHP configuration (you might also want to disable open_basedir in php.ini) and reload this page.");
- print "
";
- }
-
- print "";
- print ""; #pane
-
- PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
- "hook_prefs_tab", "prefInstances");
-
- print "
"; #container
-
- }
-
- function fbexport() {
-
- $access_key = db_escape_string($_POST["key"]);
-
- // TODO: rate limit checking using last_connected
- $result = db_query("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("SELECT feed_url, site_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("UPDATE ttrss_linked_instances SET
- last_status_in = 1 WHERE id = '$instance_id'");
-
- print json_encode(array("feeds" => $feeds));
- } else {
- print error_json(6);
- }
- }
-
- function addInstance() {
- print_hidden("op", "pref-instances");
- print_hidden("method", "add");
-
- print "".__("Instance")."
";
-
- print "";
-
- print "";
-
- return;
- }
-
- function genHash() {
- $hash = uniqid_short();
-
- print json_encode(array("hash" => $hash));
- }
-
- function api_version() {
- return 2;
- }
-
-}
diff --git a/plugins/instances/instances.js b/plugins/instances/instances.js
deleted file mode 100644
index f699acf72..000000000
--- a/plugins/instances/instances.js
+++ /dev/null
@@ -1,169 +0,0 @@
-function addInstance() {
- try {
- var query = "backend.php?op=pluginhandler&plugin=instances&method=addInstance";
-
- if (dijit.byId("instanceAddDlg"))
- dijit.byId("instanceAddDlg").destroyRecursive();
-
- dialog = new dijit.Dialog({
- id: "instanceAddDlg",
- title: __("Link Instance"),
- style: "width: 600px",
- regenKey: function() {
- new Ajax.Request("backend.php", {
- parameters: "op=pluginhandler&plugin=instances&method=genHash",
- onComplete: function(transport) {
- var reply = JSON.parse(transport.responseText);
- if (reply)
- dijit.byId('instance_add_key').attr('value', reply.hash);
-
- } });
- },
- execute: function() {
- if (this.validate()) {
- console.warn(dojo.objectToQuery(this.attr('value')));
-
- notify_progress('Saving data...', true);
- new Ajax.Request("backend.php", {
- parameters: dojo.objectToQuery(this.attr('value')),
- onComplete: function(transport) {
- dialog.hide();
- notify('');
- updateInstanceList();
- } });
- }
- },
- href: query,
- });
-
- dialog.show();
-
- } catch (e) {
- exception_error("addInstance", e);
- }
-}
-
-// *** INS ***
-
-function updateInstanceList(sort_key) {
- new Ajax.Request("backend.php", {
- parameters: "op=pluginhandler&plugin=instances&sort=" + param_escape(sort_key),
- onComplete: function(transport) {
- dijit.byId('instanceConfigTab').attr('content', transport.responseText);
- selectTab("instanceConfig", true);
- notify("");
- } });
-}
-
-function editInstance(id, event) {
- try {
- if (!event || !event.ctrlKey) {
-
- selectTableRows('prefInstanceList', 'none');
- selectTableRowById('LIRR-'+id, 'LICHK-'+id, true);
-
- var query = "backend.php?op=pluginhandler&plugin=instances&method=edit&id=" +
- param_escape(id);
-
- if (dijit.byId("instanceEditDlg"))
- dijit.byId("instanceEditDlg").destroyRecursive();
-
- dialog = new dijit.Dialog({
- id: "instanceEditDlg",
- title: __("Edit Instance"),
- style: "width: 600px",
- regenKey: function() {
- new Ajax.Request("backend.php", {
- parameters: "op=pluginhandler&plugin=instances&method=genHash",
- onComplete: function(transport) {
- var reply = JSON.parse(transport.responseText);
- if (reply)
- dijit.byId('instance_edit_key').attr('value', reply.hash);
-
- } });
- },
- execute: function() {
- if (this.validate()) {
-// console.warn(dojo.objectToQuery(this.attr('value')));
-
- notify_progress('Saving data...', true);
- new Ajax.Request("backend.php", {
- parameters: dojo.objectToQuery(this.attr('value')),
- onComplete: function(transport) {
- dialog.hide();
- notify('');
- updateInstanceList();
- } });
- }
- },
- href: query,
- });
-
- dialog.show();
-
- } else if (event.ctrlKey) {
- var cb = $('LICHK-' + id);
- cb.checked = !cb.checked;
- toggleSelectRow(cb);
- }
-
-
- } catch (e) {
- exception_error("editInstance", e);
- }
-}
-
-function removeSelectedInstances() {
- try {
- var sel_rows = getSelectedInstances();
-
- if (sel_rows.length > 0) {
-
- var ok = confirm(__("Remove selected instances?"));
-
- if (ok) {
- notify_progress("Removing selected instances...");
-
- var query = "op=pluginhandler&plugin=instances&method=remove&ids="+
- param_escape(sel_rows.toString());
-
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function(transport) {
- notify('');
- updateInstanceList();
- } });
- }
-
- } else {
- alert(__("No instances are selected."));
- }
-
- } catch (e) {
- exception_error("removeInstance", e);
- }
-}
-
-function editSelectedInstance() {
- var rows = getSelectedInstances();
-
- if (rows.length == 0) {
- alert(__("No instances are selected."));
- return;
- }
-
- if (rows.length > 1) {
- alert(__("Please select only one instance."));
- return;
- }
-
- notify("");
-
- editInstance(rows[0]);
-}
-
-function getSelectedInstances() {
- return getSelectedTableRowIds("prefInstanceList");
-}
-
-