From b2c7ca31da2e5b8d6f293fae82c5e83f962b28f5 Mon Sep 17 00:00:00 2001
From: Aevann <randomname42029@gmail.com>
Date: Tue, 7 Mar 2023 02:21:08 +0200
Subject: [PATCH] move disabling buttons to bottom.js

---
 files/assets/js/bottom.js                  | 21 +++++++++++++++++++--
 files/assets/js/core.js                    |  6 ------
 files/templates/admin/alt_votes.html       |  2 +-
 files/templates/admin/alts.html            |  2 +-
 files/templates/admin/badge_admin.html     |  2 +-
 files/templates/admin/banned_domains.html  |  2 +-
 files/templates/admin/edit_rules.html      |  2 +-
 files/templates/admin/update_assets.html   |  2 +-
 files/templates/chat.html                  |  2 +-
 files/templates/contact.html               |  2 +-
 files/templates/errors/nsfw.html           |  2 +-
 files/templates/login/forgot_password.html |  2 +-
 files/templates/login/lost_2fa.html        |  2 +-
 files/templates/login/reset_password.html  |  2 +-
 files/templates/oauth.html                 |  2 +-
 files/templates/post_actions.html          |  2 +-
 files/templates/post_actions_mobile.html   |  2 +-
 files/templates/settings/advanced.html     |  2 +-
 files/templates/settings/apps.html         |  6 +++---
 files/templates/settings/common.html       |  4 ++--
 files/templates/settings/css.html          |  4 ++--
 files/templates/settings/personal.html     |  4 ++--
 files/templates/settings/security.html     | 10 +++++-----
 files/templates/sub/exilees.html           |  2 +-
 files/templates/sub/mods.html              |  4 ++--
 files/templates/sub/settings.html          |  4 ++--
 files/templates/submission.html            |  2 +-
 files/templates/submit_hats.html           |  2 +-
 files/templates/submit_marseys.html        |  2 +-
 files/templates/userpage/admintools.html   | 12 ++++++------
 files/templates/userpage/banner.html       |  4 ++--
 31 files changed, 65 insertions(+), 54 deletions(-)

diff --git a/files/assets/js/bottom.js b/files/assets/js/bottom.js
index a1a07d351..d3adf48c6 100644
--- a/files/assets/js/bottom.js
+++ b/files/assets/js/bottom.js
@@ -97,6 +97,15 @@ for (const element of TH) {
 	element.addEventListener('click', () => {sort_table(element)});
 }
 
+function disable_btn(t) {
+	t.disabled = true
+	t.classList.add('disabled');
+	setTimeout(() => {
+		t.disabled = false;
+		t.classList.remove("disabled");
+	}, 2000);
+}
+
 function register_new_elements(e) {
 	const showmores = document.getElementsByClassName('showmore')
 	for (const element of showmores) {
@@ -105,7 +114,10 @@ function register_new_elements(e) {
 
 	const onclick = e.querySelectorAll('[data-onclick]');
 	for (const element of onclick) {
-		element.onclick = () => {execute(element, 'onclick')};
+		element.onclick = () => {
+			execute(element, 'onclick')
+			disable_btn(element)
+		};
 	}
 
 	const oninput = e.querySelectorAll('[data-oninput]');
@@ -162,7 +174,12 @@ function register_new_elements(e) {
 		element.addEventListener('click', () => {
 			document.getElementById('giveaward').dataset.action = element.dataset.url
 		});
-	}	
+	}
+
+	const btns_to_disable = document.querySelectorAll('[type="submit"]')
+	for (const btn of btns_to_disable) {
+		btn.addEventListener('click') = disable_btn
+	}
 }
 
 register_new_elements(document);
diff --git a/files/assets/js/core.js b/files/assets/js/core.js
index 343d1f7ac..6131eb3b7 100644
--- a/files/assets/js/core.js
+++ b/files/assets/js/core.js
@@ -133,12 +133,6 @@ if (!location.pathname.endsWith('/submit'))
 	});
 }
 
