View | Details | Raw Unified | Return to bug 34731
Collapse All | Expand All

(-)a/C4/Auth_with_ldap.pm (-1 / +1 lines)
Lines 261-267 sub checkpw_ldap { Link Here
261
                    }
261
                    }
262
                );
262
                );
263
263
264
                C4::Letters::SendQueuedMessages( { message_id => $message_id } );
264
                C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
265
            }
265
            }
266
        }
266
        }
267
   } else {
267
   } else {
(-)a/C4/Auth_with_shibboleth.pm (-1 / +1 lines)
Lines 169-175 sub _autocreate { Link Here
169
                    message_transport_type => 'email'
169
                    message_transport_type => 'email'
170
                }
170
                }
171
            );
171
            );
172
            C4::Letters::SendQueuedMessages( { message_id => $message_id } );
172
            C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
173
        }
173
        }
174
    }
174
    }
175
    return ( 1, $patron->cardnumber, $patron->userid );
175
    return ( 1, $patron->cardnumber, $patron->userid );
(-)a/Koha/Patron.pm (-1 / +1 lines)
Lines 932-938 sub set_password { Link Here
932
                        message_transport_type => 'email'
932
                        message_transport_type => 'email'
933
                    }
933
                    }
934
                );
934
                );
935
                C4::Letters::SendQueuedMessages( { message_id => $message_id } );
935
                C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
936
            }
936
            }
937
        }
937
        }
938
    }
938
    }
(-)a/Koha/Patron/Password/Recovery.pm (-2 / +1 lines)
Lines 158-165 sub SendPasswordRecoveryEmail { Link Here
158
        }
158
        }
159
    );
159
    );
160
160
161
    my $num_letters_attempted =
161
    my $num_letters_attempted = C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
162
      C4::Letters::SendQueuedMessages( { message_id => $message_id } );
163
162
164
    return ($num_letters_attempted > 0);
163
    return ($num_letters_attempted > 0);
165
}
164
}
(-)a/Koha/REST/V1/TwoFactorAuth.pm (-1 / +1 lines)
Lines 62-68 sub send_otp_token { Link Here
62
                message_transport_type => 'email'
62
                message_transport_type => 'email'
63
            }
63
            }
64
        );
64
        );
65
        C4::Letters::SendQueuedMessages({message_id => $message_id});
65
        C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
66
66
67
        my $message = C4::Letters::GetMessage($message_id);
67
        my $message = C4::Letters::GetMessage($message_id);
68
68
(-)a/Koha/Ticket.pm (-4 / +3 lines)
Lines 131-138 sub store { Link Here
131
                    borrowernumber         => $self->reporter_id,
131
                    borrowernumber         => $self->reporter_id,
132
                }
132
                }
133
            );
133
            );
134
            C4::Letters::SendQueuedMessages(
134
            C4::Letters::SendQueuedMessages( { message_id => $acknowledgement_message_id } )
135
                { message_id => $acknowledgement_message_id } );
135
                if $acknowledgement_message_id;
136
        }
136
        }
137
137
138
        # Notify cataloger by email
138
        # Notify cataloger by email
Lines 156-163 sub store { Link Here
156
                        reply_address => $self->reporter->notice_email_address,
156
                        reply_address => $self->reporter->notice_email_address,
157
                    }
157
                    }
158
                );
158
                );
159
                C4::Letters::SendQueuedMessages(
159
                C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
160
                    { message_id => $message_id } );
161
            }
160
            }
162
        }
161
        }
163
    }
162
    }
(-)a/basket/sendbasket.pl (-1 / +1 lines)
Lines 111-117 if ($email_add) { Link Here
111
            }
111
            }
112
        );
112
        );
113
113
114
        C4::Letters::SendQueuedMessages( { message_id => $message_id } );
114
        C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
115
115
116
        $template->param( SENT => 1 );
116
        $template->param( SENT => 1 );
117
    }
117
    }
(-)a/members/boraccount.pl (-2 / +2 lines)
Lines 207-214 if ( $action eq 'send_receipt' ) { Link Here
207
                message_transport_type => 'email',
207
                message_transport_type => 'email',
208
            }
208
            }
209
        );
209
        );
210
        C4::Letters::SendQueuedMessages( { message_id => $message_id } );
210
        C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
211
        $receipt_sent = 1;
