--- loncom/interface/lonmsg.pm 2003/03/31 16:34:08 1.52 +++ loncom/interface/lonmsg.pm 2003/12/29 21:21:39 1.72 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging # -# $Id: lonmsg.pm,v 1.52 2003/03/31 16:34:08 www Exp $ +# $Id: lonmsg.pm,v 1.72 2003/12/29 21:21:39 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,6 +44,68 @@ # package Apache::lonmsg; +=pod + +=head1 NAME + +Apache::lonmsg: supports internal messaging + +=head1 SYNOPSIS + +lonmsg provides routines for sending messages, receiving messages, and +a handler to allow users to read, send, and delete messages. + +=head1 OVERVIEW + +=head2 Messaging Overview + +XLON-CAPA provides an internal messaging system similar to +email, but customized for LON-CAPA's usage. LON-CAPA implements its +own messaging system, rather then building on top of email, because of +the features LON-CAPA messages can offer that conventional e-mail can +not: + +=over 4 + +=item * B: A message the recipient B +acknowlegde receipt of before they are allowed to continue using the +system, preventing a user from claiming they never got a message + +=item * B: LON-CAPA can reliably send reciepts informing the +sender that it has been read; again, useful for preventing students +from claiming they did not see a message. (While conventional e-mail +has some reciept support, it's sporadic, e-mail client-specific, and +generally the receiver can opt to not send one, making it useless in +this case.) + +=item * B: LON-CAPA knows about the sender, such as where +they are in a course. When a student mails an instructor asking for +help on the problem, the instructor receives not just the student's +question, but all submissions the student has made up to that point, +the user's rendering of the problem, and the complete view the student +saw of the resource, including discussion up to that point. Finally, +the instructor is reading all of this inside of LON-CAPA, not their +email program, so they have full access to LON-CAPA's grading +interface, or other features they may wish to use in response to the +student's query. + +=back + +Users can ask LON-CAPA to forward messages to conventional e-mail +addresses on their B screen, but generally, LON-CAPA messages +are much more useful then traditional email can be made to be, even +with HTML support. + +Right now, this document will cover just how to send a message, since +it is likely you will not need to programmatically read messages, +since lonmsg already implements that functionality. + +=head1 FUNCTIONS + +=over 4 + +=cut + use strict; use Apache::lonnet(); use vars qw($msgcount); @@ -52,6 +114,11 @@ use Apache::Constants qw(:common); use Apache::loncommon(); use Apache::lontexconvert(); use HTML::Entities(); +use Mail::Send; +use Apache::lonlocal; + +# Querystring component with sorting type +my $sqs; # ===================================================================== Package @@ -77,7 +144,7 @@ sub packagemsg { my $result=''.$ENV{'user.name'}.''. ''.$ENV{'user.domain'}.''. ''.$subject.''. - ''. + ''. ''.$ENV{'SERVER_NAME'}.''. ''.$ENV{'HTTP_HOST'}.''. ''.$ENV{'REMOTE_ADDR'}.''. @@ -120,9 +187,9 @@ sub unpackagemsg { if ($content{'attachmenturl'}) { my ($fname,$ft)=($content{'attachmenturl'}=~/\/(\w+)\.(\w+)$/); if ($notoken) { - $content{'message'}.='

Attachment: '.$fname.'.'.$ft.''; + $content{'message'}.='

'.&mt('Attachment').': '.$fname.'.'.$ft.''; } else { - $content{'message'}.='