-function disable(t) {
-	t.classList.add('disabled');
-	setTimeout(() => {
-		t.classList.remove("disabled");
-	}, 2000);
-}
 
 function autoExpand(field) {
 	xpos=window.scrollX;
diff --git a/files/templates/admin/alt_votes.html b/files/templates/admin/alt_votes.html
index 46c6f029a..a14888f63 100644
--- a/files/templates/admin/alt_votes.html
+++ b/files/templates/admin/alt_votes.html
@@ -7,7 +7,7 @@
 	<label for="link-input">Usernames</label>
 	<input autocomplete="off" id="link-input" type="text" class="form-control mb-2" name="u1" value="{{u1.username if u1 else ''}}" placeholder="User 1">
 	<input autocomplete="off" id="link-input" type="text" class="form-control mb-2" name="u2" value="{{u2.username if u2 else ''}}" placeholder="User 2">
-	<input type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Submit" class="btn btn-primary">
+	<input type="submit" value="Submit" class="btn btn-primary">
 </form>
 
 {% if u1 and u2 %}
diff --git a/files/templates/admin/alts.html b/files/templates/admin/alts.html
index 91f6e4114..0887fc4e2 100644
--- a/files/templates/admin/alts.html
+++ b/files/templates/admin/alts.html
@@ -10,7 +10,7 @@
 	<form action="/admin/alts" method="get">
 		<label for="link-input">Username</label>
 		<input autocomplete="off" id="link-input" type="text" class="form-control mb-2" name="username" value="{{u.username if u else ''}}" placeholder="Username">
-		<input type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Submit" class="btn btn-primary">
+		<input type="submit" value="Submit" class="btn btn-primary">
 	</form>
 </section>
 {% if u %}
diff --git a/files/templates/admin/badge_admin.html b/files/templates/admin/badge_admin.html
index 34bac5cc4..234d3eecd 100644
--- a/files/templates/admin/badge_admin.html
+++ b/files/templates/admin/badge_admin.html
@@ -52,7 +52,7 @@
 <label class="mt-2 mb-0 pb-0" for="input-description">Custom description</label>
 <input autocomplete="off" id="input-description" class="form-control" type="text" name="description" placeholder="Leave blank for badge default">
 {% endif %}
-<input autocomplete="off" class="btn btn-primary mt-3" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)">
+<input autocomplete="off" class="btn btn-primary mt-3" type="submit">
 
 </form>
 
diff --git a/files/templates/admin/banned_domains.html b/files/templates/admin/banned_domains.html
index 95578cc50..1e72537a6 100644
--- a/files/templates/admin/banned_domains.html
+++ b/files/templates/admin/banned_domains.html
@@ -33,7 +33,7 @@
 		<input hidden name="formkey" value="{{v|formkey}}">
 		<input autocomplete="off" name="domain" placeholder="Enter domain here.." class="form-control" required>
 		<input autocomplete="off" name="reason" placeholder="Enter ban reason here.." data-nonce="{{g.nonce}}" data-undisable_element="ban-submit" class="form-control mt-2">
-		<input autocomplete="off" id="ban-submit" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-primary mt-2" value="Ban domain" disabled>
+		<input autocomplete="off" id="ban-submit" type="submit" class="btn btn-primary mt-2" value="Ban domain" disabled>
 	</form>
 </div>
 
diff --git a/files/templates/admin/edit_rules.html b/files/templates/admin/edit_rules.html
index 67cf917c2..d7225362d 100644
--- a/files/templates/admin/edit_rules.html
+++ b/files/templates/admin/edit_rules.html
@@ -18,7 +18,7 @@
 						<textarea autocomplete="off" maxlength="10000" class="form-control rounded" placeholder="Enter rules here..." rows="50" name="rules" form="edit_rules">{% if rules %}{{rules}}{% endif %}</textarea>
 
 						<div class="d-flex mt-2">
-							<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Save">
+							<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="Save">
 						</div>
 					</form>
 				</div>
diff --git a/files/templates/admin/update_assets.html b/files/templates/admin/update_assets.html
index bcba1d6ce..590dba5c0 100644
--- a/files/templates/admin/update_assets.html
+++ b/files/templates/admin/update_assets.html
@@ -32,7 +32,7 @@
 							{% endif %}
 							<div class="footer mt-4">
 								<div class="d-flex">
-									<input id="submit-btn" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-primary ml-auto" value="Update {{type}}">
+									<input id="submit-btn" type="submit" class="btn btn-primary ml-auto" value="Update {{type}}">
 								</div>
 							</div>
 						</form>
