--- loncom/interface/lonmsg.pm	2003/12/30 22:19:18	1.75
+++ loncom/interface/lonmsg.pm	2004/03/01 01:19:51	1.87
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.75 2003/12/30 22:19:18 www Exp $
+# $Id: lonmsg.pm,v 1.87 2004/03/01 01:19:51 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -139,6 +139,7 @@ sub packagemsg {
            '<browsermathml>'.$ENV{'browser.mathml'}.'</browsermathml>'.
 	   '<browserraw>'.$ENV{'HTTP_USER_AGENT'}.'</browserraw>'.
 	   '<courseid>'.$ENV{'request.course.id'}.'</courseid>'.
+	   '<coursesec>'.$ENV{'request.course.sec'}.'</coursesec>'.
 	   '<role>'.$ENV{'request.role'}.'</role>'.
 	   '<resource>'.$ENV{'request.filename'}.'</resource>'.
            '<msgid>'.$msgid.'</msgid>'.
@@ -275,7 +276,7 @@ sub retrieve_author_res_msg {
     my $url=shift;
     $url=&Apache::lonnet::declutter($url);
     my ($domain,$author)=($url=~/^(\w+)\/(\w+)\//);
-    my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$1,$2);
+    my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$domain,$author);
     my $msgs='';
     foreach (keys %errormsgs) {
 	if ($_=~/^\Q$url\E\_\d+$/) {
@@ -294,6 +295,14 @@ sub retrieve_author_res_msg {
 sub del_url_author_res_msg {
     my $url=shift;
     $url=&Apache::lonnet::declutter($url);
+    my ($domain,$author)=($url=~/^(\w+)\/(\w+)\//);
+    my @delmsgs=();
+    foreach (&Apache::lonnet::getkeys('nohist_res_msgs',$domain,$author)) {
+	if ($_=~/^\Q$url\E\_\d+$/) {
+	    push (@delmsgs,$_);
+	}
+    }
+    return &Apache::lonnet::del('nohist_res_msgs',\@delmsgs,$domain,$author);
 }
 
 # ================= Return hash with URLs for which there is a resource message
@@ -301,7 +310,7 @@ sub del_url_author_res_msg {
 sub all_url_author_res_msg {
     my ($author,$domain)=@_;
     my %returnhash=();
-    foreach (&Apache::lonnet::getkeys('nohist_res_msgs')) {
+    foreach (&Apache::lonnet::getkeys('nohist_res_msgs',$domain,$author)) {
 	$_=~/^(.+)\_\d+/;
 	$returnhash{$1}=1;
     }
@@ -388,7 +397,7 @@ sub user_crit_received {
     my %contents=&unpackagemsg($message{$msgid},1);
     my $status='rec: '.($contents{'sendback'}?
      &user_normal_msg($contents{'sendername'},$contents{'senderdomain'},
-                     &mt('Receipt').': '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},
+                     &mt('Receipt').': '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.', '.$contents{'subject'},
                      &mt('User').' '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.
                      ' acknowledged receipt of message'."\n".'   "'.
                      $contents{'subject'}.'"'."\n".&mt('dated').' '.
@@ -591,7 +600,9 @@ $content{'sendername'}.'@'.
             '<br>'.&mt('Subject').': '.$content{'subject'}.
             '<br><blockquote>'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).
-            '</blockquote>'.
+            '</blockquote><small>'.
+&mt('You have to confirm that you received this message. After confirmation, this message will be moved to your regular inbox').
+            '</small><br />'.
             '<input type=submit name="rec_'.$_.'" value="'.&mt('Confirm Receipt').'">'.
             '<input type=submit name="reprec_'.$_.'" '.
                   'value="'.&mt('Confirm Receipt and Reply').'">';
@@ -857,6 +868,7 @@ ENDCOMP
     } else { # $broadcast is 'upload'
 	$r->print(<<ENDUPLOAD);
 <input type=hidden name=sendmode value=upload>
+<input type="hidden" name="send" value="on" />
 <h3>Generate messages from a file</h3>
 <p>
 Subject: <input type=text size=50 name=subject>
@@ -998,12 +1010,12 @@ sub handler {
     my $r=shift;
 
 # ----------------------------------------------------------- Set document type
-
-  &Apache::loncommon::content_type($r,'text/html');
-  $r->send_http_header;
-
-  return OK if $r->header_only;
-
+    
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
+    
+    return OK if $r->header_only;
+    
 # --------------------------- Get query string for limited number of parameters
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
         ['display','replyto','forward','markread','markdel','markunread',
@@ -1011,213 +1023,221 @@ sub handler {
          'recordftf','sortedby']);
     $sqs='&sortedby='.$ENV{'form.sortedby'};
 # ------------------------------------------------------ They checked for email
-  &Apache::lonnet::put('email_status',{'recnewemail'=>0});
+    &Apache::lonnet::put('email_status',{'recnewemail'=>0});
 # --------------------------------------------------------------- Render Output
-  if (!$ENV{'form.display'}) {
-      $r->print('<html><head><title>EMail and Messaging</title>'.
-		&Apache::loncommon::studentbrowser_javascript().'</head>'.
-		&Apache::loncommon::bodytag('EMail and Messages'));
-  }
-  if ($ENV{'form.display'}) {
-      my $msgid=$ENV{'form.display'};
-      &statuschange($msgid,'read');
-      my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
-      my %content=&unpackagemsg($message{$msgid});
+    if (!$ENV{'form.display'}) {
+	$r->print('<html><head><title>EMail and Messaging</title>'.
+		  &Apache::loncommon::studentbrowser_javascript().'</head>'.
+		  &Apache::loncommon::bodytag('EMail and Messages').
+		  &Apache::loncommon::help_open_faq(12).
+		  &Apache::loncommon::help_open_bug('Communication Tools'));
+    }
+    if ($ENV{'form.display'}) {
+	my $msgid=$ENV{'form.display'};
+	&statuschange($msgid,'read');
+	my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
+	my %content=&unpackagemsg($message{$msgid});
 # info to generate "next" and "previous" buttons
-      my @messages=&sortedmessages();
-      my $counter=0;
-      $r->print('<pre>');
-      my $escmsgid=&Apache::lonnet::escape($msgid);
-      foreach (@messages) {
- 	  if ($_->[5] eq $escmsgid){
- 	      last;
- 	  }
- 	  $counter++;
-      }
-      $r->print('</pre>');
-      my $number_of_messages = scalar(@messages); #subtract 1 for last index
+	my @messages=&sortedmessages();
+	my $counter=0;
+	$r->print('<pre>');
+	my $escmsgid=&Apache::lonnet::escape($msgid);
+	foreach (@messages) {
+	    if ($_->[5] eq $escmsgid){
+		last;
+	    }
+	    $counter++;
+	}
+	$r->print('</pre>');
+	my $number_of_messages = scalar(@messages); #subtract 1 for last index
 # start output
-      $r->print('<html><head><title>EMail and Messaging</title>');
-      if (defined($content{'baseurl'})) {
-	  $r->print("<base href=\"http://$ENV{'SERVER_NAME'}/$content{'baseurl'}\" />");
-      }
-      $r->print(&Apache::loncommon::studentbrowser_javascript().
-		'</head>'.
-		&Apache::loncommon::bodytag('EMail and Messages'));
-      $r->print('<b>'.&mt('Subject').':</b> '.$content{'subject'}.
-             '<br><b>'.&mt('From').':</b> '.
-&Apache::loncommon::aboutmewrapper(
-&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
-$content{'sendername'},$content{'senderdomain'}).' ('.
-                                 $content{'sendername'}.' at '.
-                                 $content{'senderdomain'}.') '.
-             '<br><b>'.&mt('Time').':</b> '.$content{'time'}.'<p>'.
-             '<table border=2><tr bgcolor="#FFFFAA"><td>'.&mt('Functions').':</td>'.
-           '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).$sqs.
-             '"><b>'.&mt('Reply').'</b></a></td>'.
-           '<td><a href="/adm/email?forward='.&Apache::lonnet::escape($msgid).$sqs.
-             '"><b>'.&mt('Forward').'</b></a></td>'.
-        '<td><a href="/adm/email?markunread='.&Apache::lonnet::escape($msgid).$sqs.
-             '"><b>'.&mt('Mark Unread').'</b></a></td>'.
-        '<td><a href="/adm/email?markdel='.&Apache::lonnet::escape($msgid).$sqs.
-             '"><b>Delete</b></a></td>'.
-		'<td><a href="/adm/email?sortedby='.$ENV{'form.sortedby'}.
-		'"><b>'.&mt('Display all Messages').'</b></a></td>');
-      if ($counter > 0){
- 	  $r->print('<td><a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.
-           '"><b>'.&mt('Previous').'</b></a></td>');
-       }
-       if ($counter < $number_of_messages - 1){
- 	  $r->print('<td><a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.
-           '"><b>'.&mt('Next').'</b></a></td>');
-       }
-       $r->print('</tr></table><p><pre>'.
-             &Apache::lontexconvert::msgtexconverted($content{'message'}).
-             '</pre><hr>'.$content{'citation'});
-  } elsif ($ENV{'form.replyto'}) {
-      &comprep($r,$ENV{'form.replyto'});
-  } elsif ($ENV{'form.sendreply'}) {
-      if ($ENV{'form.send'}) {
-	  my $msgid=$ENV{'form.sendreply'};
-	  my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
-	  my %content=&unpackagemsg($message{$msgid},1);
-	  &statuschange($msgid,'replied');
-	  if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
-	      (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
-	      $r->print(&mt('Sending critical message').': '.
-			&user_crit_msg($content{'sendername'},
-				       $content{'senderdomain'},
-				       &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
-				       &Apache::lonfeedback::clear_out_html($ENV{'form.message'}),
-				       $ENV{'form.sendbck'}));
-	  } else {
-	      $r->print(&mt('Sending').': '.&user_normal_msg($content{'sendername'},
-							     $content{'senderdomain'},
-							     &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
-							     &Apache::lonfeedback::clear_out_html($ENV{'form.message'})));
-	  }
-      }
-      if ($ENV{'form.displayedcrit'}) {
-          &discrit($r);
-      } else {
-	  &disall($r);
-      }
-  } elsif ($ENV{'form.confirm'}) {
-      foreach (keys %ENV) {
-          if ($_=~/^form\.rec\_(.*)$/) {
-	      $r->print('<b>Confirming Receipt:</b> '.
-                        &user_crit_received($1).'<br>');
-          }
-          if ($_=~/^form\.reprec\_(.*)$/) {
-              my $msgid=$1;
-	      $r->print('<b>Confirming Receipt:</b> '.
-                        &user_crit_received($msgid).'<br>');
-              &comprep($r,$msgid);
-          }
-      }
-      &discrit($r);
-  } elsif ($ENV{'form.critical'}) {
-      &discrit($r);
-  } elsif ($ENV{'form.forward'}) {
-      &compout($r,$ENV{'form.forward'});
-  } elsif ($ENV{'form.markread'}) {
-  } elsif ($ENV{'form.markdel'}) {
-      &statuschange($ENV{'form.markdel'},'deleted');
-      &disall($r);
-  } elsif ($ENV{'form.markeddel'}) {
-      my $total=0;
-      foreach (keys %ENV) {
-          if ($_=~/^form\.delmark_(.*)$/) {
-	      &statuschange(&Apache::lonnet::unescape($1),'deleted');
-              $total++;
-          }
-      }
-      $r->print('Deleted '.$total.' message(s)<p>');
-      &disall($r);
-  } elsif ($ENV{'form.markunread'}) {
-      &statuschange($ENV{'form.markunread'},'new');
-      &disall($r);
-  } elsif ($ENV{'form.compose'}) {
-      &compout($r,'',$ENV{'form.compose'});
-  } elsif ($ENV{'form.recordftf'}) {
-      &facetoface($r,$ENV{'form.recordftf'});
-  } elsif ($ENV{'form.sendmail'}) {
-      my $sendstatus='';
-      if ($ENV{'form.send'}) {
-	  my %content=();
-	  undef %content;
-	  if ($ENV{'form.forwid'}) {
-	      my $msgid=$ENV{'form.forwid'};
-	      my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
-	      %content=&unpackagemsg($message{$msgid},1);
-	      &statuschange($msgid,'forwarded');
-	      $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
-		  $content{'message'};
-	  }
-	  my %toaddr=();
-	  undef %toaddr;
-	  if ($ENV{'form.sendmode'} eq 'group') {
-	      foreach (keys %ENV) {
-		  if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
-		      $toaddr{$1}='';
-		  }
-	      }
-	  } elsif ($ENV{'form.sendmode'} eq 'upload') {
-	      foreach (split(/[\n\r\f]+/,$ENV{'form.upfile'})) {
-		  my ($rec,$txt)=split(/\s*\:\s*/,$_);
-		  if ($txt) {
-		      $rec=~s/\@/\:/;
-		      $toaddr{$rec}.=$txt."\n";
-		  }
-	      }
-	  } else {
-	      $toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}='';
-	  }
-	  if ($ENV{'form.additionalrec'}) {
-	      foreach (split(/\,/,$ENV{'form.additionalrec'})) {
-		  my ($auname,$audom)=split(/\@/,$_);
-		  $toaddr{$auname.':'.$audom}='';
-	      }
-	  }
-	  foreach (keys %toaddr) {
-	      my ($recuname,$recdomain)=split(/\:/,$_);
-	      my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'});
-	      if ($toaddr{$_}) { $msgtxt.='<hr>'.$toaddr{$_}; }    
-	      if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
-		  (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
-		  $r->print(&mt('Sending critical message').' ...');
-                  $sendstatus.=' '.&user_crit_msg($recuname,$recdomain,
-					   &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
-					   $msgtxt,
-					   $ENV{'form.sendbck'});
-	      } else {
-		  $r->print(&mt('Sending').' ...');
-                  $sendstatus.=' '.&user_normal_msg($recuname,$recdomain,
-				                         &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
-							 $msgtxt,
-							 $content{'citation'});
-	      }
-	      $r->print('<br />');
-	  }
-      }
-      if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
-	  if ($ENV{'form.displayedcrit'}) {
-	      &discrit($r);
-	  } else {
-	      &disall($r);
-	  }
-      } else {
-	  $r->print(
-  '<h2><font color="red">'.&mt('Could not deliver message').'</font></h2>'.
-  &mt('Please use the browser "Back" button and correct the recipient addresses')
-		    );
-      }
-  } else {
-      &disall($r);
-  }
-  $r->print('</body></html>');
-  return OK;
-
+	$r->print('<html><head><title>EMail and Messaging</title>');
+	if (defined($content{'baseurl'})) {
+	    $r->print("<base href=\"http://$ENV{'SERVER_NAME'}/$content{'baseurl'}\" />");
+	}
+	$r->print(&Apache::loncommon::studentbrowser_javascript().
+		  '</head>'.
+		  &Apache::loncommon::bodytag('EMail and Messages').
+		  &Apache::loncommon::help_open_faq(12).
+		  &Apache::loncommon::help_open_bug('Communication Tools'));
+	my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'});
+	
+	$r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}.
+		  '<br /><b>'.&mt('From').':</b> '.
+		  &Apache::loncommon::aboutmewrapper(
+						     &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
+						     $content{'sendername'},$content{'senderdomain'}).' ('.
+		  $content{'sendername'}.' at '.
+		  $content{'senderdomain'}.') '.
+		  ($content{'courseid'}?'<br /><b>'.&mt('Course').':</b> '.$courseinfo{'description'}.
+		   ($content{'coursesec'}?' ('.&mt('Group/Section').': '.$content{'coursesec'}.')':''):'').
+		  '<br /><b>'.&mt('Time').':</b> '.$content{'time'}.'<p>'.
+		  '<table border=2><tr bgcolor="#FFFFAA"><td>'.&mt('Functions').':</td>'.
+		  '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).$sqs.
+		  '"><b>'.&mt('Reply').'</b></a></td>'.
+		  '<td><a href="/adm/email?forward='.&Apache::lonnet::escape($msgid).$sqs.
+		  '"><b>'.&mt('Forward').'</b></a></td>'.
+		  '<td><a href="/adm/email?markunread='.&Apache::lonnet::escape($msgid).$sqs.
+		  '"><b>'.&mt('Mark Unread').'</b></a></td>'.
+		  '<td><a href="/adm/email?markdel='.&Apache::lonnet::escape($msgid).$sqs.
+		  '"><b>Delete</b></a></td>'.
+		  '<td><a href="/adm/email?sortedby='.$ENV{'form.sortedby'}.
+		  '"><b>'.&mt('Display all Messages').'</b></a></td>');
+	if ($counter > 0){
+	    $r->print('<td><a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.
+		      '"><b>'.&mt('Previous').'</b></a></td>');
+	}
+	if ($counter < $number_of_messages - 1){
+	    $r->print('<td><a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.
+		      '"><b>'.&mt('Next').'</b></a></td>');
+	}
+	$r->print('</tr></table><p><pre>'.
+		  &Apache::lontexconvert::msgtexconverted($content{'message'},1).
+		  '</pre><hr>'.$content{'citation'});
+    } elsif ($ENV{'form.replyto'}) {
+	&comprep($r,$ENV{'form.replyto'});
+    } elsif ($ENV{'form.sendreply'}) {
+	if ($ENV{'form.send'}) {
+	    my $msgid=$ENV{'form.sendreply'};
+	    my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
+	    my %content=&unpackagemsg($message{$msgid},1);
+	    &statuschange($msgid,'replied');
+	    if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
+		(&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
+		$r->print(&mt('Sending critical message').': '.
+			  &user_crit_msg($content{'sendername'},
+					 $content{'senderdomain'},
+					 &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+					 &Apache::lonfeedback::clear_out_html($ENV{'form.message'}),
+					 $ENV{'form.sendbck'}));
+	    } else {
+		$r->print(&mt('Sending').': '.&user_normal_msg($content{'sendername'},
+							       $content{'senderdomain'},
+							       &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+							       &Apache::lonfeedback::clear_out_html($ENV{'form.message'})));
+	    }
+	}
+	if ($ENV{'form.displayedcrit'}) {
+	    &discrit($r);
+	} else {
+	    &disall($r);
+	}
+    } elsif ($ENV{'form.confirm'}) {
+	foreach (keys %ENV) {
+	    if ($_=~/^form\.rec\_(.*)$/) {
+		$r->print('<b>Confirming Receipt:</b> '.
+			  &user_crit_received($1).'<br>');
+	    }
+	    if ($_=~/^form\.reprec\_(.*)$/) {
+		my $msgid=$1;
+		$r->print('<b>Confirming Receipt:</b> '.
+			  &user_crit_received($msgid).'<br>');
+		&comprep($r,$msgid);
+	    }
+	}
+	&discrit($r);
+    } elsif ($ENV{'form.critical'}) {
+	&discrit($r);
+    } elsif ($ENV{'form.forward'}) {
+	&compout($r,$ENV{'form.forward'});
+    } elsif ($ENV{'form.markread'}) {
+    } elsif ($ENV{'form.markdel'}) {
+	&statuschange($ENV{'form.markdel'},'deleted');
+	&disall($r);
+    } elsif ($ENV{'form.markeddel'}) {
+	my $total=0;
+	foreach (keys %ENV) {
+	    if ($_=~/^form\.delmark_(.*)$/) {
+		&statuschange(&Apache::lonnet::unescape($1),'deleted');
+		$total++;
+	    }
+	}
+	$r->print('Deleted '.$total.' message(s)<p>');
+	&disall($r);
+    } elsif ($ENV{'form.markunread'}) {
+	&statuschange($ENV{'form.markunread'},'new');
+	&disall($r);
+    } elsif ($ENV{'form.compose'}) {
+	&compout($r,'',$ENV{'form.compose'});
+    } elsif ($ENV{'form.recordftf'}) {
+	&facetoface($r,$ENV{'form.recordftf'});
+    } elsif ($ENV{'form.sendmail'}) {
+	my $sendstatus='';
+	if ($ENV{'form.send'}) {
+	    my %content=();
+	    undef %content;
+	    if ($ENV{'form.forwid'}) {
+		my $msgid=$ENV{'form.forwid'};
+		my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
+		%content=&unpackagemsg($message{$msgid},1);
+		&statuschange($msgid,'forwarded');
+		$ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
+		    $content{'message'};
+	    }
+	    my %toaddr=();
+	    undef %toaddr;
+	    if ($ENV{'form.sendmode'} eq 'group') {
+		foreach (keys %ENV) {
+		    if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
+			$toaddr{$1}='';
+		    }
+		}
+	    } elsif ($ENV{'form.sendmode'} eq 'upload') {
+		foreach (split(/[\n\r\f]+/,$ENV{'form.upfile'})) {
+		    my ($rec,$txt)=split(/\s*\:\s*/,$_);
+		    if ($txt) {
+			$rec=~s/\@/\:/;
+			$toaddr{$rec}.=$txt."\n";
+		    }
+		}
+	    } else {
+		$toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}='';
+	    }
+	    if ($ENV{'form.additionalrec'}) {
+		foreach (split(/\,/,$ENV{'form.additionalrec'})) {
+		    my ($auname,$audom)=split(/\@/,$_);
+		    $toaddr{$auname.':'.$audom}='';
+		}
+	    }
+	    foreach (keys %toaddr) {
+		my ($recuname,$recdomain)=split(/\:/,$_);
+		my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'});
+		if ($toaddr{$_}) { $msgtxt.='<hr>'.$toaddr{$_}; }    
+		if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
+		    (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
+		    $r->print(&mt('Sending critical message').' ...');
+		    $sendstatus.=' '.&user_crit_msg($recuname,$recdomain,
+						    &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+						    $msgtxt,
+						    $ENV{'form.sendbck'});
+		} else {
+		    $r->print(&mt('Sending').' ...');
+		    $sendstatus.=' '.&user_normal_msg($recuname,$recdomain,
+						      &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+						      $msgtxt,
+						      $content{'citation'});
+		}
+		$r->print('<br />');
+	    }
+	}
+	if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
+	    $r->print('<br /><font color="green">'.&mt('Completed.').'</font>');
+	    if ($ENV{'form.displayedcrit'}) {
+		&discrit($r);
+	    } else {
+		&disall($r);
+	    }
+	} else {
+	    $r->print(
+		      '<h2><font color="red">'.&mt('Could not deliver message').'</font></h2>'.
+		      &mt('Please use the browser "Back" button and correct the recipient addresses')
+		      );
+	}
+    } else {
+	&disall($r);
+    }
+    $r->print('</body></html>');
+    return OK;
 }
 # ================================================= Main program, reset counter