valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

instances: fix a few wrong calls, move genHash method from rpc

This commit is contained in:
Andrew Dolgov 2013-04-02 14:27:15 +04:00
parent c35b6d8e14
commit 76f2113b35
3 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
classes/rpc.php
View File

@ -640,32 +640,6 @@ class RPC extends Handler_Protected {
return; return;
} }
function verifyRegexp() {
$reg_exp = $_REQUEST["reg_exp"];
$status = @preg_match("/$reg_exp/i", "TEST") !== false;
print json_encode(array("status" => $status));
}
/* function buttonPlugin() {
$pclass = "button_" . basename($_REQUEST['plugin']);
$method = $_REQUEST['plugin_method'];
if (class_exists($pclass)) {
$plugin = new $pclass($this->link);
if (method_exists($plugin, $method)) {
return $plugin->$method();
}
}
} */
function genHash() {
$hash = sha1(uniqid(rand(), true));
print json_encode(array("hash" => $hash));
}
function batchAddFeeds() { function batchAddFeeds() {
$cat_id = db_escape_string($this->link, $_REQUEST['cat']); $cat_id = db_escape_string($this->link, $_REQUEST['cat']);
$feeds = explode("\n", db_escape_string($this->link, $_REQUEST['feeds'])); $feeds = explode("\n", db_escape_string($this->link, $_REQUEST['feeds']));

7
plugins/instances/init.php
View File

@ -442,5 +442,12 @@ class Instances extends Plugin implements IHandler {
return; return;
} }
function genHash() {
$hash = sha1(uniqid(rand(), true));
print json_encode(array("hash" => $hash));
}
} }
?> ?>

10
plugins/instances/instances.js
View File

@ -11,7 +11,7 @@ function addInstance() {
style: "width: 600px", style: "width: 600px",
regenKey: function() { regenKey: function() {
new Ajax.Request("backend.php", { new Ajax.Request("backend.php", {
parameters: "?op=rpc&method=genHash", parameters: "op=pluginhandler&plugin=instances&method=genHash",
onComplete: function(transport) { onComplete: function(transport) {
var reply = JSON.parse(transport.responseText); var reply = JSON.parse(transport.responseText);
if (reply) if (reply)
@ -47,7 +47,7 @@ function addInstance() {
function updateInstanceList(sort_key) { function updateInstanceList(sort_key) {
new Ajax.Request("backend.php", { new Ajax.Request("backend.php", {
parameters: "?op=pref-instances&sort=" + param_escape(sort_key), parameters: "op=pluginhandler&plugin=instances&sort=" + param_escape(sort_key),
onComplete: function(transport) { onComplete: function(transport) {
dijit.byId('instanceConfigTab').attr('content', transport.responseText); dijit.byId('instanceConfigTab').attr('content', transport.responseText);
selectTab("instanceConfig", true); selectTab("instanceConfig", true);
@ -62,7 +62,7 @@ function editInstance(id, event) {
selectTableRows('prefInstanceList', 'none'); selectTableRows('prefInstanceList', 'none');
selectTableRowById('LIRR-'+id, 'LICHK-'+id, true); selectTableRowById('LIRR-'+id, 'LICHK-'+id, true);
var query = "backend.php?op=pref-instances&method=edit&id=" + var query = "backend.php?op=pluginhandler&plugin=instances&method=edit&id=" +
param_escape(id); param_escape(id);
if (dijit.byId("instanceEditDlg")) if (dijit.byId("instanceEditDlg"))
@ -74,7 +74,7 @@ function editInstance(id, event) {
style: "width: 600px", style: "width: 600px",
regenKey: function() { regenKey: function() {
new Ajax.Request("backend.php", { new Ajax.Request("backend.php", {
parameters: "?op=rpc&method=genHash", parameters: "op=pluginhandler&plugin=instances&method=genHash",
onComplete: function(transport) { onComplete: function(transport) {
var reply = JSON.parse(transport.responseText); var reply = JSON.parse(transport.responseText);
if (reply) if (reply)
@ -124,7 +124,7 @@ function removeSelectedInstances() {
if (ok) { if (ok) {
notify_progress("Removing selected instances..."); notify_progress("Removing selected instances...");
var query = "?op=pref-instances&method=remove&ids="+ var query = "op=pluginhandler&plugin=instances&method=remove&ids="+
param_escape(sel_rows.toString()); param_escape(sel_rows.toString());
new Ajax.Request("backend.php", { new Ajax.Request("backend.php", {