diff --git a/files/templates/chat.html b/files/templates/chat.html
index ada99e044..6321aee24 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -123,7 +123,7 @@
 
 					<textarea id="input-text" minlength="1" maxlength="{% if SITE == 'rdrama.net' %}200{% else %}1000{% endif %}" {% if g.browser == "apple" %}style="font-size:16px!important"{% endif %} class="file-ta form-control" placeholder="Message" autocomplete="off" autofocus rows="1"></textarea>
 
-					<i id="chatsend" data-nonce="{{g.nonce}}" data-onclick="send()" class="btn btn-secondary fas fa-reply ml-3 my-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" style="transform:rotateY(180deg);font-size:1.3rem!important"></i>
+					<i id="chatsend" data-nonce="{{g.nonce}}" data-onclick="send()" class="btn btn-secondary fas fa-reply ml-3 my-auto" type="submit" style="transform:rotateY(180deg);font-size:1.3rem!important"></i>
 				</div>
 			</div>
 		</div>
diff --git a/files/templates/contact.html b/files/templates/contact.html
index 0ae236301..75907771e 100644
--- a/files/templates/contact.html
+++ b/files/templates/contact.html
@@ -18,7 +18,7 @@
 				
 				{{macros.file_input('file-uplod', False)}}
 
-				<input type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Submit" class="btn btn-primary fl-r">
+				<input type="submit" value="Submit" class="btn btn-primary fl-r">
 			</div>
 		</form>
 
diff --git a/files/templates/errors/nsfw.html b/files/templates/errors/nsfw.html
index 1376f28cf..ed9d92386 100644
--- a/files/templates/errors/nsfw.html
+++ b/files/templates/errors/nsfw.html
@@ -12,7 +12,7 @@
 
 				<form action="/allow_nsfw" method="post">
 					<input hidden name="redir" value="{{request.full_path}}">
-					<input type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-danger mr-2" value="Yes, I am +18">
+					<input type="submit" class="btn btn-danger mr-2" value="Yes, I am +18">
 				</form>
 				<div class="mt-3"><a href="/" class="btn btn-secondary">No</a></div>
 			</div>
diff --git a/files/templates/login/forgot_password.html b/files/templates/login/forgot_password.html
index 361daddf2..00c001a5a 100644
--- a/files/templates/login/forgot_password.html
+++ b/files/templates/login/forgot_password.html
@@ -9,7 +9,7 @@
 		<input autocomplete="off" class="form-control" id="username" type="text" name="username" required>
 		<label for="email" class="mt-3">Email</label>
 		<input type="email" pattern='{{EMAIL_REGEX_PATTERN}}' autocomplete="off" class="form-control" id="password" name="email" required>
-		<input autocomplete="off" class="btn btn-primary login w-100 mt-3" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Send recovery link">
+		<input autocomplete="off" class="btn btn-primary login w-100 mt-3" type="submit" value="Send recovery link">
 	</form>
 </div>
 {% endblock %}
diff --git a/files/templates/login/lost_2fa.html b/files/templates/login/lost_2fa.html
index a54d8b857..9feff857e 100644
--- a/files/templates/login/lost_2fa.html
+++ b/files/templates/login/lost_2fa.html
@@ -11,7 +11,7 @@
 		<input autocomplete="off" class="form-control" id="password" type="password" name="password" required>
 		<label for="email" class="mt-3">Email</label>
 		<input autocomplete="off" class="form-control" id="password" type="email" pattern='{{EMAIL_REGEX_PATTERN}}' name="email" required{% if v %} value="{{v.email}}" disabled{% endif %}>
-		<input autocomplete="off" class="btn btn-primary login w-100 mt-3" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Send recovery link">
+		<input autocomplete="off" class="btn btn-primary login w-100 mt-3" type="submit" value="Send recovery link">
 	</form>
 </div>
 {% endblock %}
diff --git a/files/templates/login/reset_password.html b/files/templates/login/reset_password.html
index 0ffee1808..bd340fdde 100644
--- a/files/templates/login/reset_password.html
+++ b/files/templates/login/reset_password.html
@@ -11,7 +11,7 @@
 		<input autocomplete="off" class="form-control" id="passentry" type="password" name="password" required>
 		<label for="confentry" class="mt-3">Confirm New Password</label>
 		<input autocomplete="off" class="form-control" id="confentry" type="password" name="confirm_password" required>
