From 83a24bdde9ec1576842223c00dba26eb879e2e94 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Thu, 26 Jan 2023 13:38:48 +0000
Subject: [PATCH] Bug 32426: Fix qatools issues

[1] opac-registration-verify.pl forbidden pattern: Script permissions is authnotrequired => 1, it is correct for an OPAC script, not intranet (bug 24663)
    => Do not go back to authrequired => 1. Use a check on OpacPublic.
[2] opac-registration-invalid.tt missing_filter at line 41 (<p>Error [% error_type %]: [% error_info %]</p>)
[3] opac-memberentry.tt missing_filter at line 131 (<p>Error [% error_type %]: [% error_info %]</p>)

Test plan:
Verify that qatools passes.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt | 2 +-
 .../bootstrap/en/modules/opac-registration-invalid.tt        | 2 +-
 opac/opac-registration-verify.pl                             | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
index f9eb61242c..5bd55356a0 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
@@ -131,7 +131,7 @@
                         [% IF error_type == 'Koha::Exceptions::Patron::InvalidUserid' %]
                             <p>Error: Userid is not valid</p>
                         [% ELSE %]
-                            <p>Error [% error_type %]: [% error_info %]</p>
+                            <p>Error [% error_type | html %]: [% error_info | html %]</p>
                         [% END %]
                     </li></div>
                 [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt
index 16bfc5e07c..feede44fcf 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt
@@ -41,7 +41,7 @@
                                 [% IF error_type == 'Koha::Exceptions::Patron::InvalidUserid' %]
                                     <p>Error: Userid is not valid</p>
                                 [% ELSE %]
-                                    <p>Error [% error_type %]: [% error_info %]</p>
+                                    <p>Error [% error_type | html %]: [% error_info | html %]</p>
                                 [% END %]
                             [% END %]
                         </div>
diff --git a/opac/opac-registration-verify.pl b/opac/opac-registration-verify.pl
index 8c186dd45a..4af265c110 100755
--- a/opac/opac-registration-verify.pl
+++ b/opac/opac-registration-verify.pl
@@ -21,6 +21,7 @@ use CGI qw ( -utf8 );
 use Try::Tiny;
 
 use C4::Auth qw( get_template_and_user );
+use C4::Context;
 use C4::Output qw( output_html_with_http_headers );
 use C4::Letters qw( GetPreparedLetter EnqueueLetter SendQueuedMessages );
 use C4::Members;
@@ -84,7 +85,7 @@ if (
                 template_name   => "opac-registration-confirmation.tt",
                 type            => "opac",
                 query           => $cgi,
-                authnotrequired => 1,
+                authnotrequired => C4::Context->preference("OpacPublic") ? 1 : 0,
             }
         );
         C4::Form::MessagingPreferences::handle_form_action($cgi, { borrowernumber => $patron->borrowernumber }, $template, 1, C4::Context->preference('PatronSelfRegistrationDefaultCategory') ) if C4::Context->preference('EnhancedMessagingPreferences');
@@ -146,7 +147,7 @@ if( !$template ) { # Missing token, patron exception, etc.
         template_name   => "opac-registration-invalid.tt",
         type            => "opac",
         query           => $cgi,
-        authnotrequired => 1,
+        authnotrequired => C4::Context->preference("OpacPublic") ? 1 : 0,
     });
     $template->param( error_type => $error_type, error_info => $error_info );
 }
-- 
2.39.5