Project

General

Profile

Revision 8197

Added by Jing Tao over 7 years ago

First get the email sender from the skin properties. If it is null, get it from the metacat.properties file.

View differences:

src/perl/ldapweb.cgi
746 746
    my $errorMessage = "";
747 747
    if ($recipient) {
748 748
        my $mailhost = $properties->getProperty('email.mailhost');
749
        my $sender =  $properties->getProperty('email.sender');
749
        my $sender;
750
        $sender = $skinProperties->getProperty("email.sender") or $sender = $properties->getProperty('email.sender');
750 751
        # Send the email message to them
751 752
        my $smtp = Net::SMTP->new($mailhost);
752 753
        $smtp->mail($sender);
......
1006 1007
    my $link = $contextUrl. '/cgi-bin/ldapweb.cgi?cfg=' . $skinName . '&' . 'stage=' . $emailVerification . '&' . 'dn=' . $dn . '&' . 'hash=' . $randomStr . '&' . $orgStr . '&uid=' . $query->param('uid');
1007 1008
    
1008 1009
    my $mailhost = $properties->getProperty('email.mailhost');
1009
    my $sender =  $properties->getProperty('email.sender');
1010
    my $sender;
1011
    $sender = $skinProperties->getProperty("email.sender") or $sender = $properties->getProperty('email.sender');
1012
    debug("the sender is " . $sender);
1010 1013
    my $recipient = $query->param('mail');
1011 1014
    # Send the email message to them
1012 1015
    my $smtp = Net::SMTP->new($mailhost) or do {  

Also available in: Unified diff