version 1.243, 2015/07/21 21:26:32
|
version 1.245, 2020/06/09 21:32:32
|
Line 470 sub sendemail {
|
Line 470 sub sendemail {
|
} else { |
} else { |
# Otherwise build and send the email |
# Otherwise build and send the email |
$subject = '[LON-CAPA] '.$subject; |
$subject = '[LON-CAPA] '.$subject; |
&Apache::loncommon::mime_email($senderaddress, $to, $subject, $body, ,'', |
&Apache::loncommon::mime_email($senderaddress,$replytoaddress,$to, |
'', $attachmenturl, '', ''); |
$subject,$body,'','',$attachmenturl,'',''); |
$msgsent = 1; |
$msgsent = 1; |
} |
} |
return $msgsent; |
return $msgsent; |
Line 491 sub sendnotification {
|
Line 491 sub sendnotification {
|
$text=~s/\<\;/\</gs; |
$text=~s/\<\;/\</gs; |
$text=~s/\>\;/\>/gs; |
$text=~s/\>\;/\>/gs; |
my $homeserver = &Apache::lonnet::homeserver($touname,$toudom); |
my $homeserver = &Apache::lonnet::homeserver($touname,$toudom); |
|
my $hostname = &Apache::lonnet::hostname($homeserver); |
my $protocol = $Apache::lonnet::protocol{$homeserver}; |
my $protocol = $Apache::lonnet::protocol{$homeserver}; |
$protocol = 'http' if ($protocol ne 'https'); |
$protocol = 'http' if ($protocol ne 'https'); |
my $url = $protocol.'://'.&Apache::lonnet::hostname($homeserver). |
my $url = $protocol.'://'.$hostname. |
'/adm/email?username='.$touname.'&domain='.$toudom. |
'/adm/email?username='.$touname.'&domain='.$toudom. |
'&display='.&escape($msgid); |
'&display='.&escape($msgid); |
my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid, |
my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid, |