--- loncom/interface/lonmsg.pm 2000/10/20 14:40:26 1.3
+++ loncom/interface/lonmsg.pm 2000/10/31 22:31:37 1.5
@@ -10,7 +10,7 @@
#
# 10/05 Gerd Kortemeyer)
#
-# 10/19,10/20 Gerd Kortemeyer
+# 10/19,10/20,10/30 Gerd Kortemeyer
package Apache::lonmsg;
@@ -18,6 +18,7 @@ use strict;
use Apache::lonnet();
use vars qw($msgcount);
use HTML::TokeParser;
+use Apache::Constants qw(:common);
# ===================================================================== Package
@@ -100,17 +101,20 @@ sub user_crit_msg {
if ($homeserver ne 'no_host') {
my $msgid;
($msgid,$message)=&packagemsg($subject,$message);
- $status=&Apache::lonnet::cput('critical',$msgid => $message);
+ $status=&Apache::lonnet::critical(
+ 'put:'.$domain.':'.$user.':critical:'.
+ &Apache::lonnet::escape($msgid).'='.
+ &Apache::lonnet::escape($message),$homeserver);
} else {
$status='no_host';
}
&Apache::lonnet::logthis(
- 'INFO: Sending critical email '.$msgid.
+ 'Sending critical email '.$msgid.
', log status: '.
&Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'},
$ENV{'user.home'},
'Sending critical '.$msgid.' to '.$user.' at '.$domain.' with status: '
- .$status).'');
+ .$status));
return $status;
}
@@ -118,7 +122,22 @@ sub user_crit_msg {
sub user_crit_received {
my $message=shift;
-
+ my %contents=&unpackagemsg($message);
+ my $status='rec: '.
+ &user_normal_msg($contents{'sendername'},$contents{'senderdomain'},
+ 'Receipt: '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},
+ 'User '.$ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+ ' acknowledged receipt of message "'.
+ $contents{'subject'}.'" dated '.$contents{'time'}.".\n\n"
+ .'Message ID: '.$contents{'msgid'});
+ $status.=' trans: '.
+ &Apache::lonnet::put('nohist_email',$contents{'msgid'} => $message);
+ $status.=' del: '.
+ &Apache::lonnet::del('critical',$contents{'msgid'});
+ &Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'},
+ $ENV{'user.home'},'Received critical message '.
+ $contents{'msgid'}.
+ ', '.$status);
}
# ======================================================== Normal communication
@@ -133,7 +152,10 @@ sub user_normal_msg {
if ($homeserver ne 'no_host') {
my $msgid;
($msgid,$message)=&packagemsg($subject,$message);
- $status=&Apache::lonnet::cput('nohist_email',$msgid => $message);
+ $status=&Apache::lonnet::critical(
+ 'put:'.$domain.':'.$user.':nohist_email:'.
+ &Apache::lonnet::escape($msgid).'='.
+ &Apache::lonnet::escape($message),$homeserver);
} else {
$status='no_host';
}
@@ -143,6 +165,27 @@ sub user_normal_msg {
return $status;
}
+# ===================================================================== Handler
+
+sub handler {
+ my $r=shift;
+
+# ----------------------------------------------------------- Set document type
+
+ $r->content_type('text/html');
+ $r->send_http_header;
+
+ return OK if $r->header_only;
+
+# --------------------------------------------------------------- Render Output
+
+ $r->print('EMail and Messaging');
+ $r->print('');
+ $r->print('EMail
');
+ $r->print('');
+ return OK;
+
+}
# ================================================= Main program, reset counter
sub BEGIN {