gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 34731: Don't call SendQueuedMessages if message_id is bad 

Signed-off-by: David Nind <david@davidnind.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:
Kyle M Hall 2023-09-07 11:15:25 -04:00 committed by Tomas Cohen Arazi
parent 7eb195b6bd
commit e0b3a6c2aa
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
15 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C4/Auth_with_ldap.pm
View File

@ -261,7 +261,7 @@ sub checkpw_ldap {
}
);
C4::Letters::SendQueuedMessages( { message_id => $message_id } );
C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
}
}
} else {

2
C4/Auth_with_shibboleth.pm
View File

@ -169,7 +169,7 @@ sub _autocreate {
message_transport_type => 'email'
}
);
C4::Letters::SendQueuedMessages( { message_id => $message_id } );
C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
}
}
return ( 1, $patron->cardnumber, $patron->userid );

2
Koha/Patron.pm
View File

@ -932,7 +932,7 @@ sub set_password {
message_transport_type => 'email'
}
);
C4::Letters::SendQueuedMessages( { message_id => $message_id } );
C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
}
}
}

3
Koha/Patron/Password/Recovery.pm
View File

@ -158,8 +158,7 @@ sub SendPasswordRecoveryEmail {
}
);
my $num_letters_attempted =
C4::Letters::SendQueuedMessages( { message_id => $message_id } );
my $num_letters_attempted = C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
return ($num_letters_attempted > 0);
}

2
Koha/REST/V1/TwoFactorAuth.pm
View File

@ -62,7 +62,7 @@ sub send_otp_token {
message_transport_type => 'email'
}
);
C4::Letters::SendQueuedMessages({message_id => $message_id});
C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
my $message = C4::Letters::GetMessage($message_id);

7
Koha/Ticket.pm
View File

@ -131,8 +131,8 @@ sub store {
borrowernumber => $self->reporter_id,
}
);
C4::Letters::SendQueuedMessages(
{ message_id => $acknowledgement_message_id } );
C4::Letters::SendQueuedMessages( { message_id => $acknowledgement_message_id } )
if $acknowledgement_message_id;
}
# Notify cataloger by email
@ -156,8 +156,7 @@ sub store {
reply_address => $self->reporter->notice_email_address,
}
);
C4::Letters::SendQueuedMessages(
{ message_id => $message_id } );
C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
}
}
}

2
basket/sendbasket.pl
View File

@ -111,7 +111,7 @@ if ($email_add) {
}
);
C4::Letters::SendQueuedMessages( { message_id => $message_id } );
C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
$template->param( SENT => 1 );
}

4
members/boraccount.pl
View File

@ -207,8 +207,8 @@ if ( $action eq 'send_receipt' ) {
message_transport_type => 'email',
}
);
C4::Letters::SendQueuedMessages( { message_id => $message_id } );
$receipt_sent = 1;
C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
$receipt_sent = $message_id ? 1 : -1;
}
else {
$receipt_sent = -1;

2
members/memberentry.pl
View File

@ -450,7 +450,7 @@ if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){
message_transport_type => 'email'
}
);
SendQueuedMessages({ message_id => $message_id });
SendQueuedMessages( { message_id => $message_id } ) if $message_id;
};
if ($@) {
$template->param( error_alert => $@ );

4
opac/opac-memberentry.pl
View File

@ -211,7 +211,7 @@ if ( $action eq 'create' ) {
C4::Context->preference('KohaAdminEmailAddress'),
}
);
C4::Letters::SendQueuedMessages({ message_id => $message_id });
C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
}
else {
$borrower{password} ||= Koha::AuthUtils::generate_password(Koha::Patron::Categories->find($borrower{categorycode}));
@ -279,7 +279,7 @@ if ( $action eq 'create' ) {
message_transport_type => 'email'
}
);
SendQueuedMessages({ message_id => $message_id });
SendQueuedMessages( { message_id => $message_id } ) if $message_id;
};
}
}

2
opac/opac-registration-verify.pl
View File

@ -120,7 +120,7 @@ if (
message_transport_type => 'email'
}
);
SendQueuedMessages({ message_id => $message_id });
SendQueuedMessages( { message_id => $message_id } ) if $message_id;
};
}
}

2
opac/opac-sendbasket.pl
View File

@ -110,7 +110,7 @@ if ( $email_add ) {
}
);
C4::Letters::SendQueuedMessages( { message_id => $message_id } );
C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
$template->param( SENT => 1 );
}

2
opac/opac-sendshelf.pl
View File

@ -118,7 +118,7 @@ if ( $shelf and $shelf->can_be_viewed($borrowernumber) ) {
}
);
C4::Letters::SendQueuedMessages( { message_id => $message_id } );
C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
$template->param( SENT => 1 );
}

2
pos/pay.pl
View File

@ -116,7 +116,7 @@ if ( $action eq 'send' ) {
);
# Send immediately
SendQueuedMessages( { message_id => $message_id } );
SendQueuedMessages( { message_id => $message_id } ) if $message_id;
# Set variables for template to allow printing still
$template->param(

2
virtualshelves/sendshelf.pl
View File

@ -117,7 +117,7 @@ if ($to_address) {
}
);
C4::Letters::SendQueuedMessages( { message_id => $message_id } );
C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
$template->param( SENT => 1 );
}