Attachment: '.$fname.'.'.$ft.''; } @@ -142,6 +209,43 @@ sub unpackmsgid { return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid}); } + +sub sendemail { + my ($to,$subject,$body)=@_; + $body= + "*** ".&mt('This is an automatic message generated by the LON-CAPA system.')."\n". + "*** ".&mt('Please do not reply to this address.')."\n\n".$body; + my $msg = new Mail::Send; + $msg->to($to); + $msg->subject('[LON-CAPA] '.$subject); + if (my $fh = $msg->open('smtp',Server => 'localhost')) { + print $fh $body; + $fh->close; + } +} + +# ==================================================== Send notification emails + +sub sendnotification { + my ($to,$touname,$toudom,$subj,$crit)=@_; + my $sender=$ENV{'environment.firstname'}.' '.$ENV{'environment.lastname'}; + my $critical=($crit?' critical':''); + my $url='http://'. + $Apache::lonnet::hostname{&Apache::lonnet::homeserver($touname,$toudom)}. + '/adm/email?username='.$touname.'&domain='.$toudom; + my $body=(<: Sends message $message to the owner + of the resource with the URI $filename. + +=cut + sub author_res_msg { my ($filename,$message)=@_; unless ($message) { return 'empty'; } @@ -199,6 +310,13 @@ sub user_crit_msg_raw { } else { $status='no_host'; } +# Notifications + my %userenv = &Apache::lonnet::get('environment',['critnotification'], + $domain,$user); + if ($userenv{'critnotification'}) { + &sendnotification($userenv{'critnotification'},$user,$domain,$subject,1); + } +# Log this &Apache::lonnet::logthis( 'Sending critical email '.$msgid. ', log status: '. @@ -211,6 +329,14 @@ sub user_crit_msg_raw { # New routine that respects "forward" and calls old routine +=pod + +=item * B: Sends + a critical message $message to the $user at $domain. If $sendback is true, + a reciept will be sent to the current user when $user recieves the message. + +=cut + sub user_crit_msg { my ($user,$domain,$subject,$message,$sendback)=@_; my $status=''; @@ -238,10 +364,10 @@ sub user_crit_received { my %contents=&unpackagemsg($message{$msgid},1); 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'}. + &mt('Receipt').': '.$ENV{'user.name'}.' at '.$ENV{'user.domain'}, + &mt('User').' '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}. ' acknowledged receipt of message'."\n".' "'. - $contents{'subject'}.'"'."\n".'dated '. + $contents{'subject'}.'"'."\n".&mt('dated').' '. $contents{'time'}.".\n" ):'no msg req'); $status.=' trans: '. @@ -277,6 +403,12 @@ sub user_normal_msg_raw { } else { $status='no_host'; } +# Notifications + my %userenv = &Apache::lonnet::get('environment',['notification'], + $domain,$user); + if ($userenv{'notification'}) { + &sendnotification($userenv{'notification'},$user,$domain,$subject,0); + } &Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'}, $ENV{'user.home'}, 'Sending '.$msgid.' to '.$user.' at '.$domain.' with status: '.$status); @@ -285,6 +417,14 @@ sub user_normal_msg_raw { # New routine that respects "forward" and calls old routine +=pod + +=item * B: Sends a message to the + $user at $domain, with subject $subject and message $message. + +=cut + sub user_normal_msg { my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl)=@_; my $status=''; @@ -331,6 +471,9 @@ sub discourse { $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); my $now=time; + my %lt=&Apache::lonlocal::texthash('cfa' => 'Check for All', + 'cfs' => 'Check for Section/Group', + 'cfn' => 'Check for None'); $r->print(< -  - +  +   - +

