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

(-)a/C4/Letters.pm (-2 / +27 lines)
Lines 1072-1077 sub SendQueuedMessages { Link Here
1072
    return scalar( @$unsent_messages );
1072
    return scalar( @$unsent_messages );
1073
}
1073
}
1074
1074
1075
=head2 SendPasswordEmailFromQueue ($borrowernumber)
1076
1077
  my $sent_pw = SendPasswordEmailFromQueue($borrowernumber)
1078
1079
Used to immediately send a forgotten password request rather than have the user wait until the next time the entire queue is processed.
1080
Messages from the `message_queue` table are matched on borrowernumber and letter_code='PASSWORD_RESET'
1081
1082
=cut
1083
1084
sub SendPasswordEmailFromQueue {
1085
    my $borrowernumber = shift;
1086
1087
    my $pw_msg = _get_unsent_messages( { borrowernumber => $borrowernumber,
1088
                                         letter_code    => 'PASSWORD_RESET' } );
1089
    if ( $pw_msg ) {
1090
        _send_message_by_email( $pw_msg->[0], undef, undef, 'LOGIN' );
1091
    } else {
1092
        return 0;
1093
    }
1094
}
1095
1075
=head2 GetRSSMessages
1096
=head2 GetRSSMessages
1076
1097
1077
  my $message_list = GetRSSMessages( { limit => 10, borrowernumber => '14' } )
1098
  my $message_list = GetRSSMessages( { limit => 10, borrowernumber => '14' } )
Lines 1278-1294 ENDSQL Link Here
1278
    my @query_params = ('pending');
1299
    my @query_params = ('pending');
1279
    if ( ref $params ) {
1300
    if ( ref $params ) {
1280
        if ( $params->{'message_transport_type'} ) {
1301
        if ( $params->{'message_transport_type'} ) {
1281
            $statement .= ' AND message_transport_type = ? ';
1302
            $statement .= ' AND mq.message_transport_type = ? ';
1282
            push @query_params, $params->{'message_transport_type'};
1303
            push @query_params, $params->{'message_transport_type'};
1283
        }
1304
        }
1284
        if ( $params->{'borrowernumber'} ) {
1305
        if ( $params->{'borrowernumber'} ) {
1285
            $statement .= ' AND borrowernumber = ? ';
1306
            $statement .= ' AND mq.borrowernumber = ? ';
1286
            push @query_params, $params->{'borrowernumber'};
1307
            push @query_params, $params->{'borrowernumber'};
1287
        }
1308
        }
1288
        if ( $params->{'limit'} ) {
1309
        if ( $params->{'limit'} ) {
1289
            $statement .= ' limit ? ';
1310
            $statement .= ' limit ? ';
1290
            push @query_params, $params->{'limit'};
1311
            push @query_params, $params->{'limit'};
1291
        }
1312
        }
1313
        if ( $params->{'letter_code'} ) {
1314
            $statement .= ' AND mq.letter_code = ? ';
1315
            push @query_params, $params->{'letter_code'};
1316
        }
1292
    }
1317
    }
1293
1318
1294
    $debug and warn "_get_unsent_messages SQL: $statement";
1319
    $debug and warn "_get_unsent_messages SQL: $statement";
(-)a/Koha/Patron/Password/Recovery.pm (-1 / +2 lines)
Lines 161-166 sub SendPasswordRecoveryEmail { Link Here
161
        }
161
        }
162
    );
162
    );
163
163
164
    my $sent_pw = C4::Letters::SendPasswordEmailFromQueue($borrower->borrowernumber);
165
164
    return 1;
166
    return 1;
165
}
167
}
166
168
167
- 

Return to bug 18570