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

(-)a/C4/Letters.pm (-5 / +7 lines)
Lines 26-31 use Encode; Link Here
26
use Carp;
26
use Carp;
27
27
28
use C4::Members;
28
use C4::Members;
29
use C4::Branch;
29
use C4::Log;
30
use C4::Log;
30
use C4::SMS;
31
use C4::SMS;
31
use C4::Debug;
32
use C4::Debug;
Lines 440-454 sub SendAlerts { Link Here
440
    }    
441
    }    
441
   # send an "account details" notice to a newly created user 
442
   # send an "account details" notice to a newly created user 
442
    elsif ( $type eq 'members' ) {
443
    elsif ( $type eq 'members' ) {
443
        $letter->{content} =~ s/<<borrowers.title>>/$externalid->{'title'}/g;
444
        # must parse the password special, before it's hashed.
444
        $letter->{content} =~ s/<<borrowers.firstname>>/$externalid->{'firstname'}/g;
445
        $letter->{content} =~ s/<<borrowers.surname>>/$externalid->{'surname'}/g;
446
        $letter->{content} =~ s/<<borrowers.userid>>/$externalid->{'userid'}/g;
447
        $letter->{content} =~ s/<<borrowers.password>>/$externalid->{'password'}/g;
445
        $letter->{content} =~ s/<<borrowers.password>>/$externalid->{'password'}/g;
448
446
447
        parseletter( $letter, 'borrowers', $externalid->{'borrowernumber'});
448
        parseletter( $letter, 'branches', $externalid->{'branchcode'} );
449
450
        my $branchdetails = GetBranchDetail($externalid->{'branchcode'});
449
        my %mail = (
451
        my %mail = (
450
                To      =>     $externalid->{'emailaddr'},
452
                To      =>     $externalid->{'emailaddr'},
451
                From    =>  C4::Context->preference("KohaAdminEmailAddress"),
453
                From    =>  $branchdetails->{'branchemail'} || C4::Context->preference("KohaAdminEmailAddress"),
452
                Subject => $letter->{'title'}, 
454
                Subject => $letter->{'title'}, 
453
                Message => $letter->{'content'},
455
                Message => $letter->{'content'},
454
                'Content-Type' => 'text/plain; charset="utf8"',
456
                'Content-Type' => 'text/plain; charset="utf8"',
(-)a/members/memberentry.pl (-1 / +1 lines)
Lines 296-301 if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){ Link Here
296
	if ($op eq 'insert'){
296
	if ($op eq 'insert'){
297
		# we know it's not a duplicate borrowernumber or there would already be an error
297
		# we know it's not a duplicate borrowernumber or there would already be an error
298
        $borrowernumber = &AddMember(%newdata);
298
        $borrowernumber = &AddMember(%newdata);
299
        $newdata{'borrowernumber'} = $borrowernumber;
299
300
300
        # If 'AutoEmailOpacUser' syspref is on, email user their account details from the 'notice' that matches the user's branchcode.
301
        # If 'AutoEmailOpacUser' syspref is on, email user their account details from the 'notice' that matches the user's branchcode.
301
        if ( C4::Context->preference("AutoEmailOpacUser") == 1 && $newdata{'userid'}  && $newdata{'password'}) {
302
        if ( C4::Context->preference("AutoEmailOpacUser") == 1 && $newdata{'userid'}  && $newdata{'password'}) {
302
- 

Return to bug 3203