-		<input autocomplete="off" class="btn btn-primary login w-100 mt-3" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Change password">
+		<input autocomplete="off" class="btn btn-primary login w-100 mt-3" type="submit" value="Change password">
 	</form>
 </div>
 {% endblock %}
diff --git a/files/templates/oauth.html b/files/templates/oauth.html
index 147c7090c..3545d407a 100644
--- a/files/templates/oauth.html
+++ b/files/templates/oauth.html
@@ -12,7 +12,7 @@
 				<input hidden name="permanent" value="{{permanent}}">
 				<input hidden name="client_id" value="{{application.client_id}}">
 				<input hidden name="state" value="{{state}}">
-				<input type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-primary" id="auth_button" value="Authorize {{application.app_name}}">
+				<input type="submit" class="btn btn-primary" id="auth_button" value="Authorize {{application.app_name}}">
 				<a href="/" class="btn btn-secondary">No, back to {{SITE_NAME}}</a>
 		</form>
 </div>
diff --git a/files/templates/post_actions.html b/files/templates/post_actions.html
index e99ed21ec..6aab82c62 100644
--- a/files/templates/post_actions.html
+++ b/files/templates/post_actions.html
@@ -1,7 +1,7 @@
 {% if v and v.id==p.author_id and p.private %}
 	<form action="/publish/{{p.id}}" method="post" class="d-flex mb-0">
 		<input hidden name="formkey", value="{{v|formkey}}">
-		<button type="submit" class="list-inline-item text-small p-0 m-0 mr-3 border-0 nobackground font-weight-bold" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)"><i class="fas fa-globe"></i>Publish</button>
+		<button type="submit" class="list-inline-item text-small p-0 m-0 mr-3 border-0 nobackground font-weight-bold" type="submit"><i class="fas fa-globe"></i>Publish</button>
 	</form>
 {% endif %}
 
diff --git a/files/templates/post_actions_mobile.html b/files/templates/post_actions_mobile.html
index 8b43f23de..6e28cb320 100644
--- a/files/templates/post_actions_mobile.html
+++ b/files/templates/post_actions_mobile.html
@@ -1,7 +1,7 @@
 {% if v and v.id==p.author_id and p.private %}
 	<form class="btn-block mb-0" action="/publish/{{p.id}}" method="post">
 		<input hidden name="formkey", value="{{v|formkey}}">
-		<button type="submit" class="nobackground btn btn-link btn-lg text-left text-muted" data-bs-dismiss="modal" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)"><i class="fas fa-globe text-center mr-2"></i>Publish</button>
+		<button type="submit" class="nobackground btn btn-link btn-lg text-left text-muted" data-bs-dismiss="modal" type="submit"><i class="fas fa-globe text-center mr-2"></i>Publish</button>
 	</form>
 {% endif %}
 
diff --git a/files/templates/settings/advanced.html b/files/templates/settings/advanced.html
index 677f0e1c2..22472fb9d 100644
--- a/files/templates/settings/advanced.html
+++ b/files/templates/settings/advanced.html
@@ -146,7 +146,7 @@
 								rows="3" name="filters" form="custom-filter" maxlength="1000">{% if v.custom_filter_list %}{{v.custom_filter_list}}{% endif %}</textarea>
 								<div class="d-flex">
 									<small>Use a new line for each filter entry. Limit of 1000 characters.</small>
-									<input autocomplete="off" class="btn btn-primary ml-auto" id="bioSave" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Save Changes">
+									<input autocomplete="off" class="btn btn-primary ml-auto" id="bioSave" type="submit" value="Save Changes">
 								</div>
 							</form>
 						</div>
diff --git a/files/templates/settings/apps.html b/files/templates/settings/apps.html
index 2a19b6f1c..0fdfdf170 100644
--- a/files/templates/settings/apps.html
+++ b/files/templates/settings/apps.html
@@ -32,7 +32,7 @@
 		<div class="footer">
 			<div class="d-flex">
 				<button type="button" class="btn btn-secondary ml-auto" data-nonce="{{g.nonce}}" data-onclick="postToastReload(this,'/reroll/{{app.id}}')">Reroll Client ID</button>