ENDDISHEADER + my %coursepersonnel= + &Apache::lonnet::get_course_adv_roles(); + foreach my $role (sort keys %coursepersonnel) { + foreach (split(/\,/,$coursepersonnel{$role})) { + my ($puname,$pudom)=split(/\:/,$_); + $r->print( + '
'. + &Apache::loncommon::plainname($puname, + $pudom).' ('.$_.'), '.$role.''); + } + } + foreach (sort keys %courselist) { my ($end,$start)=split(/\:/,$courselist{$_}); my $active=1; @@ -394,7 +550,7 @@ ENDDISHEADER sub discrit { my $r=shift; - my $header = '

Critical Messages

'. + my $header = '

'.&mt('Critical Messages').'

'. '
'. ''; my %what=&Apache::lonnet::dump('critical'); @@ -403,22 +559,23 @@ sub discrit { my %content=&unpackagemsg($what{$_}); next if ($content{'senderdomain'} eq ''); $content{'message'}=~s/\n/\/g; - $result.='
From: '. + $result.='
'.&mt('From').': '. &Apache::loncommon::aboutmewrapper( &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('. $content{'sendername'}.'@'. $content{'senderdomain'}.') '.$content{'time'}. - '
Subject: '.$content{'subject'}. + '
'.&mt('Subject').': '.$content{'subject'}. '
'. &Apache::lontexconvert::msgtexconverted($content{'message'}). '
'. - ''. + ''. ''; + 'value="'.&mt('Confirm Receipt and Reply').'">'; } # Check to see if there were any messages. if ($result eq '') { - $result = "

You have no critical messages.

"; + $result = "

".&mt('You have no critical messages.')."

". + ''.&mt('Select a course').''; } else { $r->print($header); } @@ -436,29 +593,88 @@ sub comprep { $quotemsg=~s/\r/\n/g; $quotemsg=~s/\f/\n/g; $quotemsg=~s/\n+/\n\> /g; - my $subject='Re: '.$content{'subject'}; + my $torepl=&Apache::loncommon::aboutmewrapper( + &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('. +$content{'sendername'}.'@'. + $content{'senderdomain'}.')'; + my $subject=&mt('Re').': '.$content{'subject'}; my $dispcrit=''; if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message"); $dispcrit= - ' Send as critical message ' . $crithelp . + ' '.&mt('Send as critical message').' ' . $crithelp . '
'. - ' Send as critical message ' . - ' and return receipt' . $crithelp . '

'; + ' '.&mt('Send as critical message').' ' . + &mt('and return receipt') . $crithelp . '

'; } + my %lt=&Apache::lonlocal::texthash( + 'to' => 'To', + 'sb' => 'Subject', + 'sr' => 'Send Reply', + 'ca' => 'Cancel' + ); $r->print(<<"ENDREPLY"); - - -Subject:

-

+


$dispcrit - + + ENDREPLY } +sub sortedmessages { + my @messages = &Apache::lonnet::getkeys('nohist_email'); + #unpack the varibles and repack into temp for sorting + my @temp; + foreach (@messages) { + my $msgid=&Apache::lonnet::escape($_); + my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)= + &Apache::lonmsg::unpackmsgid($msgid); + my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status, + $msgid); + push @temp ,\@temp1; + } + #default sort + @temp = sort {$a->[0] <=> $b->[0]} @temp; + if ($ENV{'form.sortedby'} eq "date"){ + @temp = sort {$a->[0] <=> $b->[0]} @temp; + } + if ($ENV{'form.sortedby'} eq "revdate"){ + @temp = sort {$b->[0] <=> $a->[0]} @temp; + } + if ($ENV{'form.sortedby'} eq "user"){ + @temp = sort {lc($a->[2]) cmp lc($b->[2])} @temp; + } + if ($ENV{'form.sortedby'} eq "revuser"){ + @temp = sort {lc($b->[2]) cmp lc($a->[2])} @temp; + } + if ($ENV{'form.sortedby'} eq "domain"){ + @temp = sort {$a->[3] cmp $b->[3]} @temp; + } + if ($ENV{'form.sortedby'} eq "revdomain"){ + @temp = sort {$b->[3] cmp $a->[3]} @temp; + } + if ($ENV{'form.sortedby'} eq "subject"){ + @temp = sort {lc($a->[1]) cmp lc($b->[1])} @temp; + } + if ($ENV{'form.sortedby'} eq "revsubject"){ + @temp = sort {lc($b->[1]) cmp lc($a->[1])} @temp; + } + if ($ENV{'form.sortedby'} eq "status"){ + @temp = sort {$a->[4] cmp $b->[4]} @temp; + } + if ($ENV{'form.sortedby'} eq "revstatus"){ + @temp = sort {$b->[4] cmp $a->[4]} @temp; + } + return @temp; +} + # ======================================================== Display all messages sub disall { @@ -484,40 +700,66 @@ sub disall { } ENDDISHEADER - $r->print( - '

Display All Messages

'. - ''. - ''); - foreach (sort split(/\&/,&Apache::lonnet::reply('keys:'. - $ENV{'user.domain'}.':'. - $ENV{'user.name'}.':nohist_email', - $ENV{'user.home'}))) { - my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)= - &Apache::lonmsg::unpackmsgid($_); + $r->print('

'.&mt('Display All Messages').'

'. + '
 DateUsernameDomainSubjectStatus
'); + } else { + $r->print(''.&mt('Date').''); + } + $r->print(''); + } else { + $r->print(''.&mt('Status').''); + } + $r->print(''); + my @temp=sortedmessages(); + foreach (@temp){ + my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID)= @$_; if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) { if ($status eq 'new') { $r->print(''); } elsif ($status eq 'read') { $r->print(''); } elsif ($status eq 'replied') { - $r->print(''); + $r->print(''); } else { $r->print(''); } - $r->print(''. - ''. + ''); } - } + } $r->print('
 '); + if ($ENV{'form.sortedby'} eq "revdate") { + $r->print(''.&mt('Date').''); + if ($ENV{'form.sortedby'} eq "revuser") { + $r->print(''.&mt('Username').''); + } else { + $r->print(''.&mt('Username').''); + } + $r->print(''); + if ($ENV{'form.sortedby'} eq "revdomain") { + $r->print(''.&mt('Domain').''); + } else { + $r->print(''.&mt('Domain').''); + } + $r->print(''); + if ($ENV{'form.sortedby'} eq "revsubject") { + $r->print(''.&mt('Subject').''); + } else { + $r->print(''.&mt('Subject').''); + } + $r->print(''); + if ($ENV{'form.sortedby'} eq "revstatus") { + $r->print(''.&mt('Status').'
OpenDelete'.localtime($sendtime).''. + $r->print(''.&mt('Open').''.&mt('Delete').''.&Apache::lonlocal::locallocaltime($sendtime).''. $fromname.''.$fromdomain.''. &Apache::lonnet::unescape($shortsubj).''. $status.'

'. - 'Check All '. - 'Uncheck All

'. - ''. + ''.&mt('Check All').' '. + ''.&mt('Uncheck All').'

'. + ''. + ''. '

'); } @@ -528,25 +770,32 @@ sub compout { my $dispcrit=''; my $dissub=''; my $dismsg=''; - my $func='Send New'; - if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { + my $func=&mt('Send New'); + my %lt=&Apache::lonlocal::texthash('us' => 'Username', + 'do' => 'Domain', + 'ad' => 'Additional Recipients', + 'sb' => 'Subject', + 'ca' => 'Cancel', + 'ma' => 'Mail'); + + if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message"); $dispcrit= - ' Send as critical message ' . $crithelp . + ' '.&mt('Send as critical message').' ' . $crithelp . '
'. - ' Send as critical message ' . - ' and return receipt' . $crithelp . '

'; + ' '.&mt('Send as critical message').' ' . + &mt('and return receipt') . $crithelp . '

'; } if ($forwarding) { - $dispcrit.=''; - $func='Forward'; + $func=&mt('Forward'); my %message=&Apache::lonnet::get('nohist_email',[$forwarding]); my %content=&unpackagemsg($message{$forwarding}); - $dissub='Forwarding: '.$content{'subject'}; - $dismsg='Forwarded message from '. - $content{'sendername'}.' at '.$content{'senderdomain'}; + $dissub=&mt('Forwarding').': '.$content{'subject'}; + $dismsg=&mt('Forwarded message from').' '. + $content{'sendername'}.' '.&mt('at').' '.$content{'senderdomain'}; } my $defdom=$ENV{'user.domain'}; if ($ENV{'form.recdom'}) { $defdom=$ENV{'form.recdom'}; } @@ -561,22 +810,25 @@ sub compout { ('compemail','recuname','recdomain'); $r->print(<<"ENDREC"); - - + + ENDREC } + my $latexHelp = Apache::loncommon::helpLatexCheatsheet(); if ($broadcast ne 'upload') { $r->print(<<"ENDCOMP"); - - +
Username:$selectlink
Domain:
$lt{'us'}:$selectlink
$lt{'do'}: $domform
Additional Recipients
username\@domain,username\@domain, ... +
$lt{'ad'}
username\@domain,username\@domain, ... 		-
Subject: +
$lt{'sb'}:
-

+$latexHelp +


$dispcrit - + + ENDCOMP } else { # $broadcast is 'upload' $r->print(</g; if ($content{'subject'}=~/^Record/) { - $result.='

Record

'; + $result.='

'.&mt('Record').'

'; } else { - $result.='

Sent Message

'; + $result.='

'.&mt('Sent Message').'

'; %content=&unpackagemsg($content{'message'}); $content{'message'}= 'Subject: '.$content{'subject'}.'
'. $content{'message'}; } - $result.='By: '. + $result.=&mt('By').': '. &Apache::loncommon::aboutmewrapper( &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('. $content{'sendername'}.'@'. @@ -723,7 +975,7 @@ sub handler { # ----------------------------------------------------------- Set document type - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; @@ -732,8 +984,8 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['display','replyto','forward','markread','markdel','markunread', 'sendreply','compose','sendmail','critical','recname','recdom', - 'recordftf']); - + 'recordftf','sortedby']); + $sqs='&sortedby='.$ENV{'form.sortedby'}; # ------------------------------------------------------ They checked for email &Apache::lonnet::put('email_status',{'recnewemail'=>0}); # --------------------------------------------------------------- Render Output @@ -747,6 +999,20 @@ sub handler { &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('
');
+      my $escmsgid=&Apache::lonnet::escape($msgid);
+      foreach (@messages) {
+ 	  if ($_->[5] eq $escmsgid){
+ 	      last;
+ 	  }
+ 	  $counter++;
+      }
+      $r->print('
'); + my $number_of_messages = scalar(@messages); #subtract 1 for last index +# start output $r->print('EMail and Messaging'); if (defined($content{'baseurl'})) { $r->print(""); @@ -754,47 +1020,58 @@ sub handler { $r->print(&Apache::loncommon::studentbrowser_javascript(). ''. &Apache::loncommon::bodytag('EMail and Messages')); - $r->print('Subject: '.$content{'subject'}. - '
From: '. + $r->print(''.&mt('Subject').': '.$content{'subject'}. + '
'.&mt('From').': '. &Apache::loncommon::aboutmewrapper( &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}), $content{'sendername'},$content{'senderdomain'}).' ('. $content{'sendername'}.' at '. $content{'senderdomain'}.') '. - '
Time: '.$content{'time'}.'

'. - ''. - ''. - ''. - ''. - ''. + ''. + ''. + ''. + ''. - ''. - '
Functions:ReplyForwardMark Unread'.&mt('Functions').':'.&mt('Reply').''.&mt('Forward').''.&mt('Mark Unread').'DeleteDisplay all Messages

'.
+		''.&mt('Display all Messages').'');
+      if ($counter > 0){
+ 	  $r->print(''.&mt('Previous').'');
+       }
+       if ($counter < $number_of_messages - 1){
+ 	  $r->print(''.&mt('Next').'');
+       }
+       $r->print('
'.
              &Apache::lontexconvert::msgtexconverted($content{'message'}).
              '
'.$content{'citation'});
   } elsif ($ENV{'form.replyto'}) {
       &comprep($r,$ENV{'form.replyto'});
   } elsif ($ENV{'form.sendreply'}) {
-      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('Sending critical: '.
-                &user_crit_msg($content{'sendername'},
-                                 $content{'senderdomain'},
-                                 $ENV{'form.subject'},
-                                 $ENV{'form.message'},
-                                 $ENV{'form.sendbck'}));
-      } else {
-         $r->print('Sending: '.&user_normal_msg($content{'sendername'},
-                                 $content{'senderdomain'},
-                                 $ENV{'form.subject'},
-                                 $ENV{'form.message'}));
+      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);
@@ -841,64 +1118,75 @@ $content{'sendername'},$content{'senderd
   } elsif ($ENV{'form.recordftf'}) {
       &facetoface($r,$ENV{'form.recordftf'});
   } elsif ($ENV{'form.sendmail'}) {
-      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}='';
-          }
+      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.='
'.$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('
');
+	  }
       }
-    foreach (keys %toaddr) {
-      my ($recuname,$recdomain)=split(/\:/,$_);
-      my $msgtxt=$ENV{'form.message'};
-      if ($toaddr{$_}) { $msgtxt.='
'.$toaddr{$_}; }    
-      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,
-                                 $ENV{'form.sendbck'}));
+      if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
+	  if ($ENV{'form.displayedcrit'}) {
+	      &discrit($r);
+	  } else {
+	      &disall($r);
+	  }
       } else {
-         $r->print('Sending: '.&user_normal_msg($recuname,$recdomain,
-                                 $ENV{'form.subject'},
-                                 $msgtxt,
-                                 $content{'citation'}));
-      }
-      $r->print('
');
-    }
-      if ($ENV{'form.displayedcrit'}) {
-          &discrit($r);
-      } else {
-	  &disall($r);
+	  $r->print(
+  '
'.&mt('Could not deliver message').'
'.
+  &mt('Please use the browser "Back" button and correct the recipient addresses')
+		    );
       }
   } else {
       &disall($r);
@@ -913,7 +1201,14 @@ BEGIN {
     $msgcount=0;
 }
 
-1;
+=pod
+
+=back
+
+=cut
+
+1; 
+
 __END__