version 1.189, 2006/12/06 23:44:33
|
version 1.190, 2006/12/13 01:45:15
|
Line 379 sub store_instructor_comment {
|
Line 379 sub store_instructor_comment {
|
sub user_crit_msg_raw { |
sub user_crit_msg_raw { |
my ($user,$domain,$subject,$message,$sendback,$toperm,$sentmessage)=@_; |
my ($user,$domain,$subject,$message,$sendback,$toperm,$sentmessage)=@_; |
# Check if allowed missing |
# Check if allowed missing |
my $status=''; |
my ($status,$packed_message); |
my $msgid='undefined'; |
my $msgid='undefined'; |
unless (($message)&&($user)&&($domain)) { $status='empty'; }; |
unless (($message)&&($user)&&($domain)) { $status='empty'; }; |
my $text=$message; |
my $text=$message; |
my $homeserver=&Apache::lonnet::homeserver($user,$domain); |
my $homeserver=&Apache::lonnet::homeserver($user,$domain); |
if ($homeserver ne 'no_host') { |
if ($homeserver ne 'no_host') { |
($msgid,$message)=&packagemsg($subject,$message); |
($msgid,$packed_message)=&packagemsg($subject,$message); |
if ($sendback) { $message.='<sendback>true</sendback>'; } |
if ($sendback) { $packed_message.='<sendback>true</sendback>'; } |
$status=&Apache::lonnet::critical( |
$status=&Apache::lonnet::critical( |
'put:'.$domain.':'.$user.':critical:'. |
'put:'.$domain.':'.$user.':critical:'. |
&escape($msgid).'='. |
&escape($msgid).'='. |
&escape($message),$homeserver); |
&escape($packed_message),$homeserver); |
if (defined($sentmessage)) { |
if (defined($sentmessage)) { |
$$sentmessage = $message; |
$$sentmessage = $packed_message; |
} |
} |
|
(undef,my $packed_message_no_citation) = |
|
&packagemsg($subject,$message,undef,undef,undef,$user,$domain, |
|
$msgid); |
|
$status .= &store_sent_mail($msgid,$packed_message_no_citation); |
} else { |
} else { |
$status='no_host'; |
$status='no_host'; |
} |
} |
|
|
# Notifications |
# Notifications |
my %userenv = &Apache::loncommon::getemails($user,$domain); |
my %userenv = &Apache::loncommon::getemails($user,$domain); |
if ($userenv{'critnotification'}) { |
if ($userenv{'critnotification'}) { |
Line 518 sub user_normal_msg_raw {
|
Line 523 sub user_normal_msg_raw {
|
(&Apache::lonnet::allowed('srm',$env{'request.course.id'}) |
(&Apache::lonnet::allowed('srm',$env{'request.course.id'}) |
|| &Apache::lonnet::allowed('srm',$env{'request.course.id'}. |
|| &Apache::lonnet::allowed('srm',$env{'request.course.id'}. |
'/'.$env{'request.course.sec'})))) { |
'/'.$env{'request.course.sec'})))) { |
(undef, my $packed_message_no_citation)= |
(undef,my $packed_message_no_citation) = |
&packagemsg($subject,$message,undef ,$baseurl, |
&packagemsg($subject,$message,undef,$baseurl,$attachmenturl, |
$attachmenturl,$user,$domain,$currid, |
$user,$domain,$currid,undef,$crsmsgid); |
undef,$crsmsgid); |
|
|
|
$status .= &store_sent_mail($msgid,$packed_message_no_citation); |
$status .= &store_sent_mail($msgid,$packed_message_no_citation); |
} |
} |
} else { |
} else { |