-				<input type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-primary ml-2" value="Save Changes">
+				<input type="submit" class="btn btn-primary ml-2" value="Save Changes">
 			</div>
 		</div>
 	</div>
@@ -67,7 +67,7 @@
 		</div>
 		<div class="footer">
 			<div class="d-flex">
-				<input type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-primary ml-auto" value="Save Changes">
+				<input type="submit" class="btn btn-primary ml-auto" value="Save Changes">
 			</div>
 		</div>
 	</div>
@@ -118,7 +118,7 @@
 		</div>
 		<div class="footer">
 			<div class="d-flex">
-				<input type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-primary ml-auto" value="Request API Key">
+				<input type="submit" class="btn btn-primary ml-auto" value="Request API Key">
 			</div>
 		</div>
 	</div>
diff --git a/files/templates/settings/common.html b/files/templates/settings/common.html
index b6e6d28da..b05342432 100644
--- a/files/templates/settings/common.html
+++ b/files/templates/settings/common.html
@@ -65,7 +65,7 @@
 						<div class="ml-2"><i class="btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" data-nonce="{{g.nonce}}" data-onclick="loadEmojis('{{id}}-body')" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"></i></div>
 					{% endif %}
 					<small class="ml-3">{{below_text}}</small>
-					<input autocomplete="off" class="btn btn-primary ml-auto" id="{{id}}-save" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="{{button_text}}" {% if disabled %}disabled{% endif %}>
+					<input autocomplete="off" class="btn btn-primary ml-auto" id="{{id}}-save" type="submit" value="{{button_text}}" {% if disabled %}disabled{% endif %}>
 				</div>
 			</form>
 		</div>
@@ -94,7 +94,7 @@
 			{% endif %}
 			<div class="d-flex mt-1">
 				<small>{{below_text}}</small>
-				<input autocomplete="off" class="btn btn-primary ml-auto" id="{{id}}-save" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Save Changes">
+				<input autocomplete="off" class="btn btn-primary ml-auto" id="{{id}}-save" type="submit" value="Save Changes">
 			</div>
 		</form>
 	</div>
diff --git a/files/templates/settings/css.html b/files/templates/settings/css.html
index 7143bfec5..b6b279526 100644
--- a/files/templates/settings/css.html
+++ b/files/templates/settings/css.html
@@ -14,7 +14,7 @@
 							<textarea autocomplete="off" class="form-control rounded" id="css-textarea" placeholder="Custom CSS" rows="3" name="css" form="profile-settings-css" maxlength="{{CSS_LENGTH_LIMIT}}">{% if v.css %}{{v.csslazy}}{% endif %}</textarea>
 							<small>Limit of {{CSS_LENGTH_LIMIT}} characters</small>
 							<div class="d-flex mt-2">
-								<input autocomplete="off" id="submit-btn" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Save">
+								<input autocomplete="off" id="submit-btn" class="btn btn-primary ml-auto" type="submit" value="Save">
 							</div>
 						</form>
 					</div>
@@ -32,7 +32,7 @@
 							<textarea autocomplete="off" class="form-control rounded" id="profilecss-textarea" placeholder="Custom profile CSS" rows="3" name="profilecss" form="profile-settings-profilecss" maxlength="{{CSS_LENGTH_LIMIT}}">{% if profilecss %}{{profilecss}}{% endif %}</textarea>
 							<small>Limit of {{CSS_LENGTH_LIMIT}} characters</small>
 							<div class="d-flex mt-2">
-								<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Save">
+								<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="Save">
 							</div>
 						</form>
 					</div>
diff --git a/files/templates/settings/personal.html b/files/templates/settings/personal.html
index 6075667d7..8877b9082 100644
--- a/files/templates/settings/personal.html
+++ b/files/templates/settings/personal.html
@@ -166,7 +166,7 @@
 								<input autocomplete="off" type="text" name="name" class="form-control" value="{{v.username}}">
 								<small>3-25 characters, including letters, numbers, _ , and -</small>
 								<div class="d-flex mt-2">
-									<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Change Display Name">
+									<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="Change Display Name">
 								</div>
 							</form>
 						</div>
