version 1.243, 2015/07/21 21:26:32
|
version 1.247, 2021/11/30 15:55:37
|
Line 231 sub packagemsg {
|
Line 231 sub packagemsg {
|
$attachmenturl =&HTML::Entities::encode($attachmenturl,'<>&"'); |
$attachmenturl =&HTML::Entities::encode($attachmenturl,'<>&"'); |
my $course_context = &get_course_context(); |
my $course_context = &get_course_context(); |
my $now=time; |
my $now=time; |
|
my $ip = &Apache::lonnet::get_requestor_ip(); |
my $msgcount = &get_uniq(); |
my $msgcount = &get_uniq(); |
unless(defined($msgid)) { |
unless(defined($msgid)) { |
$msgid = &buildmsgid($now,$subject,$env{'user.name'},$env{'user.domain'}, |
$msgid = &buildmsgid($now,$subject,$env{'user.name'},$env{'user.domain'}, |
Line 250 sub packagemsg {
|
Line 251 sub packagemsg {
|
} |
} |
$result .= '<servername>'.$ENV{'SERVER_NAME'}.'</servername>'. |
$result .= '<servername>'.$ENV{'SERVER_NAME'}.'</servername>'. |
'<host>'.$ENV{'HTTP_HOST'}.'</host>'. |
'<host>'.$ENV{'HTTP_HOST'}.'</host>'. |
'<client>'.$ENV{'REMOTE_ADDR'}.'</client>'. |
'<client>'.$ip.'</client>'. |
'<browsertype>'.$env{'browser.type'}.'</browsertype>'. |
'<browsertype>'.$env{'browser.type'}.'</browsertype>'. |
'<browseros>'.$env{'browser.os'}.'</browseros>'. |
'<browseros>'.$env{'browser.os'}.'</browseros>'. |
'<browserversion>'.$env{'browser.version'}.'</browserversion>'. |
'<browserversion>'.$env{'browser.version'}.'</browserversion>'. |
Line 470 sub sendemail {
|
Line 471 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 492 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). |
#FIXME |
|
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, |
Line 537 to access the full message.',$url);
|
Line 540 to access the full message.',$url);
|
$subject = $subj; |
$subject = $subj; |
} |
} |
|
|
my ($blocked,$blocktext); |
my ($blocked,$blocktext,$clientip); |
|
$clientip = &Apache::lonnet::get_requestor_ip(); |
if (!$crit) { |
if (!$crit) { |
my %setters; |
my %setters; |
my ($startblock,$endblock) = |
my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) = |
&Apache::loncommon::blockcheck(\%setters,'com',$touname,$toudom); |
&Apache::loncommon::blockcheck(\%setters,'com',$clientip,$touname,$toudom); |
if ($startblock && $endblock) { |
if ($startblock && $endblock) { |
$blocked = 1; |
$blocked = 1; |
my $showstart = &Apache::lonlocal::locallocaltime($startblock); |
my $showstart = &Apache::lonlocal::locallocaltime($startblock); |
my $showend = &Apache::lonlocal::locallocaltime($endblock); |
my $showend = &Apache::lonlocal::locallocaltime($endblock); |
$blocktext = &mt_user($user_lh,'LON-CAPA messages sent to you between [_1] and [_2] will be inaccessible until the end of this time period, because you are a student in a course with an active communications block.',$showstart,$showend); |
$blocktext = &mt_user($user_lh,'LON-CAPA messages sent to you between [_1] and [_2] will be inaccessible until the end of this time period, because you are a student in a course with an active communications block.',$showstart,$showend); |
|
} elsif ($by_ip) { |
|
$blocked = 1; |
|
$blocktext = &mt_user($user_lh,'LON-CAPA messages sent to you will be inaccessible from your IP address [_1], because communication is being blocked for certain IP address(es).',$clientip); |
} |
} |
} |
} |
if ($userenv{'notifywithhtml'} ne '') { |
if ($userenv{'notifywithhtml'} ne '') { |