Bug 24018: Remove die "Not logged in"
Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
parent
eb4a843ace
commit
eaee34f47a
|
|
@ -142,7 +142,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
|
|||
flagsrequired => { circulate => 'circulate_remaining_permissions' },
|
||||
}
|
||||
);
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
|
||||
my $force_allow_issue = $query->param('forceallow') || 0;
|
||||
if (!C4::Auth::haspermission( C4::Context->userenv->{id} , { circulate => 'force_checkout' } )) {
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|||
}
|
||||
);
|
||||
|
||||
our $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
our $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
|
||||
my $dbh = C4::Context->dbh;
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ my $payment_id = $input->param('payment_id');
|
|||
my $change_given = $input->param('change_given');
|
||||
my $action = $input->param('action') || '';
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
my $library_id = C4::Context->userenv->{'branch'};
|
||||
my $patron = Koha::Patrons->find( $borrowernumber );
|
||||
unless ( $patron ) {
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ if ( $loggedinuser == $member ) {
|
|||
exit 0; # Exit without error
|
||||
}
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
my $patron = Koha::Patrons->find( $member );
|
||||
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ unless ( C4::Context->preference('useDischarge') ) {
|
|||
exit;
|
||||
}
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
my $patron = Koha::Patrons->find( $borrowernumber );
|
||||
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ my $branchcode =
|
|||
|
||||
if( $op eq 'allow' ) {
|
||||
my $borrowernumber = $input->param('borrowernumber');
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
my $patron = Koha::Patrons->find($borrowernumber);
|
||||
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
Koha::Patron::Discharge::discharge({
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ $template->param( 'borrower_files' => 1 );
|
|||
|
||||
my $borrowernumber = $cgi->param('borrowernumber');
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
my $patron = Koha::Patrons->find($borrowernumber);
|
||||
output_and_exit_if_error( $cgi, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ my $visit_id = $input->param('visit_id') // q{};
|
|||
|
||||
# Get patron
|
||||
my $borrowernumber = $input->param('borrowernumber');
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
my $patron = Koha::Patrons->find($borrowernumber);
|
||||
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|||
|
||||
my $borrowernumber = $input->param('borrowernumber');
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
my $patron = Koha::Patrons->find( $borrowernumber );
|
||||
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|||
}
|
||||
);
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find($loggedinuser) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find($loggedinuser);
|
||||
my $borrowernumber = $input->param('borrowernumber');
|
||||
my $patron = Koha::Patrons->find($borrowernumber);
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
|
|||
debug => 1,
|
||||
});
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
my %member2;
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ my $new_user_id = $input->param('newuserid');
|
|||
|
||||
my @errors;
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
my $patron = Koha::Patrons->find( $patron_id );
|
||||
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ $template->param( "quickadd" => 1 ) if ( $quickadd );
|
|||
$template->param( "duplicate" => 1 ) if ( $op eq 'duplicate' );
|
||||
$template->param( "checked" => 1 ) if ( defined($nodouble) && $nodouble eq 1 );
|
||||
if ( $op eq 'modify' or $op eq 'save' or $op eq 'duplicate' ) {
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
$borrower_data = $patron->unblessed;
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|||
}
|
||||
);
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
|
||||
my @params = $query->param;
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ my ( $loggedinuserid, $cookie, $sessionID ) = checkauth( $cgi, 0, { borrowers =>
|
|||
my $borrowernumber = $cgi->param('borrowernumber');
|
||||
my $action = $cgi->param('action');
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( { userid => $loggedinuserid } ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( { userid => $loggedinuserid } );
|
||||
my $patron = Koha::Patrons->find($borrowernumber);
|
||||
|
||||
# Ideally we should display a warning on the interface if the patron is not allowed
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ my $error = $input->param('error');
|
|||
$template->param( error => $error ) if ( $error );
|
||||
|
||||
my $patron = Koha::Patrons->find( $borrowernumber );
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
my $category_type = $patron->category->category_type;
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name =>
|
|||
debug => 1,
|
||||
});
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
# Allow resending of messages in Notices tab
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ my $payment_id = $input->param('payment_id');
|
|||
our $change_given = $input->param('change_given');
|
||||
|
||||
# get borrower details
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
our $patron = Koha::Patrons->find($borrowernumber);
|
||||
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|||
|
||||
# get borrower details
|
||||
my $borrowernumber = $input->param('borrowernumber');
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
my $patron = Koha::Patrons->find( $borrowernumber );
|
||||
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|||
my $borrowernumber = $input->param('borrowernumber');
|
||||
my $branchcode = C4::Context->userenv->{'branch'};
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
my $patron = Koha::Patrons->find( $borrowernumber );
|
||||
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ my $action = $input->param('action') || '';
|
|||
my $accountlines_id = $input->param('accountlines_id');
|
||||
my $change_given = $input->param('change_given');
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
my $patron = Koha::Patrons->find( $borrowernumber );
|
||||
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ my $borrowernumber = $input->param('borrowernumber');
|
|||
my $action = $input->param('action') || '';
|
||||
my $accountlines_id = $input->param('accountlines_id');
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
my $patron = Koha::Patrons->find( $borrowernumber );
|
||||
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|||
|
||||
my $borrowernumber = $input->param('borrowernumber');
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
my $patron = Koha::Patrons->find( $borrowernumber );
|
||||
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|||
|
||||
my $borrowernumber = $input->param('borrowernumber');
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
my $patron = Koha::Patrons->find( $borrowernumber );
|
||||
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ if ($input->param('borrowernumber')) {
|
|||
$patron = Koha::Patrons->find( $borrowernumber );
|
||||
}
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
my $order = 'date_due desc';
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ my $borrowernumber = $query->param('borrowernumber');
|
|||
|
||||
my $branch = C4::Context->userenv->{'branch'};
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
my $patron = Koha::Patrons->find( $borrowernumber );
|
||||
output_and_exit_if_error( $query, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ my $reregistration = $input->param('reregistration') || '';
|
|||
my $dbh = C4::Context->dbh;
|
||||
my $dateexpiry;
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( { userid => $loggedinuserid } ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( { userid => $loggedinuserid } );
|
||||
my $patron = Koha::Patrons->find( $borrowernumber );
|
||||
|
||||
# Ideally we should display a warning on the interface if the logged in user is
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|||
|
||||
my $borrowernumber = $input->param('borrowernumber');
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
my $patron = Koha::Patrons->find( $borrowernumber );
|
||||
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|||
}
|
||||
);
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
my $patron = Koha::Patrons->find( $borrowernumber );
|
||||
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ my $catcode = $input->param('catcode');
|
|||
my $cattype = $input->param('cattype');
|
||||
my $op = $input->param('op');
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
|
||||
my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
|
||||
if ( $op eq 'multi' ) {
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|||
}
|
||||
);
|
||||
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
||||
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
||||
|
||||
my %cookies = parse CGI::Cookie($cookie);
|
||||
my $sessionID = $cookies{'CGISESSID'}->value;
|
||||
|
|
|
|||
Loading…
Reference in New Issue