211
        $receipt_sent = $message_id ? 1 : -1;
212
    }
212
    }
213
    else {
213
    else {
214
        $receipt_sent = -1;
214
        $receipt_sent = -1;
(-)a/members/memberentry.pl (-1 / +1 lines)
Lines 450-456 if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){ Link Here
450
                            message_transport_type => 'email'
450
                            message_transport_type => 'email'
451
                        }
451
                        }
452
                    );
452
                    );
453
                    SendQueuedMessages({ message_id => $message_id });
453
                    SendQueuedMessages( { message_id => $message_id } ) if $message_id;
454
                };
454
                };
455
                if ($@) {
455
                if ($@) {
456
                    $template->param( error_alert => $@ );
456
                    $template->param( error_alert => $@ );
(-)a/opac/opac-memberentry.pl (-2 / +2 lines)
Lines 211-217 if ( $action eq 'create' ) { Link Here
211
                      C4::Context->preference('KohaAdminEmailAddress'),
211
                      C4::Context->preference('KohaAdminEmailAddress'),
212
                }
212
                }
213
            );
213
            );
214
            C4::Letters::SendQueuedMessages({ message_id => $message_id });
214
            C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
215
        }
215
        }
216
        else {
216
        else {
217
            $borrower{password}         ||= Koha::AuthUtils::generate_password(Koha::Patron::Categories->find($borrower{categorycode}));
217
            $borrower{password}         ||= Koha::AuthUtils::generate_password(Koha::Patron::Categories->find($borrower{categorycode}));
Lines 279-285 if ( $action eq 'create' ) { Link Here
279
                                    message_transport_type => 'email'
279
                                    message_transport_type => 'email'
280
                                }
280
                                }
281
                            );
281
                            );
282
                            SendQueuedMessages({ message_id => $message_id });
282
                            SendQueuedMessages( { message_id => $message_id } ) if $message_id;
283
                        };
283
                        };
284
                    }
284
                    }
285
                }
285
                }
(-)a/opac/opac-registration-verify.pl (-1 / +1 lines)
Lines 120-126 if ( Link Here
120
                            message_transport_type => 'email'
120
                            message_transport_type => 'email'
121
                        }
121
                        }
122
                    );
122
                    );
123
                    SendQueuedMessages({ message_id => $message_id });
123
                    SendQueuedMessages( { message_id => $message_id } ) if $message_id;
124
                };
124
                };
125
            }
125
            }
126
        }
126
        }
(-)a/opac/opac-sendbasket.pl (-1 / +1 lines)
Lines 110-116 if ( $email_add ) { Link Here
110
            }
110
            }
111
        );
111
        );
112
112
113
        C4::Letters::SendQueuedMessages( { message_id => $message_id } );
113
        C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
114
114
115
        $template->param( SENT => 1 );
115
        $template->param( SENT => 1 );
116
    }
116
    }
(-)a/opac/opac-sendshelf.pl (-1 / +1 lines)
Lines 118-124 if ( $shelf and $shelf->can_be_viewed($borrowernumber) ) { Link Here
118
                }
118
                }
119
            );
119
            );
120
120
121
            C4::Letters::SendQueuedMessages( { message_id => $message_id } );
121
            C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
122
122
123
            $template->param( SENT => 1 );
123
            $template->param( SENT => 1 );
124
        }
124
        }
(-)a/pos/pay.pl (-1 / +1 lines)
Lines 116-122 if ( $action eq 'send' ) { Link Here
116
    );
116
    );
117
117
118
    # Send immediately
118
    # Send immediately
119
    SendQueuedMessages( { message_id => $message_id } );
119
    SendQueuedMessages( { message_id => $message_id } ) if $message_id;
120
120
121
    # Set variables for template to allow printing still
121
    # Set variables for template to allow printing still
122
    $template->param(
122
    $template->param(
(-)a/virtualshelves/sendshelf.pl (-2 / +1 lines)
Lines 117-123 if ($to_address) { Link Here
117
            }
117
            }
118
        );
118
        );
119
119
120
        C4::Letters::SendQueuedMessages( { message_id => $message_id } );
120
        C4::Letters::SendQueuedMessages( { message_id => $message_id } ) if $message_id;
121
121
122
        $template->param( SENT => 1 );
122
        $template->param( SENT => 1 );
123
    }
123
    }
124
- 

Return to bug 34731