From 64a0480c0ef74c4ca345ff66e52aed61162cf9d1 Mon Sep 17 00:00:00 2001
From: "Skylar \"The Cobra\" Widulski" <cobra@vern.cc>
Date: Wed, 22 Nov 2023 17:40:29 -0500
Subject: [PATCH] Move & escape to correct location, redirect to submit page
 when submit errors

Signed-off-by: Skylar "The Cobra" Widulski <cobra@vern.cc>
---
 en/recovery-challenge.cgi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/en/recovery-challenge.cgi b/en/recovery-challenge.cgi
index 7c2f72f..5503e6f 100755
--- a/en/recovery-challenge.cgi
+++ b/en/recovery-challenge.cgi
@@ -37,27 +37,27 @@ generate_challenge() {
 submit_challenge() {
 	if [[ -z "$arg_username" ]]; then
 		nouser=1
-		page=default
+		page=submit
 		return
 	fi
 	if [[ -z "$key" ]]; then
 		nossh=1
-		page=default
+		page=submit
 		return
 	fi
 	if ! ssh-keygen -l -f /dev/stdin <<< "$key" &> /dev/null; then
 		badssh=1
-		page=default
+		page=submit
 		return
 	fi
 	if ! gpg --import-options show-only --import "/vm/$arg_username/.pgp.asc" &> /dev/null; then
 		nokey=1
-		page=default
+		page=submit
 		return
 	fi
 	if [[ -z "$sig" ]]; then
 		nosig=1
-		page=default
+		page=submit
 		return
 	fi
 	echo "$sig" > "$runtime_dir/$arg_username.gpg"
@@ -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 | sed 's/\&/\\\&/g')\\' -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;s/\&/\\\&/g')\\'"
 sedcmd="$sedcmd $(if [[ $nokey == 1 ]]; then
 	printf '%s' '-e "s/NOKEY/This user has no <code>.pgp.asc</code> file/"'
 else