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>

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 5bc227d..90e525c 100755 (executable)
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -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' } )) {

diff --git a/circ/overdue.pl b/circ/overdue.pl
index 0e558dc..f7ef53e 100755 (executable)
--- a/circ/overdue.pl
+++ b/circ/overdue.pl
@@ -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;
 

diff --git a/members/boraccount.pl b/members/boraccount.pl
index f5d7256..8dfe35d 100755 (executable)
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -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 ) {

diff --git a/members/deletemem.pl b/members/deletemem.pl
index 5434cdf..1ae2c66 100755 (executable)
--- a/members/deletemem.pl
+++ b/members/deletemem.pl
@@ -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 } );
 

diff --git a/members/discharge.pl b/members/discharge.pl
index 9e530bf..f4a7023 100755 (executable)
--- a/members/discharge.pl
+++ b/members/discharge.pl
@@ -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 } );
 

diff --git a/members/discharges.pl b/members/discharges.pl
index 665d273..de21e49 100755 (executable)
--- a/members/discharges.pl
+++ b/members/discharges.pl
@@ -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({

diff --git a/members/files.pl b/members/files.pl
index 0bd4f94..e35f7e9 100755 (executable)
--- a/members/files.pl
+++ b/members/files.pl
@@ -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 } );
 

diff --git a/members/housebound.pl b/members/housebound.pl
index 4b965d8..663bc3c 100755 (executable)
--- a/members/housebound.pl
+++ b/members/housebound.pl
@@ -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 } );
 

diff --git a/members/ill-requests.pl b/members/ill-requests.pl
index cb02c73..911fc38 100755 (executable)
--- a/members/ill-requests.pl
+++ b/members/ill-requests.pl
@@ -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 } );
 

diff --git a/members/mancredit.pl b/members/mancredit.pl
index b3c560d..670882b 100755 (executable)
--- a/members/mancredit.pl
+++ b/members/mancredit.pl
@@ -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);
 

diff --git a/members/member-flags.pl b/members/member-flags.pl
index f493a06..14bdd5c 100755 (executable)
--- a/members/member-flags.pl
+++ b/members/member-flags.pl
@@ -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;

diff --git a/members/member-password.pl b/members/member-password.pl
index c1db3aa..e9d5f54 100755 (executable)
--- a/members/member-password.pl
+++ b/members/member-password.pl
@@ -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 } );
 

diff --git a/members/memberentry.pl b/members/memberentry.pl
index 2471457..c2c05fb 100755 (executable)
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -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;

diff --git a/members/members-update-do.pl b/members/members-update-do.pl
index cc29dbe..6f9b370 100755 (executable)
--- a/members/members-update-do.pl
+++ b/members/members-update-do.pl
@@ -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;
 

diff --git a/members/mod_debarment.pl b/members/mod_debarment.pl
index bc155e5..cf129e2 100755 (executable)
--- a/members/mod_debarment.pl
+++ b/members/mod_debarment.pl
@@ -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

diff --git a/members/moremember.pl b/members/moremember.pl
index a2ba396..f083203 100755 (executable)
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -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;

diff --git a/members/notices.pl b/members/notices.pl
index 3a70683..1d4d2e9 100755 (executable)
--- a/members/notices.pl
+++ b/members/notices.pl
@@ -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

diff --git a/members/pay.pl b/members/pay.pl
index 5094a5f..a126bfe 100755 (executable)
--- a/members/pay.pl
+++ b/members/pay.pl
@@ -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 } );
 

diff --git a/members/paycollect.pl b/members/paycollect.pl
index 8590765..a7f0e39 100755 (executable)
--- a/members/paycollect.pl
+++ b/members/paycollect.pl
@@ -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 } );
 

diff --git a/members/print_overdues.pl b/members/print_overdues.pl
index 4fd9c38..4552990 100755 (executable)
--- a/members/print_overdues.pl
+++ b/members/print_overdues.pl
@@ -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 } );
 

diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl
index 1d92e19..5c56514 100755 (executable)
--- a/members/printfeercpt.pl
+++ b/members/printfeercpt.pl
@@ -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 } );
 

diff --git a/members/printinvoice.pl b/members/printinvoice.pl
index ce16cea..79b8673 100755 (executable)
--- a/members/printinvoice.pl
+++ b/members/printinvoice.pl
@@ -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 } );
 

diff --git a/members/printslip.pl b/members/printslip.pl
index a3d2d50..f27083e 100755 (executable)
--- a/members/printslip.pl
+++ b/members/printslip.pl
@@ -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 } );
 

diff --git a/members/purchase-suggestions.pl b/members/purchase-suggestions.pl
index 67c021e..d064afd 100755 (executable)
--- a/members/purchase-suggestions.pl
+++ b/members/purchase-suggestions.pl
@@ -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 } );
 

diff --git a/members/readingrec.pl b/members/readingrec.pl
index 7dd71f8..eea8c08 100755 (executable)
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -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';

diff --git a/members/routing-lists.pl b/members/routing-lists.pl
index 4885b14..392b9e7 100755 (executable)
--- a/members/routing-lists.pl
+++ b/members/routing-lists.pl
@@ -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 } );
 

diff --git a/members/setstatus.pl b/members/setstatus.pl
index bb22f3d..a98d555 100755 (executable)
--- a/members/setstatus.pl
+++ b/members/setstatus.pl
@@ -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

diff --git a/members/statistics.pl b/members/statistics.pl
index ba45345..5fe2bf6 100755 (executable)
--- a/members/statistics.pl
+++ b/members/statistics.pl
@@ -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 } );
 

diff --git a/members/summary-print.pl b/members/summary-print.pl
index 38127c9..2611a16 100755 (executable)
--- a/members/summary-print.pl
+++ b/members/summary-print.pl
@@ -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 } );
 

diff --git a/members/update-child.pl b/members/update-child.pl
index 60d239a..42cfe27 100755 (executable)
--- a/members/update-child.pl
+++ b/members/update-child.pl
@@ -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' ) {

diff --git a/tools/modborrowers.pl b/tools/modborrowers.pl
index eaa93ea..5843c73 100755 (executable)
--- a/tools/modborrowers.pl
+++ b/tools/modborrowers.pl
@@ -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;