From 37dcc331a6f8966e1a82c96ed07a1b598ffdfc74 Mon Sep 17 00:00:00 2001
From: "Skylar \"The Cobra\" Widulski" <cobra@vern.cc>
Date: Wed, 22 Nov 2023 17:36:11 -0500
Subject: [PATCH] Move <br> in other files

Signed-off-by: Skylar "The Cobra" Widulski <cobra@vern.cc>
---
 en/recovery-challenge.cgi            |  4 ++--
 en/recovery-scripts/pgp/submit.html  | 10 +++++-----
 en/recovery-scripts/pgp/success.html |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/en/recovery-challenge.cgi b/en/recovery-challenge.cgi
index 7985554..7c2f72f 100755
--- a/en/recovery-challenge.cgi
+++ b/en/recovery-challenge.cgi
@@ -12,7 +12,7 @@ runtime_dir=/var/log/challenges
 gpg_home="$runtime_dir"/.gnupg
 
 urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; }
-sig="$(urldecode "$arg_signature")"
+sig="$(urldecode "$arg_signature" | sed 's/\r//g')"
 key="$(urldecode "$arg_newkey")"
 if [[ $arg_username ]]; then
 	keyid="$(gpg --import-options show-only --import "/vm/$arg_username/.pgp.asc" 2>&1 | grep '^ ' | xargs)"
@@ -106,7 +106,7 @@ case "$arg_method" in
 		;;
 esac
 
-sedcmd=" -e 's/USERNAME/$arg_username/' -e 's/CHALLENGE/$(<$runtime_dir/$arg_username)/' -e 's/KEYID/$keyid/' -e 's\\NAV\\$(php $(dirname $0)/nav.php)\\' -e 's\\FOOTER\\$($(dirname $0)/footer.cgi | sed '1,2d')\\'"
+sedcmd=" -e 's/USERNAME/$arg_username/' -e 's/CHALLENGE/$(<$runtime_dir/$arg_username)/' -e 's/KEYID/$keyid/' -e 's\\NAV\\$(php $(dirname $0)/nav.php | sed 's/\&/\\\&/g')\\' -e 's\\FOOTER\\$($(dirname $0)/footer.cgi | sed '1,2d')\\'"
 sedcmd="$sedcmd $(if [[ $nokey == 1 ]]; then
 	printf '%s' '-e "s/NOKEY/This user has no <code>.pgp.asc</code> file/"'
 else
diff --git a/en/recovery-scripts/pgp/submit.html b/en/recovery-scripts/pgp/submit.html
index e0b6f96..95a7854 100644
--- a/en/recovery-scripts/pgp/submit.html
+++ b/en/recovery-scripts/pgp/submit.html
@@ -12,21 +12,21 @@
 	NAV
 	<div class=h><h1 id=pgp-recovery>PGP-based Account Recovery</h1> <a aria-hidden=true href=#pgp-recovery>#pgp-recovery</a></div>
 	<p>Generate your signature by going into a terminal and running the following:</p>
-	<pre><code>echo 'CHALLENGE' | gpg -a --detach-sig --default-key KEYID</code></pre>
+	<pre style='white-space:pre-line;word-break:keep-all;'><code>echo 'CHALLENGE' | gpg -a --detach-sig --default-key KEYID</code></pre>
 	<form method="post" action="/en/recovery-challenge">
 		<input hidden type=text name=method value="submit">
 		<p>Username:
 		<input type=text name=username value=USERNAME>
 		<span class=red>NOUSERNOKEY</span></p>
 		
-		<p>New SSH key(s): <span class=red>NOSSHBADSSH</span>
+		<p>New SSH key(s): <span class=red>NOSSHBADSSH</span><br>
 		<textarea name=newkey rows=3 cols=50></textarea></p>
-		<p>Signature: <span class=red>NOSIGBADSIG</span>
-		<textarea name=singature rows=10 cols=50></textarea></p>
+		<p>Signature: <span class=red>NOSIGBADSIG</span><br>
+		<textarea name=singature rows=15 cols=60></textarea></p>
 
-		<br>
 		<span><input type=submit value=Submit style="width:100px;height:40px;font-size:20px"></span>
 	</form>
+	<br>
 	FOOTER
 </body>
 </html>
diff --git a/en/recovery-scripts/pgp/success.html b/en/recovery-scripts/pgp/success.html
index 5db60cc..43bf2d0 100644
--- a/en/recovery-scripts/pgp/success.html
+++ b/en/recovery-scripts/pgp/success.html
@@ -14,6 +14,7 @@
 	<div class=h><h1 id=pgp-recovery>PGP-based Account Recovery</h1> <a aria-hidden=true href=#pgp-recovery>#pgp-recovery</a></div>
 	<p>Your new key has successfully been added.</p>
 	<p>You will be redirected back <a href=/en/>home</a> in 5 seconds.</p>
+	<br>
 	FOOTER
 </body>
 </html>