diff options
author | Andrew Dolgov <[email protected]> | 2013-04-02 14:27:15 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-04-02 14:27:15 +0400 |
commit | 76f2113b359d3c488cc3a149237908cb3bbb535f (patch) | |
tree | 565181428d240e7b44f521698b6658a267eb8728 /plugins/instances | |
parent | c35b6d8e14fd930128cd70c7dc46bef9e1c39d9d (diff) |
instances: fix a few wrong calls, move genHash method from rpc
Diffstat (limited to 'plugins/instances')
-rw-r--r-- | plugins/instances/init.php | 7 | ||||
-rw-r--r-- | plugins/instances/instances.js | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/plugins/instances/init.php b/plugins/instances/init.php index 6a7f7003a..7f822c7bf 100644 --- a/plugins/instances/init.php +++ b/plugins/instances/init.php @@ -442,5 +442,12 @@ class Instances extends Plugin implements IHandler { return; } + function genHash() { + $hash = sha1(uniqid(rand(), true)); + + print json_encode(array("hash" => $hash)); + } + + } ?> diff --git a/plugins/instances/instances.js b/plugins/instances/instances.js index 4a60692b3..f699acf72 100644 --- a/plugins/instances/instances.js +++ b/plugins/instances/instances.js @@ -11,7 +11,7 @@ function addInstance() { style: "width: 600px", regenKey: function() { new Ajax.Request("backend.php", { - parameters: "?op=rpc&method=genHash", + parameters: "op=pluginhandler&plugin=instances&method=genHash", onComplete: function(transport) { var reply = JSON.parse(transport.responseText); if (reply) @@ -47,7 +47,7 @@ function addInstance() { function updateInstanceList(sort_key) { 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) { dijit.byId('instanceConfigTab').attr('content', transport.responseText); selectTab("instanceConfig", true); @@ -62,7 +62,7 @@ function editInstance(id, event) { selectTableRows('prefInstanceList', 'none'); 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); if (dijit.byId("instanceEditDlg")) @@ -74,7 +74,7 @@ function editInstance(id, event) { style: "width: 600px", regenKey: function() { new Ajax.Request("backend.php", { - parameters: "?op=rpc&method=genHash", + parameters: "op=pluginhandler&plugin=instances&method=genHash", onComplete: function(transport) { var reply = JSON.parse(transport.responseText); if (reply) @@ -124,7 +124,7 @@ function removeSelectedInstances() { if (ok) { 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()); new Ajax.Request("backend.php", { |