@@ -, +, @@ --- course_reserves/mod_course.pl | 11 +++-------- members/members-update-do.pl | 14 +++----------- reserve/modrequest.pl | 12 +++--------- reserve/modrequest_suspendall.pl | 12 +++--------- 4 files changed, 12 insertions(+), 37 deletions(-) --- a/course_reserves/mod_course.pl +++ a/course_reserves/mod_course.pl @@ -23,18 +23,13 @@ use CGI qw ( -utf8 ); use C4::Output; use C4::Reserves; -use C4::Auth qw( get_template_and_user ); +use C4::Auth qw( checkauth ); use C4::CourseReserves qw( DelCourse ModCourse ModCourseInstructors ); my $cgi = CGI->new; -my ( $template, $loggedinuser, $cookie ) = get_template_and_user( - { template_name => "about.tt", - query => $cgi, - type => "intranet", - flagsrequired => { coursereserves => 'manage_courses' }, - } -); + +checkauth($cgi, 0, { coursereserves => 'manage_courses' }, 'intranet'); my $action = $cgi->param('action') || ''; my $course_id = $cgi->param('course_id'); --- a/members/members-update-do.pl +++ a/members/members-update-do.pl @@ -19,7 +19,7 @@ use Modern::Perl; use CGI qw ( -utf8 ); -use C4::Auth qw( get_template_and_user ); +use C4::Auth qw( checkauth ); use C4::Output; use C4::Context; use Koha::Patrons; @@ -27,17 +27,9 @@ use Koha::Patron::Modifications; my $query = CGI->new; -# FIXME Should be a checkauth call -my ( $template, $loggedinuser, $cookie ) = get_template_and_user( - { - template_name => "about.tt", - query => $query, - type => "intranet", - flagsrequired => { borrowers => 'edit_borrowers' }, - } -); +my ( $userid, $cookie, $sessionID, $flags ) = checkauth($query, 0, { borrowers => 'edit_borrowers' }, 'intranet'); -my $logged_in_user = Koha::Patrons->find( $loggedinuser ); +my $logged_in_user = Koha::Patrons->find({ userid => $userid }); my @params = $query->param; --- a/reserve/modrequest.pl +++ a/reserve/modrequest.pl @@ -30,18 +30,12 @@ use Try::Tiny; use C4::Output; use C4::Reserves qw( ModReserve ModReserveCancelAll ); -use C4::Auth qw( get_template_and_user ); +use C4::Auth qw( checkauth ); use Koha::BackgroundJob::BatchUpdateBiblioHoldsQueue; my $query = CGI->new; -my ( $template, $loggedinuser, $cookie ) = get_template_and_user( - { - template_name => "about.tt", - query => $query, - type => "intranet", - flagsrequired => { reserveforothers => '*' }, - } -); + +checkauth($query, 0, { reserveforothers => '*' }, 'intranet'); my @reserve_id = $query->multi_param('reserve_id'); my @rank = $query->multi_param('rank-request'); --- a/reserve/modrequest_suspendall.pl +++ a/reserve/modrequest_suspendall.pl @@ -26,17 +26,11 @@ use Modern::Perl; use CGI qw ( -utf8 ); use C4::Output; use C4::Reserves qw( SuspendAll ); -use C4::Auth qw( get_template_and_user ); +use C4::Auth qw( checkauth ); my $query = CGI->new; -my ( $template, $loggedinuser, $cookie ) = get_template_and_user( - { - template_name => "about.tt", - query => $query, - type => "intranet", - flagsrequired => { reserveforothers => 1 }, - } -); + +checkauth($query, 0, { reserveforothers => '*' }, 'intranet'); my $borrowernumber = $query->param('borrowernumber'); my $suspend = $query->param('suspend'); --