@@ -203,7 +203,7 @@
 								<form action="/settings/song_change" method="post">
 									<input hidden name="formkey" value="{{v|formkey}}">
 									<input class="form-control" style="display:inline;max-width:75%;font-size: min(3.5vw,16px)!important" autocomplete="off" type="text" name="song" class="form-control" value="{% if v.song and v.song|length not in (1,2,3,4,5,17) %}https://youtu.be/{{v.song}}{% endif %}" placeholder='Enter a YouTube video link here'>
-									<input class="btn btn-primary" style="margin-top:-6px;font-size: min(3.5vw,16px)!important" autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Submit">
+									<input class="btn btn-primary" style="margin-top:-6px;font-size: min(3.5vw,16px)!important" autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="Submit">
 								</form>
 								<br><small>In some browsers, users have to click at least once anywhere in the profile page for the anthem to play.</small>
 							</div>
diff --git a/files/templates/settings/security.html b/files/templates/settings/security.html
index 017a95ec7..5e128bebe 100644
--- a/files/templates/settings/security.html
+++ b/files/templates/settings/security.html
@@ -38,9 +38,9 @@
 								<button type="button" class="btn btn-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/settings/claim_rewards')">Claim {{patron}} rewards</button>
 							{% endif %}
 							{% if v.email %}
-								<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Update email">
+								<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="Update email">
 							{% else %}
-								<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Add email">
+								<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="Add email">
 							{% endif %}
 						</div>
 						{% if FEATURES['MARSEYBUX'] %}
@@ -81,7 +81,7 @@
 						<input hidden name="formkey" value="{{v|formkey}}">
 						<input hidden name="now" value="{{now}}">
 						<div class="d-flex">
-							<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Change Password">
+							<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="Change Password">
 						</div>
 					</div>
 				</form>
@@ -119,7 +119,7 @@
 				</div>
 				<div class="footer">
 					<div class="d-flex">
-						<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Log out everywhere">
+						<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="Log out everywhere">
 					</div>
 				</div>
 			</form>
@@ -222,7 +222,7 @@
 				</div>
 				<div class="modal-footer">
 					<button type="button" class="btn btn-link text-muted" data-bs-dismiss="modal">Cancel</button>
-					<input autocomplete="off" id="toggle2faButton" class="btn btn-primary" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="{{action}} 2-step login" disabled>
+					<input autocomplete="off" id="toggle2faButton" class="btn btn-primary" type="submit" value="{{action}} 2-step login" disabled>
 				</div>
 			</form>
 		</div>
diff --git a/files/templates/sub/exilees.html b/files/templates/sub/exilees.html
index 65a915cd4..23aaf6d5f 100644
--- a/files/templates/sub/exilees.html
+++ b/files/templates/sub/exilees.html
@@ -26,7 +26,7 @@
 			{% if v.mods(sub.name) %}
 				<form action="/h/{{sub}}/unexile/{{user.id}}" method="post">
 					<input hidden name="formkey" value="{{v|formkey}}">
-					<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Unexile">
+					<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="Unexile">
 				</form>
 			{% endif %}
 		</td>
diff --git a/files/templates/sub/mods.html b/files/templates/sub/mods.html
index 5c9557239..84bfda14b 100644
--- a/files/templates/sub/mods.html
+++ b/files/templates/sub/mods.html
@@ -24,7 +24,7 @@
 				<form action="/h/{{sub}}/remove_mod" method="post" data-nonce="{{g.nonce}}" data-onsubmit="removeMod(this)">
 					<input hidden name="formkey" value="{{v|formkey}}">
 					<input hidden name="uid" value="{{user.id}}">
-					<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="{% if v.id == user.id %}Resign{% else %}Remove Mod{% endif %}">
+					<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="{% if v.id == user.id %}Resign{% else %}Remove Mod{% endif %}">
 				</form>
 			{% endif %}
 		</td>
@@ -37,7 +37,7 @@
 	<form action="/h/{{sub}}/add_mod" method="post">
 		<input hidden name="formkey" value="{{v|formkey}}">
 		<input class="form-control" style="display:inline;width:250px" autocomplete="off" type="text" name="user" class="form-control" placeholder="Enter username..">
-		<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Add Mod" style="margin-bottom: 5px">
+		<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="Add Mod" style="margin-bottom: 5px">
 	</form>
 {% endif %}
 
