Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 32426: Fix qatools issues

Browse source 
[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>
This commit is contained in:
Marcel de Rooy 2023-01-26 13:38:48 +00:00 committed by Tomas Cohen Arazi
parent ac6a6b99cd
commit 83a24bdde9
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
View file

@ -131,7 +131,7 @@
[% IF error_type == 'Koha::Exceptions::Patron::InvalidUserid' %] [% IF error_type == 'Koha::Exceptions::Patron::InvalidUserid' %]
<p>Error: Userid is not valid</p> <p>Error: Userid is not valid</p>
[% ELSE %] [% ELSE %]
<p>Error [% error_type %]: [% error_info %]</p> <p>Error [% error_type | html %]: [% error_info | html %]</p>
[% END %] [% END %]
</li></div> </li></div>
[% END %] [% END %]

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt
View file

@ -41,7 +41,7 @@
[% IF error_type == 'Koha::Exceptions::Patron::InvalidUserid' %] [% IF error_type == 'Koha::Exceptions::Patron::InvalidUserid' %]
<p>Error: Userid is not valid</p> <p>Error: Userid is not valid</p>
[% ELSE %] [% ELSE %]
<p>Error [% error_type %]: [% error_info %]</p> <p>Error [% error_type | html %]: [% error_info | html %]</p>
[% END %] [% END %]
[% END %] [% END %]
</div> </div>

5
opac/opac-registration-verify.pl
View file

@ -21,6 +21,7 @@ use CGI qw ( -utf8 );
use Try::Tiny; use Try::Tiny;
use C4::Auth qw( get_template_and_user ); use C4::Auth qw( get_template_and_user );
use C4::Context;
use C4::Output qw( output_html_with_http_headers ); use C4::Output qw( output_html_with_http_headers );
use C4::Letters qw( GetPreparedLetter EnqueueLetter SendQueuedMessages ); use C4::Letters qw( GetPreparedLetter EnqueueLetter SendQueuedMessages );
use C4::Members; use C4::Members;
@ -84,7 +85,7 @@ if (
template_name => "opac-registration-confirmation.tt", template_name => "opac-registration-confirmation.tt",
type => "opac", type => "opac",
query => $cgi, 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'); 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", template_name => "opac-registration-invalid.tt",
type => "opac", type => "opac",
query => $cgi, query => $cgi,
authnotrequired => 1, authnotrequired => C4::Context->preference("OpacPublic") ? 1 : 0,
}); });
$template->param( error_type => $error_type, error_info => $error_info ); $template->param( error_type => $error_type, error_info => $error_info );
} }