From eba0d9b9889cb86d4b0b44df4a50cd3b7423ecec Mon Sep 17 00:00:00 2001 From: Nicholas van Oudtshoorn Date: Thu, 14 Mar 2024 11:47:06 +0800 Subject: [PATCH] Return to the page you were on when authenticating, stripping the logout instruction from the referer uri --- opac/cgi-bin/opac/svc/auth/googleopenidconnect | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/opac/cgi-bin/opac/svc/auth/googleopenidconnect b/opac/cgi-bin/opac/svc/auth/googleopenidconnect index cde334f..6944f3f 100755 --- a/opac/cgi-bin/opac/svc/auth/googleopenidconnect +++ b/opac/cgi-bin/opac/svc/auth/googleopenidconnect @@ -214,12 +214,14 @@ elsif ( defined $query->param('code') ) { #handle redirect to main.pl, for private opac my $uri; my $referer = $session->param( 'auth-refer-uri' ); + my $regex = qr/logout\.x=1/mp; + my $fixed_referer = $referer =~ s/$regex//rg; if (C4::Context->preference('OpacPublic') ) { $uri = '/cgi-bin/koha/opac-user.pl'; } else { $uri = '/cgi-bin/koha/opac-main.pl'; } - $uri = $referer; + $uri = $fixed_referer; print $query->redirect( -uri => $uri, -cookie => $cookie -- 2.34.1