diff --git a/files/templates/sub/settings.html b/files/templates/sub/settings.html
index da0409c92..148200783 100644
--- a/files/templates/sub/settings.html
+++ b/files/templates/sub/settings.html
@@ -110,7 +110,7 @@
 						<input hidden name="formkey" value="{{v|formkey}}">
 						<textarea autocomplete="off" maxlength="10000" class="form-control rounded" id="bio-text" placeholder="Enter sidebar here..." rows="10" name="sidebar" form="sidebar">{% if sub.sidebar %}{{sub.sidebar}}{% endif %}</textarea>
 						<div class="d-flex mt-2">
-							<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Save">
+							<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="Save">
 						</div>
 					</form>
 				</div>
@@ -131,7 +131,7 @@
 						<input hidden name="formkey" value="{{v|formkey}}">
 						<textarea autocomplete="off" maxlength="6000" class="form-control rounded" id="bio-text" placeholder="Enter css here..." rows="10" name="css" form="css">{% if css %}{{css}}{% endif %}</textarea>
 						<div class="d-flex mt-2">
-							<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Save">
+							<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="Save">
 						</div>
 					</form>
 				</div>
diff --git a/files/templates/submission.html b/files/templates/submission.html
index ccd328a2f..27f9c95da 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -182,7 +182,7 @@
 										<small class="format d-none"><i class="fas fa-link"></i></small>
 								</div>
 								<a class="text-small mt-3 d-inline-block" href="/formatting" {% if v and v.newtab %}data-target="t" target="_blank"{% endif %}>Formatting help</a>
-								<button type="submit" form="post-edit-form-{{p.id}}" class="btn btn-primary ml-2 fl-r" data-nonce="{{g.nonce}}" data-onclick="disable(this);remove_dialog()">Save Edit</button>
+								<button type="submit" form="post-edit-form-{{p.id}}" class="btn btn-primary ml-2 fl-r" data-nonce="{{g.nonce}}" data-onclick="remove_dialog()">Save Edit</button>
 								<button type="button" data-nonce="{{g.nonce}}" data-onclick="togglePostEdit('{{p.id}}');remove_dialog()" class="btn btn-link text-muted ml-auto fl-r">Cancel</button>
 							</form>
 							<div id="post-edit-{{p.id}}" class="preview mb-3 mt-5"></div>
diff --git a/files/templates/submit_hats.html b/files/templates/submit_hats.html
index 01a43c1b3..c584e1716 100644
--- a/files/templates/submit_hats.html
+++ b/files/templates/submit_hats.html
@@ -38,7 +38,7 @@
 
 							<div class="footer mt-5">
 								<div class="d-flex">
-									<input id="submit-btn" disabled type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-primary ml-auto" value="Submit Hat">
+									<input id="submit-btn" disabled type="submit" class="btn btn-primary ml-auto" value="Submit Hat">
 								</div>
 							</div>
 						</form>
diff --git a/files/templates/submit_marseys.html b/files/templates/submit_marseys.html
index f7444e0fe..530c3101b 100644
--- a/files/templates/submit_marseys.html
+++ b/files/templates/submit_marseys.html
@@ -33,7 +33,7 @@
 
 							<div class="footer mt-5">
 								<div class="d-flex">
-									<input id="submit-btn" disabled type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-primary ml-auto" value="Submit Marsey">
+									<input id="submit-btn" disabled type="submit" class="btn btn-primary ml-auto" value="Submit Marsey">
 								</div>
 							</div>
 						</form>
diff --git a/files/templates/userpage/admintools.html b/files/templates/userpage/admintools.html
index 203ddae92..337f74fd8 100644
--- a/files/templates/userpage/admintools.html
+++ b/files/templates/userpage/admintools.html
@@ -35,7 +35,7 @@
 									<input autocomplete="off" type="checkbox" class="custom-control-input" id="locked-{{deviceType}}" name="locked" {% if u.flairchanged %}checked{% endif %}>
 									<label class="custom-control-label" for="locked-{{deviceType}}">locked</label>
 								</div>
-								<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" value="Change Flair">
+								<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="Change Flair">
 							</div>
 						</form>
 					</div>
