--- loncom/interface/lonmsg.pm	2001/10/01 19:24:49	1.23
+++ loncom/interface/lonmsg.pm	2001/11/05 19:44:23	1.24
@@ -14,7 +14,7 @@
 # 02/06/01 Gerd Kortemeyer
 # 07/27 Guy Albertelli
 # 07/27,07/28,07/30,08/03,08/06,08/08,08/09,08/10,8/13,8/15,
-# 10/1 Gerd Kortemeyer
+# 10/1,11/5 Gerd Kortemeyer
 
 package Apache::lonmsg;
 
@@ -115,7 +115,7 @@ sub author_res_msg {
 # ================================================== Critical message to a user
 
 sub user_crit_msg {
-    my ($user,$domain,$subject,$message)=@_;
+    my ($user,$domain,$subject,$message,$sendback)=@_;
 # Check if allowed missing
     my $status='';
     my $msgid='undefined';
@@ -123,6 +123,7 @@ sub user_crit_msg {
     my $homeserver=&Apache::lonnet::homeserver($user,$domain);
     if ($homeserver ne 'no_host') {
        ($msgid,$message)=&packagemsg($subject,$message);
+       if ($sendback) { $message.='<sendback>true</sendback>'; }
        $status=&Apache::lonnet::critical(
            'put:'.$domain.':'.$user.':critical:'.
            &Apache::lonnet::escape($msgid).'='.
@@ -146,13 +147,13 @@ sub user_crit_received {
     my $msgid=shift;
     my %message=&Apache::lonnet::get('critical',[$msgid]);
     my %contents=&unpackagemsg($message{$msgid});
-    my $status='rec: '.
+    my $status='rec: '.($contents{'sendback'}?
      &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'});
+                     .'Message ID: '.$contents{'msgid'}):'no msg req');
     $status.=' trans: '.
      &Apache::lonnet::put(
      'nohist_email',{$contents{'msgid'} => $message{$msgid}});
@@ -308,7 +309,9 @@ sub comprep {
       my $dispcrit='';
       if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
          $dispcrit=
-	     '<input type=checkbox name=critmsg> Send as critical message<p>';
+ '<input type=checkbox name=critmsg> Send as critical message<br>'.
+ '<input type=checkbox name=sendbck> Send as critical message'.
+ ' and return receipt<p>';
       }
       $r->print(<<"ENDREPLY");
 <form action="/adm/email" method=post>
@@ -367,7 +370,9 @@ sub compout {
     my $func='Send New';
       if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
          $dispcrit=
-	     '<input type=checkbox name=critmsg> Send as critical message<p>';
+ '<input type=checkbox name=critmsg> Send as critical message<br>'.
+ '<input type=checkbox name=sendbck> Send as critical message'.
+ ' and return receipt<p>';
       }
     if ($forwarding) {
        $dispcrit.='<input type=hidden name=forwid value="'.
@@ -493,13 +498,14 @@ sub handler {
       my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
       my %content=&unpackagemsg($message{$msgid});
       &statuschange($msgid,'replied');
-      if (($ENV{'form.critmsg'}) && 
+      if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
           (&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'}));
+                                 $ENV{'form.message'},
+                                 $ENV{'form.sendbck'}));
       } else {
          $r->print('Sending: '.&user_normal_msg($content{'sendername'},
                                  $content{'senderdomain'},
@@ -578,13 +584,13 @@ sub handler {
       my ($recuname,$recdomain)=split(/\:/,$_);
       my $msgtxt=$ENV{'form.message'};
       if ($toaddr{$_}) { $msgtxt.='<hr>'.$toaddr{$_}; }    
-      if (($ENV{'form.critmsg'}) && 
+      if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
           (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
          $r->print('Sending critical: '.
                 &user_crit_msg($recuname,$recdomain,
                                  $ENV{'form.subject'},
                                  $msgtxt,
-                                 $content{'citation'}));
+                                 $ENV{'form.sendbck'}));
       } else {
          $r->print('Sending: '.&user_normal_msg($recuname,$recdomain,
                                  $ENV{'form.subject'},