From: Andrew Dolgov Date: Sun, 23 Dec 2012 19:36:07 +0000 (+0400) Subject: add instances plugin X-Git-Tag: 1.7.0~149 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=6cbe53c9f5e9c369977b737f897a621f00fba90b;p=tt-rss.git add instances plugin --- diff --git a/classes/pluginhost.php b/classes/pluginhost.php index b28d2511..46415bd2 100644 --- a/classes/pluginhost.php +++ b/classes/pluginhost.php @@ -9,6 +9,7 @@ class PluginHost { const HOOK_ARTICLE_FILTER = 2; const HOOK_PREFS_TAB = 3; const HOOK_PREFS_SECTION = 4; + const HOOK_PREFS_TABS = 5; function __construct($link) { $this->link = $link; @@ -77,7 +78,7 @@ class PluginHost { } function add_handler($handler, $method, $sender) { - $handler = strtolower($handler); + $handler = str_replace("-", "_", strtolower($handler)); $method = strtolower($method); if (!is_array($this->handlers[$handler])) { @@ -88,18 +89,22 @@ class PluginHost { } function del_handler($handler, $method) { - $handler = strtolower($handler); + $handler = str_replace("-", "_", strtolower($handler)); $method = strtolower($method); unset($this->handlers[$handler][$method]); } function lookup_handler($handler, $method) { - $handler = strtolower($handler); + $handler = str_replace("-", "_", strtolower($handler)); $method = strtolower($method); if (is_array($this->handlers[$handler])) { - return $this->handlers[$handler][$method]; + if (isset($this->handlers[$handler]["*"])) { + return $this->handlers[$handler]["*"]; + } else { + return $this->handlers[$handler][$method]; + } } return false; diff --git a/classes/pref/instances.php b/classes/pref/instances.php deleted file mode 100644 index 763bb49f..00000000 --- a/classes/pref/instances.php +++ /dev/null @@ -1,223 +0,0 @@ - "Connection failed", - 1 => "Success", - 2 => "Invalid object received", - 16 => "Access denied" ); - - function csrf_ignore($method) { - $csrf_ignored = array("index", "edit"); - - return array_search($method, $csrf_ignored) !== false; - } - - function before($method) { - if (parent::before($method)) { - if ($_SESSION["access_level"] < 10) { - print __("Your access level is insufficient to open this tab."); - return false; - } - return true; - } - return false; - } - - function remove() { - $ids = db_escape_string($_REQUEST['ids']); - - db_query($this->link, "DELETE FROM ttrss_linked_instances WHERE - id IN ($ids)"); - } - - function add() { - $id = db_escape_string($_REQUEST["id"]); - $access_url = db_escape_string($_REQUEST["access_url"]); - $access_key = db_escape_string($_REQUEST["access_key"]); - - db_query($this->link, "BEGIN"); - - $result = db_query($this->link, "SELECT id FROM ttrss_linked_instances - WHERE access_url = '$access_url'"); - - if (db_num_rows($result) == 0) { - db_query($this->link, "INSERT INTO ttrss_linked_instances - (access_url, access_key, last_connected, last_status_in, last_status_out) - VALUES - ('$access_url', '$access_key', '1970-01-01', -1, -1)"); - - } - - db_query($this->link, "COMMIT"); - } - - function edit() { - $id = db_escape_string($_REQUEST["id"]); - - $result = db_query($this->link, "SELECT * FROM ttrss_linked_instances WHERE - id = '$id'"); - - print ""; - print ""; - print ""; - - print "
".__("Instance")."
"; - - print "
"; - - /* URL */ - - $access_url = htmlspecialchars(db_fetch_result($result, 0, "access_url")); - - print __("URL:") . " "; - - print ""; - - print "
"; - - $access_key = htmlspecialchars(db_fetch_result($result, 0, "access_key")); - - /* Access key */ - - print __("Access key:") . " "; - - print ""; - - print "

" . __("Use one access key for both linked instances."); - - 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($this->link, "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 "
"; - - print "
"; - - $sort = db_escape_string($_REQUEST["sort"]); - - if (!$sort || $sort == "undefined") { - $sort = "access_url"; - } - - print "
". - "" . __('Select').""; - print "
"; - print "
".__('All')."
"; - print "
".__('None')."
"; - print "
"; - - print ""; - print ""; - print ""; - - print "
"; #toolbar - - $result = db_query($this->link, "SELECT *, - (SELECT COUNT(*) FROM ttrss_linked_feeds - WHERE instance_id = ttrss_linked_instances.id) AS num_feeds - FROM ttrss_linked_instances - ORDER BY $sort"); - - print "

" . __("You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"); - - print " (display url)"; - - print "

"; - - print " - - - - - - - "; - - $lnum = 0; - - while ($line = db_fetch_assoc($result)) { - $class = ($lnum % 2) ? "even" : "odd"; - - $id = $line['id']; - $this_row_id = "id=\"LIRR-$id\""; - - $line["last_connected"] = make_local_datetime($this->link, $line["last_connected"], false); - - print ""; - - print ""; - - $onclick = "onclick='editInstance($id, event)' title='".__('Click to edit')."'"; - - $access_key = mb_substr($line['access_key'], 0, 4) . '...' . - mb_substr($line['access_key'], -4); - - print ""; - print ""; - print ""; - print ""; - print ""; - - print ""; - - ++$lnum; - } - - print "
 ".__('Instance URL')."".__('Access key')."".__('Last connected')."".__('Status')."".__('Stored feeds')."
" . htmlspecialchars($line['access_url']) . "" . htmlspecialchars($access_key) . "" . htmlspecialchars($line['last_connected']) . "" . $this->status_codes[$line['last_status_out']] . "" . htmlspecialchars($line['num_feeds']) . "
"; - - print "

"; #pane - - global $pluginhost; - $pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB, - "hook_prefs_tab", "prefInstances"); - - print "
"; #container - - } -} -?> diff --git a/js/prefs.js b/js/prefs.js index 51d8412f..4687c60b 100644 --- a/js/prefs.js +++ b/js/prefs.js @@ -24,15 +24,6 @@ function updateFeedList(sort_key) { } }); } -function updateInstanceList(sort_key) { - new Ajax.Request("backend.php", { - parameters: "?op=pref-instances&sort=" + param_escape(sort_key), - onComplete: function(transport) { - dijit.byId('instanceConfigTab').attr('content', transport.responseText); - selectTab("instanceConfig", true); - notify(""); - } }); -} function updateUsersList(sort_key) { try { @@ -1891,162 +1882,6 @@ function insertSSLserial(value) { } } -function getSelectedInstances() { - return getSelectedTableRowIds("prefInstanceList"); -} - -function addInstance() { - try { - var query = "backend.php?op=dlg&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=rpc&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); - } -} - -function editInstance(id, event) { - try { - if (!event || !event.ctrlKey) { - - selectTableRows('prefInstanceList', 'none'); - selectTableRowById('LIRR-'+id, 'LICHK-'+id, true); - - var query = "backend.php?op=pref-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=rpc&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=pref-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 showHelp() { try { new Ajax.Request("backend.php", { diff --git a/plugins/example_routing/example_routing.php b/plugins/example_routing/example_routing.php index a5c4e613..c8d352ac 100644 --- a/plugins/example_routing/example_routing.php +++ b/plugins/example_routing/example_routing.php @@ -9,7 +9,8 @@ class Example_Routing extends Plugin implements IHandler { // Plugin class must implelement IHandler interface and has // a public method of same name as being registered. // - // Any system method may be masked by plugins. + // Any system method may be masked by plugins. You can mask + // entire handler by supplying "*" instead of a method name. private $link; private $host; diff --git a/plugins/instances/README.txt b/plugins/instances/README.txt new file mode 100644 index 00000000..d4e40392 --- /dev/null +++ b/plugins/instances/README.txt @@ -0,0 +1 @@ +Adds support for linking other tt-rss instances diff --git a/plugins/instances/instances.js b/plugins/instances/instances.js new file mode 100644 index 00000000..83213896 --- /dev/null +++ b/plugins/instances/instances.js @@ -0,0 +1,169 @@ +function addInstance() { + try { + var query = "backend.php?op=dlg&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=rpc&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=pref-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=pref-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=rpc&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=pref-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"); +} + + diff --git a/plugins/instances/instances.php b/plugins/instances/instances.php new file mode 100644 index 00000000..c5d8067a --- /dev/null +++ b/plugins/instances/instances.php @@ -0,0 +1,252 @@ + "Connection failed", + 1 => "Success", + 2 => "Invalid object received", + 16 => "Access denied" ); + + function __construct($host) { + $this->link = $host->get_link(); + $this->host = $host; + + $host->add_hook($host::HOOK_PREFS_TABS, $this); + $host->add_handler("pref-instances", "*", $this); + } + + function get_prefs_js() { + return file_get_contents(dirname(__FILE__) . "/instances.js"); + } + + function hook_prefs_tabs($args) { + if ($_SESSION["access_level"] >= 10 || SINGLE_USER_MODE) { + ?>
link, "DELETE FROM ttrss_linked_instances WHERE + id IN ($ids)"); + } + + function add() { + $id = db_escape_string($_REQUEST["id"]); + $access_url = db_escape_string($_REQUEST["access_url"]); + $access_key = db_escape_string($_REQUEST["access_key"]); + + db_query($this->link, "BEGIN"); + + $result = db_query($this->link, "SELECT id FROM ttrss_linked_instances + WHERE access_url = '$access_url'"); + + if (db_num_rows($result) == 0) { + db_query($this->link, "INSERT INTO ttrss_linked_instances + (access_url, access_key, last_connected, last_status_in, last_status_out) + VALUES + ('$access_url', '$access_key', '1970-01-01', -1, -1)"); + + } + + db_query($this->link, "COMMIT"); + } + + function edit() { + $id = db_escape_string($_REQUEST["id"]); + + $result = db_query($this->link, "SELECT * FROM ttrss_linked_instances WHERE + id = '$id'"); + + print ""; + print ""; + print ""; + + print "
".__("Instance")."
"; + + print "
"; + + /* URL */ + + $access_url = htmlspecialchars(db_fetch_result($result, 0, "access_url")); + + print __("URL:") . " "; + + print ""; + + print "
"; + + $access_key = htmlspecialchars(db_fetch_result($result, 0, "access_key")); + + /* Access key */ + + print __("Access key:") . " "; + + print ""; + + print "

" . __("Use one access key for both linked instances."); + + 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($this->link, "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 "
"; + + print "
"; + + $sort = db_escape_string($_REQUEST["sort"]); + + if (!$sort || $sort == "undefined") { + $sort = "access_url"; + } + + print "
". + "" . __('Select').""; + print "
"; + print "
".__('All')."
"; + print "
".__('None')."
"; + print "
"; + + print ""; + print ""; + print ""; + + print "
"; #toolbar + + $result = db_query($this->link, "SELECT *, + (SELECT COUNT(*) FROM ttrss_linked_feeds + WHERE instance_id = ttrss_linked_instances.id) AS num_feeds + FROM ttrss_linked_instances + ORDER BY $sort"); + + print "

" . __("You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"); + + print " (display url)"; + + print "

"; + + print " + + + + + + + "; + + $lnum = 0; + + while ($line = db_fetch_assoc($result)) { + $class = ($lnum % 2) ? "even" : "odd"; + + $id = $line['id']; + $this_row_id = "id=\"LIRR-$id\""; + + $line["last_connected"] = make_local_datetime($this->link, $line["last_connected"], false); + + print ""; + + print ""; + + $onclick = "onclick='editInstance($id, event)' title='".__('Click to edit')."'"; + + $access_key = mb_substr($line['access_key'], 0, 4) . '...' . + mb_substr($line['access_key'], -4); + + print ""; + print ""; + print ""; + print ""; + print ""; + + print ""; + + ++$lnum; + } + + print "
 ".__('Instance URL')."".__('Access key')."".__('Last connected')."".__('Status')."".__('Stored feeds')."
" . htmlspecialchars($line['access_url']) . "" . htmlspecialchars($access_key) . "" . htmlspecialchars($line['last_connected']) . "" . $this->status_codes[$line['last_status_out']] . "" . htmlspecialchars($line['num_feeds']) . "
"; + + print "

"; #pane + + global $pluginhost; + $pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB, + "hook_prefs_tab", "prefInstances"); + + print "
"; #container + + } + +} +?> + diff --git a/prefs.php b/prefs.php index 74bcd4cc..8b554167 100644 --- a/prefs.php +++ b/prefs.php @@ -120,12 +120,10 @@ href="backend.php?op=pref-users" title=""> -= 10 || SINGLE_USER_MODE) { ?> -
- - +run_hooks($pluginhost::HOOK_PREFS_TABS, + "hook_prefs_tabs", false); +?>