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

(-)a/C4/Letters.pm (+5 lines)
Lines 1405-1410 sub _send_message_by_email { Link Here
1405
      if !$message->{to_address}
1405
      if !$message->{to_address}
1406
      || $message->{to_address} ne $email->email->header('To');
1406
      || $message->{to_address} ne $email->email->header('To');
1407
1407
1408
    _update_message_from_address($message->{'message_id'},$email->email->header('From') ) 
1409
      if !$message->{from_address} 
1410
      || $message->{from_address} ne $email->email->header('From');
1411
1412
1408
    try {
1413
    try {
1409
        $email->send_or_die({ transport => $smtp_server->transport });
1414
        $email->send_or_die({ transport => $smtp_server->transport });
1410
1415
(-)a/Koha/Email.pm (-3 / +6 lines)
Lines 87-95 sub create { Link Here
87
        $args->{to} = $params->{to};
87
        $args->{to} = $params->{to};
88
    }
88
    }
89
89
90
    Koha::Exceptions::BadParameter->throw("Invalid 'to' parameter: ".$args->{to})
90
    my @emails = split(',', $args->{to}); 
91
        unless Email::Valid->address($args->{to}); # to is mandatory
91
    foreach my $email (@emails) {
92
92
        $email =~ s/ //g;
93
        Koha::Exceptions::BadParameter->throw("Invalid 'to' parameter: ".$email)
94
            unless Email::Valid->address($email); # to is mandatory
95
    }
93
    my $addresses = {};
96
    my $addresses = {};
94
    $addresses->{reply_to} = $params->{reply_to};
97
    $addresses->{reply_to} = $params->{reply_to};
95
    $addresses->{reply_to} ||= C4::Context->preference('ReplytoDefault')
98
    $addresses->{reply_to} ||= C4::Context->preference('ReplytoDefault')
(-)a/Koha/Patron.pm (-11 / +12 lines)
Lines 1244-1260 sub notice_email_address{ Link Here
1244
1244
1245
    my $use_guarantor = C4::Context->preference('RedirectGuaranteeEmail');
1245
    my $use_guarantor = C4::Context->preference('RedirectGuaranteeEmail');
1246
    if ($use_guarantor) {
1246
    if ($use_guarantor) {
1247
        my $guarantor = $self->guarantor;
1247
        my @guarantors = map { $_->guarantor } $self->guarantor_relationships();
1248
        if ($guarantor) {
1248
        if (@guarantors) {
1249
            if ( $which_address eq 'OFF' ) {
1249
            foreach my $guarantor (@guarantors) {
1250
                $guarantor_address = $guarantor->first_valid_email_address;
1250
                if ( $which_address eq 'OFF' ) {
1251
            } else {
1251
                    $guarantor_address = $guarantor->first_valid_email_address;
1252
                $guarantor_address = $guarantor->$which_address || '';
1252
                } else {
1253
            }
1253
                    $guarantor_address = $guarantor->$which_address || '';
1254
            if ($address){
1254
                }
1255
                $address .= ', ';
1255
                if ($address){
1256
            }
1256
                    $address .= ', ';
1257
                }
1257
                $address .=  $guarantor_address if $guarantor_address;
1258
                $address .=  $guarantor_address if $guarantor_address;
1259
            }
1258
        }
1260
        }
1259
    }
1261
    }
1260
    return $address;
1262
    return $address;
1261
- 

Return to bug 12532