From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 1 Apr 2013 08:31:55 +0000 (+0400)
Subject: move addInstance call to instances plugin
X-Git-Tag: 1.7.6~77
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=7a5103ae90370884c31746b778de0bf9b2664431;p=tt-rss.git

move addInstance call to instances plugin
---

diff --git a/classes/dlg.php b/classes/dlg.php
index 36f3ee07..376f8d26 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -383,55 +383,6 @@ class Dlg extends Handler_Protected {
 
 	}
 
-	function addInstance() {
-		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"  name=\"op\" value=\"pref-instances\">";
-		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"  name=\"method\" value=\"add\">";
-
-		print "<div class=\"dlgSec\">".__("Instance")."</div>";
-
-		print "<div class=\"dlgSecCont\">";
-
-		/* URL */
-
-		print __("URL:") . " ";
-
-		print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
-			placeHolder=\"".__("Instance URL")."\"
-			regExp='^(http|https)://.*'
-			style=\"font-size : 16px; width: 20em\" name=\"access_url\">";
-
-		print "<hr/>";
-
-		$access_key = sha1(uniqid(rand(), true));
-
-		/* Access key */
-
-		print __("Access key:") . " ";
-
-		print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
-			placeHolder=\"".__("Access key")."\" regExp='\w{40}'
-			style=\"width: 20em\" name=\"access_key\" id=\"instance_add_key\"
-			value=\"$access_key\">";
-
-		print "<p class='insensitive'>" . __("Use one access key for both linked instances.");
-
-		print "</div>";
-
-		print "<div class=\"dlgButtons\">
-			<div style='float : left'>
-				<button dojoType=\"dijit.form.Button\"
-					onclick=\"return dijit.byId('instanceAddDlg').regenKey()\">".
-					__('Generate new key')."</button>
-			</div>
-			<button dojoType=\"dijit.form.Button\"
-				onclick=\"return dijit.byId('instanceAddDlg').execute()\">".
-				__('Create link')."</button>
-			<button dojoType=\"dijit.form.Button\"
-				onclick=\"return dijit.byId('instanceAddDlg').hide()\"\">".
-				__('Cancel')."</button></div>";
-
-		return;
-	}
 
 	function batchSubscribe() {
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
diff --git a/plugins/instances/init.php b/plugins/instances/init.php
index 6e8d43e9..6a7f7003 100644
--- a/plugins/instances/init.php
+++ b/plugins/instances/init.php
@@ -392,6 +392,55 @@ class Instances extends Plugin implements IHandler {
 		}
 	}
 
+	function addInstance() {
+		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"  name=\"op\" value=\"pref-instances\">";
+		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"  name=\"method\" value=\"add\">";
+
+		print "<div class=\"dlgSec\">".__("Instance")."</div>";
+
+		print "<div class=\"dlgSecCont\">";
+
+		/* URL */
+
+		print __("URL:") . " ";
+
+		print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
+			placeHolder=\"".__("Instance URL")."\"
+			regExp='^(http|https)://.*'
+			style=\"font-size : 16px; width: 20em\" name=\"access_url\">";
+
+		print "<hr/>";
+
+		$access_key = sha1(uniqid(rand(), true));
+
+		/* Access key */
+
+		print __("Access key:") . " ";
+
+		print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
+			placeHolder=\"".__("Access key")."\" regExp='\w{40}'
+			style=\"width: 20em\" name=\"access_key\" id=\"instance_add_key\"
+			value=\"$access_key\">";
+
+		print "<p class='insensitive'>" . __("Use one access key for both linked instances.");
+
+		print "</div>";
+
+		print "<div class=\"dlgButtons\">
+			<div style='float : left'>
+				<button dojoType=\"dijit.form.Button\"
+					onclick=\"return dijit.byId('instanceAddDlg').regenKey()\">".
+					__('Generate new key')."</button>
+			</div>
+			<button dojoType=\"dijit.form.Button\"
+				onclick=\"return dijit.byId('instanceAddDlg').execute()\">".
+				__('Create link')."</button>
+			<button dojoType=\"dijit.form.Button\"
+				onclick=\"return dijit.byId('instanceAddDlg').hide()\"\">".
+				__('Cancel')."</button></div>";
+
+		return;
+	}
 
 }
 ?>
diff --git a/plugins/instances/instances.js b/plugins/instances/instances.js
index 83213896..4a60692b 100644
--- a/plugins/instances/instances.js
+++ b/plugins/instances/instances.js
@@ -1,6 +1,6 @@
 function addInstance() {
 	try {
-		var query = "backend.php?op=dlg&method=addInstance";
+		var query = "backend.php?op=pluginhandler&plugin=instances&method=addInstance";
 
 		if (dijit.byId("instanceAddDlg"))
 			dijit.byId("instanceAddDlg").destroyRecursive();