From 39c0fe3697c71e9cfeec74c020b0c31fca376dc0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 18 Feb 2021 12:27:26 +0300
Subject: [PATCH] shorten many invocations of Ajax.Request in inline form
 methods

---
 classes/pref/prefs.php          | 137 ++++++++++++++------------------
 plugins/af_readability/init.php |  16 ++--
 plugins/af_redditimgur/init.php |  13 ++-
 plugins/mail/init.php           |  14 ++--
 plugins/nsfw/init.php           |  10 +--
 5 files changed, 78 insertions(+), 112 deletions(-)

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 4a4aa45d6..b760affa0 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -291,18 +291,14 @@ class Pref_Prefs extends Handler_Protected {
 			<?= \Controls\hidden_tag("op", "pref-prefs") ?>
 			<?= \Controls\hidden_tag("method", "changeemail") ?>
 
-			<script type='dojo/method' event='onSubmit' args='evt'>
-				evt.preventDefault();
-				if (this.validate()) {
-					Notify.progress('Saving data...', true);
-
-					new Ajax.Request('backend.php', {
-						parameters: dojo.objectToQuery(this.getValues()),
-						onComplete: function(transport) {
+			<script type="dojo/method" event="onSubmit" args="evt">
+					evt.preventDefault();
+					if (this.validate()) {
+						Notify.progress('Saving data...', true);
+						xhrPost("backend.php", this.getValues(), (transport) => {
 							Notify.info(transport.responseText);
-						}
-					});
-				}
+						})
+					}
 			</script>
 
 			<fieldset>
@@ -350,32 +346,28 @@ class Pref_Prefs extends Handler_Protected {
 				<?= \Controls\hidden_tag("op", "pref-prefs") ?>
 				<?= \Controls\hidden_tag("method", "changepassword") ?>
 
-				<script type='dojo/method' event='onSubmit' args='evt'>
+				<!-- TODO: return JSON the backend call -->
+				<script type="dojo/method" event="onSubmit" args="evt">
 					evt.preventDefault();
 					if (this.validate()) {
-						Notify.progress('Changing password...', true);
+						Notify.progress('Saving data...', true);
+						xhrPost("backend.php", this.getValues(), (transport) => {
+							Notify.close();
+							if (transport.responseText.indexOf('ERROR: ') == 0) {
 
-						new Ajax.Request('backend.php', {
-							parameters: dojo.objectToQuery(this.getValues()),
-							onComplete: function(transport) {
-								Notify.close();
-								if (transport.responseText.indexOf('ERROR: ') == 0) {
+								$('pwd_change_infobox').innerHTML =
+									transport.responseText.replace('ERROR: ', '');
 
-									$('pwd_change_infobox').innerHTML =
-										transport.responseText.replace('ERROR: ', '');
+							} else {
+								$('pwd_change_infobox').innerHTML =
+									transport.responseText.replace('ERROR: ', '');
 
-								} else {
-									$('pwd_change_infobox').innerHTML =
-										transport.responseText.replace('ERROR: ', '');
-
-									const warn = $('default_pass_warning');
-									if (warn) Element.hide(warn);
-								}
-
-								new Effect.Appear('pwd_change_infobox');
+								const warn = $('default_pass_warning');
+								if (warn) Element.hide(warn);
 							}
-						});
-						this.reset();
+
+							new Effect.Appear('pwd_change_infobox');
+						})
 					}
 				</script>
 
@@ -459,23 +451,20 @@ class Pref_Prefs extends Handler_Protected {
 					<?= \Controls\hidden_tag("op", "pref-prefs") ?>
 					<?= \Controls\hidden_tag("method", "otpdisable") ?>
 
-					<script type='dojo/method' event='onSubmit' args='evt'>
+					<!-- TODO: return JSON from the backend call -->
+					<script type="dojo/method" event="onSubmit" args="evt">
 						evt.preventDefault();
 						if (this.validate()) {
-							Notify.progress('Disabling OTP', true);
+							Notify.progress('Saving data...', true);
+							xhrPost("backend.php", this.getValues(), (transport) => {
+								Notify.close();
 
-							new Ajax.Request('backend.php', {
-								parameters: dojo.objectToQuery(this.getValues()),
-								onComplete: function(transport) {
-									Notify.close();
-									if (transport.responseText.indexOf('ERROR: ') == 0) {
-										Notify.error(transport.responseText.replace('ERROR: ', ''));
-									} else {
-										window.location.reload();
-									}
+								if (transport.responseText.indexOf('ERROR: ') == 0) {
+									Notify.error(transport.responseText.replace('ERROR: ', ''));
+								} else {
+									window.location.reload();
 								}
-							});
-							this.reset();
+							})
 						}
 					</script>
 
@@ -521,22 +510,20 @@ class Pref_Prefs extends Handler_Protected {
 						<input dojoType='dijit.form.ValidationTextBox' disabled='disabled' value="<?= $otp_secret ?>" size='32'>
 					</fieldset>
 
-					<script type='dojo/method' event='onSubmit' args='evt'>
+					<!-- TODO: return JSON from the backend call -->
+					<script type="dojo/method" event="onSubmit" args="evt">
 						evt.preventDefault();
 						if (this.validate()) {
 							Notify.progress('Saving data...', true);
+							xhrPost("backend.php", this.getValues(), (transport) => {
+								Notify.close();
 
-							new Ajax.Request('backend.php', {
-								parameters: dojo.objectToQuery(this.getValues()),
-								onComplete: function(transport) {
-									Notify.close();
-									if (transport.responseText.indexOf('ERROR:') == 0) {
-										Notify.error(transport.responseText.replace('ERROR:', ''));
-									} else {
-										window.location.reload();
-									}
+								if (transport.responseText.indexOf('ERROR:') == 0) {
+									Notify.error(transport.responseText.replace('ERROR:', ''));
+								} else {
+									window.location.reload();
 								}
-							});
+							})
 						}
 					</script>
 
@@ -806,26 +793,23 @@ class Pref_Prefs extends Handler_Protected {
 		<form dojoType='dijit.form.Form' id='changeSettingsForm'>
 			<?= \Controls\hidden_tag("op", "pref-prefs") ?>
 			<?= \Controls\hidden_tag("method", "saveconfig") ?>
-			<script type='dojo/method' event='onSubmit' args='evt, quit'>
+
+			<script type="dojo/method" event="onSubmit" args="evt, quit">
 				if (evt) evt.preventDefault();
 				if (this.validate()) {
-					console.log(dojo.objectToQuery(this.getValues()));
+					xhrPost("backend.php", this.getValues(), (transport) => {
+						if (quit) {
+							document.location.href = 'index.php';
+						} else {
+							const msg = transport.responseText;
 
-					new Ajax.Request('backend.php', {
-						parameters: dojo.objectToQuery(this.getValues()),
-						onComplete: function(transport) {
-							var msg = transport.responseText;
-							if (quit) {
-								document.location.href = 'index.php';
+							if (msg == 'PREFS_NEED_RELOAD') {
+								window.location.reload();
 							} else {
-								if (msg == 'PREFS_NEED_RELOAD') {
-									window.location.reload();
-								} else {
-									Notify.info(msg);
-								}
+								Notify.info(msg);
 							}
 						}
-					});
+					})
 				}
 			</script>
 
@@ -956,20 +940,15 @@ class Pref_Prefs extends Handler_Protected {
 		?>
 		<form dojoType="dijit.form.Form" id="changePluginsForm">
 			<script type="dojo/method" event="onSubmit" args="evt">
-				evt.preventDefault();
-				if (this.validate()) {
-					Notify.progress('Saving data...', true);
-
-					new Ajax.Request('backend.php', {
-						parameters: dojo.objectToQuery(this.getValues()),
-						onComplete: function(transport) {
+					evt.preventDefault();
+					if (this.validate()) {
+						xhrPost("backend.php", this.getValues(), (transport) => {
 							Notify.close();
 							if (confirm(__('Selected plugins have been enabled. Reload?'))) {
 								window.location.reload();
 							}
-						}
-					});
-				}
+						})
+					}
 			</script>
 
 			<?= \Controls\hidden_tag("op", "pref-prefs") ?>
diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php
index 43d064fc7..a1f92815c 100755
--- a/plugins/af_readability/init.php
+++ b/plugins/af_readability/init.php
@@ -69,19 +69,15 @@ class Af_Readability extends Plugin {
 
 				<?= \Controls\pluginhandler_tags($this, "save") ?>
 
-				<script type='dojo/method' event='onSubmit' args='evt'>
+				<script type="dojo/method" event="onSubmit" args="evt">
 					evt.preventDefault();
 					if (this.validate()) {
-						console.log(dojo.objectToQuery(this.getValues()));
-						new Ajax.Request('backend.php', {
-							parameters: dojo.objectToQuery(this.getValues()),
-							onComplete: function(transport) {
-								Notify.info(transport.responseText);
-							}
-						});
-						//this.reset();
+						Notify.progress('Saving data...', true);
+						xhrPost("backend.php", this.getValues(), (transport) => {
+							Notify.info(transport.responseText);
+						})
 					}
-					</script>
+				</script>
 
 				<fieldset>
 					<label class='checkbox'>
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 5066186db..827a4c310 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -43,16 +43,13 @@ class Af_RedditImgur extends Plugin {
 
 				<?= \Controls\pluginhandler_tags($this, "save") ?>
 
-				<script type='dojo/method' event='onSubmit' args='evt'>
+				<script type="dojo/method" event="onSubmit" args="evt">
 					evt.preventDefault();
 					if (this.validate()) {
-						console.log(dojo.objectToQuery(this.getValues()));
-						new Ajax.Request('backend.php', {
-							parameters: dojo.objectToQuery(this.getValues()),
-							onComplete: function(transport) {
-								Notify.info(transport.responseText);
-							}
-						});
+						Notify.progress('Saving data...', true);
+						xhrPost("backend.php", this.getValues(), (transport) => {
+							Notify.info(transport.responseText);
+						})
 					}
 				</script>
 
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 4b62d1e64..d96006b21 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -50,15 +50,12 @@ class Mail extends Plugin {
 				<script type="dojo/method" event="onSubmit" args="evt">
 					evt.preventDefault();
 					if (this.validate()) {
-						console.log(dojo.objectToQuery(this.getValues()));
-						new Ajax.Request('backend.php', {
-							parameters: dojo.objectToQuery(this.getValues()),
-							onComplete: function(transport) {
-								Notify.info(transport.responseText);
-							}
-						});
+						Notify.progress('Saving data...', true);
+						xhrPost("backend.php", this.getValues(), (transport) => {
+							Notify.info(transport.responseText);
+						})
 					}
-					</script>
+				</script>
 
 				<header><?= __("You can set predefined email addressed here (comma-separated list):") ?></header>
 
@@ -70,7 +67,6 @@ class Mail extends Plugin {
 				<?= \Controls\submit_tag(__("Save")) ?>
 
 			</form>
-
 		</div>
 		<?php
 	}
diff --git a/plugins/nsfw/init.php b/plugins/nsfw/init.php
index 0ee3aebc1..fdc6a3974 100644
--- a/plugins/nsfw/init.php
+++ b/plugins/nsfw/init.php
@@ -55,12 +55,10 @@ class NSFW extends Plugin {
 				<script type="dojo/method" event="onSubmit" args="evt">
 					evt.preventDefault();
 					if (this.validate()) {
-						new Ajax.Request('backend.php', {
-							parameters: dojo.objectToQuery(this.getValues()),
-							onComplete: function(transport) {
-								Notify.info(transport.responseText);
-							}
-						});
+						Notify.progress('Saving data...', true);
+						xhrPost("backend.php", this.getValues(), (transport) => {
+							Notify.info(transport.responseText);
+						})
 					}
 				</script>