Skip to content

Commit fc650b3

Browse files
kidclampmrenvoize
authored andcommitted
Bug 31893: Use checkauth and do not fetch about.tt template
This patch updates four scripts to use checkauth instead of get_template_and_user reserve/modrequest.pl reserve/modrequest_suspendall.pl course_reserves/mod_course.pl members/members-update-do.pl No behvaiour change is expected To test: 0 - Apply patch 1 - Place some holds for a patron 2 - From patron page, confirm you can suspend all 3 - confirm you can delete marked holds 4 - Edit a course in course-reserves 5 - Make a chaneg to personal details via OPAC 6 - Confirm change can be approved on staff side Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
1 parent 9608b16 commit fc650b3

File tree

4 files changed

+12
-37
lines changed

4 files changed

+12
-37
lines changed

course_reserves/mod_course.pl

+3-8
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,13 @@
2323

2424
use C4::Output;
2525
use C4::Reserves;
26-
use C4::Auth qw( get_template_and_user );
26+
use C4::Auth qw( checkauth );
2727

2828
use C4::CourseReserves qw( DelCourse ModCourse ModCourseInstructors );
2929

3030
my $cgi = CGI->new;
31-
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
32-
{ template_name => "about.tt",
33-
query => $cgi,
34-
type => "intranet",
35-
flagsrequired => { coursereserves => 'manage_courses' },
36-
}
37-
);
31+
32+
checkauth($cgi, 0, { coursereserves => 'manage_courses' }, 'intranet');
3833

3934
my $action = $cgi->param('action') || '';
4035
my $course_id = $cgi->param('course_id');

members/members-update-do.pl

+3-11
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,17 @@
1919
use Modern::Perl;
2020

2121
use CGI qw ( -utf8 );
22-
use C4::Auth qw( get_template_and_user );
22+
use C4::Auth qw( checkauth );
2323
use C4::Output;
2424
use C4::Context;
2525
use Koha::Patrons;
2626
use Koha::Patron::Modifications;
2727

2828
my $query = CGI->new;
2929

30-
# FIXME Should be a checkauth call
31-
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
32-
{
33-
template_name => "about.tt",
34-
query => $query,
35-
type => "intranet",
36-
flagsrequired => { borrowers => 'edit_borrowers' },
37-
}
38-
);
30+
my ( $userid, $cookie, $sessionID, $flags ) = checkauth($query, 0, { borrowers => 'edit_borrowers' }, 'intranet');
3931

40-
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
32+
my $logged_in_user = Koha::Patrons->find({ userid => $userid });
4133

4234
my @params = $query->param;
4335

reserve/modrequest.pl

+3-9
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,12 @@
3030

3131
use C4::Output;
3232
use C4::Reserves qw( ModReserve ModReserveCancelAll );
33-
use C4::Auth qw( get_template_and_user );
33+
use C4::Auth qw( checkauth );
3434
use Koha::BackgroundJob::BatchUpdateBiblioHoldsQueue;
3535

3636
my $query = CGI->new;
37-
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
38-
{
39-
template_name => "about.tt",
40-
query => $query,
41-
type => "intranet",
42-
flagsrequired => { reserveforothers => '*' },
43-
}
44-
);
37+
38+
checkauth($query, 0, { reserveforothers => '*' }, 'intranet');
4539

4640
my @reserve_id = $query->multi_param('reserve_id');
4741
my @rank = $query->multi_param('rank-request');

reserve/modrequest_suspendall.pl

+3-9
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,11 @@
2626
use CGI qw ( -utf8 );
2727
use C4::Output;
2828
use C4::Reserves qw( SuspendAll );
29-
use C4::Auth qw( get_template_and_user );
29+
use C4::Auth qw( checkauth );
3030

3131
my $query = CGI->new;
32-
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
33-
{
34-
template_name => "about.tt",
35-
query => $query,
36-
type => "intranet",
37-
flagsrequired => { reserveforothers => 1 },
38-
}
39-
);
32+
33+
checkauth($query, 0, { reserveforothers => '*' }, 'intranet');
4034

4135
my $borrowernumber = $query->param('borrowernumber');
4236
my $suspend = $query->param('suspend');

0 commit comments

Comments
 (0)