--- loncom/interface/lonmsg.pm	2001/07/28 04:16:29	1.11
+++ loncom/interface/lonmsg.pm	2001/08/03 14:00:07	1.12
@@ -13,7 +13,7 @@
 # 10/19,10/20,10/30,
 # 02/06/01 Gerd Kortemeyer
 # 07/27 Guy Albertelli
-# 07/27 Gerd Kortemeyer
+# 07/27,07/28,07/30,08/03 Gerd Kortemeyer
 
 package Apache::lonmsg;
 
@@ -143,8 +143,9 @@ sub user_crit_msg {
 # =================================================== Critical message received
 
 sub user_crit_received {
-    my $message=shift;
-    my %contents=&unpackagemsg($message);
+    my $msgid=shift;
+    my %message=&Apache::lonnet::get('critical',[$msgid]);
+    my %contents=&unpackagemsg($message{$msgid});
     my $status='rec: '.
      &user_normal_msg($contents{'sendername'},$contents{'senderdomain'},
                      'Receipt: '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},
@@ -153,13 +154,15 @@ sub user_crit_received {
                      $contents{'subject'}.'" dated '.$contents{'time'}.".\n\n"
                      .'Message ID: '.$contents{'msgid'});
     $status.=' trans: '.
-     &Apache::lonnet::put('nohist_email',{$contents{'msgid'} => $message});
+     &Apache::lonnet::put(
+     'nohist_email',{$contents{'msgid'} => $message{$msgid}});
     $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);
+    return $status;
 }
 
 # ======================================================== Normal communication
@@ -201,6 +204,23 @@ sub statuschange {
 }
 # ===================================================================== Handler
 
+sub discrit {
+    my $r=shift;
+      $r->print('<h1><font color=red>Critical Messages</font></h1>'.
+         '<form action=/adm/email method=post>'.
+         '<input type=hidden name=confirm value=true>');
+      my %what=&Apache::lonnet::dump('critical');
+      map {
+          my %content=&unpackagemsg($what{$_});
+          $content{'message'}=~s/\n/\<br\>/g;
+	  $r->print('<hr>From: <b>'.$content{'sendername'}.'@'.
+                    $content{'senderdomain'}.'</b> ('.$content{'time'}.
+                    ')<br><blockquote>'.$content{'message'}.'</blockquote>'.
+  '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">');
+      } sort keys %what;
+      $r->print('</form>');
+}
+
 sub handler {
     my $r=shift;
 
@@ -219,7 +239,8 @@ sub handler {
        $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
        if (($name eq 'display') || ($name eq 'replyto') || 
            ($name eq 'forward') || ($name eq 'mark') ||
-           ($name eq 'sendreply') || ($name eq 'compose')) {
+           ($name eq 'sendreply') || ($name eq 'compose') ||
+           ($name eq 'sendmail') || ($name eq 'critical')) {
            unless ($ENV{'form.'.$name}) {
               $ENV{'form.'.$name}=$value;
 	   }
@@ -274,10 +295,29 @@ ENDREPLY
       my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
       my %content=&unpackagemsg($message{$msgid});
       &statuschange($msgid,'replied');
-      $r->print('Sending: '.&user_normal_msg($content{'sendername'},
+      if (($ENV{'form.critmsg'}) && 
+          (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
+         $r->print('Sending critical: '.
+                &user_crit_msg($content{'sendername'},
                                  $content{'senderdomain'},
                                  $ENV{'form.subject'},
                                  $ENV{'form.message'}));
+      } else {
+         $r->print('Sending: '.&user_normal_msg($content{'sendername'},
+                                 $content{'senderdomain'},
+                                 $ENV{'form.subject'},
+                                 $ENV{'form.message'}));
+      }
+  } elsif ($ENV{'form.confirm'}) {
+      map {
+          if ($_=~/^form\.rec\_(.*)$/) {
+	      $r->print('<b>Confirming Receipt:</b> '.
+                        &user_crit_received($1).'<br>');
+          }
+      } keys %ENV;
+      &discrit($r);
+  } elsif ($ENV{'form.critical'}) {
+      &discrit($r);
   } elsif ($ENV{'form.forward'}) {
   } elsif ($ENV{'form.mark'}) {
   } elsif ($ENV{'form.compose'}) {