From c974bda52c2f31c01f4cf8a3d4eafa7a5fac9e78 Mon Sep 17 00:00:00 2001
From: Ilia Ross <ilia@ross.gdn>
Date: Wed, 21 May 2025 19:59:28 +0300
Subject: [PATCH] Fix to make forgot links compatible across themes

---
 pam_login.cgi     | 11 +++++++++++
 session_login.cgi | 10 ++++++++++
 2 files changed, 21 insertions(+)

diff --git a/pam_login.cgi b/pam_login.cgi
index 39b5e5251..4d1a9452a 100755
--- a/pam_login.cgi
+++ b/pam_login.cgi
@@ -8,6 +8,17 @@ $pragma_no_cache = 1;
 #$ENV{'MINISERV_INTERNAL'} || die "Can only be called by miniserv.pl";
 &init_config();
 &ReadParse(undef, undef, undef, 2);
+
+# Redirect to the forgot page that this theme supports if generate in SPA theme
+if ($gconfig{'forgot_pass'} && $ENV{'REQUEST_URI'}) {
+	my ($forgot_id) = $ENV{'REQUEST_URI'} =~ /[?&]forgot=([0-9a-fA-F]{32})/;
+	if ($forgot_id) {
+		&redirect("@{[&get_webprefix()]}/forgot.cgi?id=$forgot_id");
+		return;
+		}
+	}
+
+# Login banner
 if ($gconfig{'loginbanner'} && $ENV{'HTTP_COOKIE'} !~ /banner=1/ &&
     !$in{'logout'} && $in{'initial'}) {
 	# Show pre-login HTML page
diff --git a/session_login.cgi b/session_login.cgi
index aff7215f0..d167e18ee 100755
--- a/session_login.cgi
+++ b/session_login.cgi
@@ -10,6 +10,15 @@ $pragma_no_cache = 1;
 &init_config();
 &ReadParse(undef, undef, undef, 2);
 
+# Redirect to the forgot page that this theme supports if generate in SPA theme
+if ($gconfig{'forgot_pass'} && $ENV{'REQUEST_URI'}) {
+	my ($forgot_id) = $ENV{'REQUEST_URI'} =~ /[?&]forgot=([0-9a-fA-F]{32})/;
+	if ($forgot_id) {
+		&redirect("@{[&get_webprefix()]}/forgot.cgi?id=$forgot_id");
+		return;
+		}
+	}
+
 # If accessed via HTTPS, make this an SSL-only cookie
 &get_miniserv_config(\%miniserv);
 $sec = uc($ENV{'HTTPS'}) eq 'ON' ? "; secure" : "";
@@ -17,6 +26,7 @@ if (!$miniserv{'no_httponly'}) {
 	$sec .= "; httpOnly";
 	}
 
+# Login banner
 if ($gconfig{'loginbanner'} && $ENV{'HTTP_COOKIE'} !~ /banner=1/ &&
     !$in{'logout'} && !$in{'failed'} && !$in{'timed_out'}) {
 	# Show pre-login HTML page