@@ -52,7 +52,7 @@
 						<input autocomplete="off" type="checkbox" id="alts-2-{{deviceType}}" class="custom-control-input" name="alts" value="1">
 						<label class="custom-control-label" for="alts-2-{{deviceType}}">Include alts</label>
 					</div>
-					<input autocomplete="off" id="user-ban-submit-{{deviceType}}" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-danger" value="Ban user" disabled>
+					<input autocomplete="off" id="user-ban-submit-{{deviceType}}" type="submit" class="btn btn-danger" value="Ban user" disabled>
 				</form>
 			{% endif %}
 			{% if v.admin_level >= PERMS['USER_SHADOWBAN'] %}
@@ -61,7 +61,7 @@
 				<form id="shadowban-{{deviceType}}" class="my-3 {% if u.shadowbanned %}d-none{% endif %}" action="/shadowban/{{u.id}}" method="post" data-nonce="{{g.nonce}}" data-onsubmit="sendFormXHRSwitch(this)">
 					<input hidden name="formkey" value="{{v|formkey}}">
 					<input autocomplete="off" style="font-size:11px" type="text" class="form-control" maxlength="256" name="reason" placeholder="Shadowban Reason" data-nonce="{{g.nonce}}" data-undisable_element="user-shadowban-submit-{{deviceType}}" required>
-					<input autocomplete="off" id="user-shadowban-submit-{{deviceType}}" type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-danger" value="Shadowban user" disabled>
+					<input autocomplete="off" id="user-shadowban-submit-{{deviceType}}" type="submit" class="btn btn-danger" value="Shadowban user" disabled>
 				</form>
 			{% endif %}
 			{% if v.admin_level >= PERMS['USER_AGENDAPOSTER'] %}
@@ -70,7 +70,7 @@
 				<form class="my-3" action="/agendaposter/{{u.id}}" method="post" data-nonce="{{g.nonce}}" data-onsubmit="sendFormXHRSwitch(this, true)">
 					<input hidden name="formkey" value="{{v|formkey}}">
 					<input autocomplete="off" type="number" step="any" name="days" class="form-control" placeholder="Days (0 or blank = permanent)">
-					<input type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-danger" value="Chud">
+					<input type="submit" class="btn btn-danger" value="Chud">
 				</form>
 			{% endif %}
 
@@ -93,12 +93,12 @@
 					<form action="/admin/unnuke_user" method="post" data-nonce="{{g.nonce}}" data-onsubmit="sendFormXHR(this)">
 						<input hidden name="formkey", value="{{v|formkey}}">
 						<input hidden name="user" value="{{u.username}}">
-						<input type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-success" value="Approve User's Content">
+						<input type="submit" class="btn btn-success" value="Approve User's Content">
 					</form>
 					<form class="mt-1" action="/admin/nuke_user" method="post" data-nonce="{{g.nonce}}" data-onsubmit="sendFormXHR(this)">
 						<input hidden name="formkey", value="{{v|formkey}}">
 						<input hidden name="user" value="{{u.username}}">
-						<input type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this)" class="btn btn-danger" value="Remove User's Content">
+						<input type="submit" class="btn btn-danger" value="Remove User's Content">
 					</form>
 				{% endif %}
 
diff --git a/files/templates/userpage/banner.html b/files/templates/userpage/banner.html
index d0828c688..9cd524650 100644
--- a/files/templates/userpage/banner.html
+++ b/files/templates/userpage/banner.html
@@ -161,7 +161,7 @@
 
 							{{macros.file_input('file-upload', True)}}
 
-							<input type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this);remove_dialog()" value="Submit" class="btn btn-primary fl-r">
+							<input type="submit" data-nonce="{{g.nonce}}" data-onclick="remove_dialog()" value="Submit" class="btn btn-primary fl-r">
 						</form>
 
 						<div id="message-preview" class="preview mt-2"></div>
@@ -464,7 +464,7 @@
 
 						{{macros.file_input('file-upload-mobile', True)}}
 
-						<input type="submit" data-nonce="{{g.nonce}}" data-onclick="disable(this);remove_dialog()" value="Submit" class="btn btn-primary fl-r">
+						<input type="submit" data-nonce="{{g.nonce}}" data-onclick="remove_dialog()" value="Submit" class="btn btn-primary fl-r">
 					</form>
 
 					<div id="message-preview-mobile" class="preview my-3"></div>