--- loncom/interface/lonmsgdisplay.pm	2007/04/22 02:25:36	1.69
+++ loncom/interface/lonmsgdisplay.pm	2007/05/03 12:13:35	1.75
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.69 2007/04/22 02:25:36 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.75 2007/05/03 12:13:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -390,6 +390,9 @@ sub renamefolder {
     if ($env{'form.renamed'} eq '') {
         return &mt('The folder "[_1]" may not be renamed to "[_2]" as the new name you requested is an invalid name.',$folder,$newname);
     }
+    if (defined($permfolders{$folder})) {
+        return &mt('The folder "[_1]" may not be renamed as it is a folder provided by the system.',$folder);
+    }
     if (defined($permfolders{$newname})) {
         return &mt('The folder "[_1]" may not be renamed to "[_2]" as the new name you requested is reserved for folders provided automatically by the system.',$folder,$newname);
     }
@@ -734,12 +737,20 @@ $content{'sendername'}.':'.
             '<br />'.&mt('Subject').': '.$content{'subject'}.
             '<br /><pre>'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).
-            '</pre><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_'.$key.'" value="'.&mt('Confirm Receipt').'" />'.
+            '</pre><small>';
+        my $rec_button = &mt('Move to Inbox');
+        my $reprec_button = &mt('Move to Inbox/Compose reply');
+        if ($content{'sendback'}) {
+            $rec_button = &mt('Confirm Receipt');
+            $reprec_button = &mt('Confirm Receipt and Reply');
+            $result .= &mt('You have to confirm that you have received this message before you can view other pages. After confirmation, this message will be moved to your regular inbox');
+        } else {
+            $result .= &mt('Click one of the buttons below to move the message to your inbox').' '.&mt('Access to other pages will be prevented until you have done this.');
+        }
+        $result .= '</small><br />'.
+            '<input type="submit" name="rec_'.$key.'" value="'.$rec_button.'" />'.
             '<input type="submit" name="reprec_'.$key.'" '.
-                  'value="'.&mt('Confirm Receipt and Reply').'" />';
+                  'value="'.$reprec_button.'" />';
     }
     # Check to see if there were any messages.
     if ($result eq '') {
@@ -1186,7 +1197,13 @@ sub compout {
           text=>"Display All Messages"});
         &printheader($r,'/adm/email?compose=multiforward',
              'Forwarding Multiple Messages');
-        $r->print(&mt('Each of the <b>[quant,_1,message]</b> you checked will be forwarded to the recipient(s) you select below.',$multiforward).'<br />');
+        if ($multiforward > 1) {
+            $r->print(&mt('Each of the <b>[quant,_1,message]</b> you checked
+will be forwarded to the recipient(s) you select below.',$multiforward).'<br />');
+        } else {
+            $r->print(&mt('The message you checked will be forwarded to the recipient(s) you select below.').'<br />');
+        }
+
     } else {
 	&printheader($r,'/adm/email?compose=upload',
 	     'Distribute from Uploaded File');
@@ -1222,7 +1239,19 @@ sub compout {
 &mt('Send copy to permanent email address (if known)').'</label></p>'.
 '<p><label><input type="checkbox" name="rsspost" /> '.
 		  &mt('Include in course RSS newsfeed').'</label></p>';
-     }
+    }
+    if ($broadcast ne 'group') {
+        if (&Apache::lonnet::allowed('dff',$env{'request.course.id'}) ||
+            &Apache::lonnet::allowed('dff',$env{'request.course.id'}.
+                                     '/'.$env{'request.course.sec'})) {
+
+            $dispcrit.='<p><label>'.
+                       '<input type="checkbox" name="courserecord" value="1" /> '.
+                       &mt("Include in course's 'User records' for recipient(s)").
+                       '</label></p>';
+        }
+    }
+
     my %message;
     my %content;
     my $defdom=$env{'user.domain'};
@@ -1255,12 +1284,18 @@ sub compout {
 	if ($content{'baseurl'}) {
 	    $disbase='<input type="hidden" name="baseurl" value="'.&escape($content{'baseurl'}).'" />';
 	    if ($env{'user.adv'}) {
-		$disbase.='<label><input type="checkbox" name="storebasecomment" />'.&mt('Store message for re-use').
+		$disbase.='<label><input type="checkbox" name="storebasecomment" />'.&mt('Save message for re-use').
 		    '</label> <a href="/adm/email?showcommentbaseurl='.
 		    &escape($content{'baseurl'}).'" target="comments">'.
 		    &mt('Show re-usable messages').'</a><br />';
 	    }
 	}
+        my $jscript = &Apache::loncommon::check_uncheck_jscript();
+        $r->print(<<"ENDREPSCRIPT");
+<script type="text/javascript">
+$jscript
+</script>
+ENDREPSCRIPT
     }
     my $citation=&displayresource(%content);
     my ($can_grp_broadcast,$viewgrps,$editgrps);
@@ -1300,6 +1335,22 @@ sub compout {
 		      '<input type="hidden" name="recuname" value="'.$content{'sendername'}.'" />'.
 		      '<input type="hidden" name="recdomain" value="'.$content{'senderdomain'}.'" />'.
 		      '</td></tr>');
+            if ($content{'recipid'}) {
+                my @ccs = &retrieve_cc_recips('replying',%content);
+                if (@ccs > 0) {
+                    my $replyall = qq|
+ <span class="LC_nobreak">
+      <input type="button" value="check all"
+        onclick="javascript:checkAll(document.compemail.replying_cc)" />
+        &nbsp;&nbsp;
+      <input type="button" value="uncheck all"
+        onclick="javascript:uncheckAll(document.compemail.replying_cc)" />
+ </span>
+|;
+                    my $cclist = join(' ',@ccs);
+                    $r->print('<tr><td>'.&mt('Reply to other recipients').':<br />'.$replyall.'</td><td>'.$cclist.'</td></tr>');
+                }
+            }
 	} else {
             $r->print(&recipient_input_row($defdom,%lt));
         }
@@ -1419,10 +1470,13 @@ ENDREC
 
 sub additional_rec_row {
     my ($lt) = @_;
+    my $cc = &mt('Cc:');
+    my $bcc = &mt('Bcc:'); 
     my $output = <<"ENDADD";
-<tr><td>$lt->{'ad'}:<br /><tt>username:domain,username:domain, ...
-</tt></td><td>
-<input type="text" size="50" name="additionalrec" /></td></tr>
+<tr><td>$lt->{'ad'} :<br /><tt>username:domain,username:domain, ...
+</tt></td><td>&nbsp;<span class="span.LC_nobreak">$cc 
+<input type="text" size="50" name="additionalrec_cc" /></nospan><br />
+<span class="span.LC_nobreak">$bcc <input type="text" size="50" name="additionalrec_bcc" /></nospan></td></tr>
 ENDADD
     return $output;
 }
@@ -1507,7 +1561,20 @@ sub disfacetoface {
                     '<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br />'.
                     $content{'message'};
                 }
-            }    
+            }
+        } elsif ($content{'subject'}=~/^Archive/) {
+            $result.='<h3>'.&mt('Archived Message').'</h3>';
+            if (defined($content{'coursemsgid'})) {
+                my $crsmsgid = &escape($content{'coursemsgid'});
+                my $archive_message = &general_message($crsmsgid);
+                $content{'message'} = '<b>'.&mt('Subject').': '.$content{'message'}.'</b><br />'.$archive_message;
+            } else {
+                %content=&Apache::lonmsg::unpackagemsg($content{'message'});
+                $content{'message'} =
+                '<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br
+'.
+                $content{'message'};
+            }
         } else {
             $result.='<h3>'.&mt('Critical Message').'</h3>';
             if (defined($content{'coursemsgid'})) {
@@ -1570,7 +1637,7 @@ sub facetoface {
                                         : 'faculty and staff';
     &printheader($r,
 		 '/adm/email?recordftf=query',
-		 "User Notes, Face-to-Face, Critical Messages, Broadcast Messages");
+		 "User Notes, Face-to-Face, Critical Messages, Broadcast Messages, Archived Messages");
 # from query string
 
     if ($env{'form.recname'}) { $env{'form.recuname'}=$env{'form.recname'}; }
@@ -1585,7 +1652,7 @@ sub facetoface {
 	('stdselect','recuname','recdomain');
     my %lt=&Apache::lonlocal::texthash('user' => 'Username',
 				       'dom' => 'Domain',
-				       'head' => "User Notes, Records of Face-To-Face Discussions, Critical Messages, and Broadcast Messages in $crstype",
+				       'head' => "User Notes, Records of Face-To-Face Discussions, Critical Messages, Broadcast Messages and Archived Messages in $crstype",
 				       'subm' => 'Retrieve discussion and message records',
 				       'newr' => 'New Record (record is visible to '.lc($crstype).' '.$leaders.')',
 				       'post' => 'Post this Record');
@@ -1649,8 +1716,8 @@ sub examblock {
             'cbds' => 'Communication blocking during scheduled exams',
             'desc' => "You can use communication blocking to prevent $usertype enrolled in this course from displaying LON-CAPA messages sent by other $usertype during an online exam. As blocking of communication could potentially interrupt legitimate communication between $usertype who are also both enrolled in a different LON-CAPA course, please be careful that you select the correct start and end times for your scheduled exam when setting or modifying these parameters.",
              'mecb' => 'Modify existing communication blocking periods',
-             'ncbc' => 'No communication blocks currently stored',
-             'stor' => 'Store',
+             'ncbc' => 'No communication blocks currently saved',
+             'stor' => 'Save',
     );
 
     my %ltext = &Apache::lonlocal::texthash(
@@ -1953,7 +2020,6 @@ sub displaymessage {
     }
     my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);
     my %content=&Apache::lonmsg::unpackagemsg($message{$msgid});
-
     my $counter=0;
     $r->print('<pre>');
     my $escmsgid=&escape($msgid);
@@ -2008,16 +2074,22 @@ sub displaymessage {
 	}
 	$r->print('</tr></table>');
     }
-    my $tolist;
-    my @recipients = ();
-    for (my $i=0; $i<@{$content{'recuser'}}; $i++) {
-        $recipients[$i] =  &Apache::loncommon::aboutmewrapper(
-           &Apache::loncommon::plainname($content{'recuser'}[$i],
+    my ($tolist,$cclist);
+    my (@recipients,@ccs);
+    if (ref($content{'recuser'}) eq 'ARRAY') {
+        for (my $i=0; $i<@{$content{'recuser'}}; $i++) {
+            $recipients[$i] =  &Apache::loncommon::aboutmewrapper(
+               &Apache::loncommon::plainname($content{'recuser'}[$i],
                                       $content{'recdomain'}[$i]),
-              $content{'recuser'}[$i],$content{'recdomain'}[$i]).
-       ' ('.$content{'recuser'}[$i].' at '.$content{'recdomain'}[$i].') ';
+                  $content{'recuser'}[$i],$content{'recdomain'}[$i]).
+           ' ('.$content{'recuser'}[$i].' at '.$content{'recdomain'}[$i].') ';
+        }
     }
     $tolist = join(', ',@recipients);
+    if ($content{'recipid'}) {
+        @ccs = &retrieve_cc_recips('display',%content);
+        $cclist = join(', ',@ccs);
+    }
     my ($restitle,$baseurl,$refers_to);
     if (defined($content{'resource_title'})) {
         $restitle = $content{'resource_title'};
@@ -2030,17 +2102,27 @@ sub displaymessage {
         $baseurl = &Apache::lonenc::check_encrypt($content{'baseurl'});
     }
     $r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}));
-    $r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}.
-	      ($folder ne 'sent'?'<br /><b>'.&mt('From').':</b> '.
+    $r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'});
+    if ($folder eq 'sent') {
+        $r->print('<br /><b>'.&mt('To').':</b> '.$tolist);
+    } else {
+        $r->print('<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('To').':</b> '.
-              $tolist).
-	      ($content{'courseid'}?'<br /><b>'.&mt($crstype).':</b> '.$courseinfo{'description'}.
-	       ($content{'coursesec'}?' ('.&mt('Section').': '.$content{'coursesec'}.')':''):'').
-	      '<br /><b>'.&mt('Time').':</b> '.$content{'time'});
+	      $content{'senderdomain'}.') ');
+        if ($cclist) {
+            $r->print('<br /><b>'.&mt('Cc').':</b> '.$cclist);
+        }
+    }
+    if ($content{'courseid'}) {
+        $r->print('<br /><b>'.&mt($crstype).':</b> '.$courseinfo{'description'});
+        if ($content{'coursesec'}) {
+            $r->print(' ('.&mt('Section').': '.$content{'coursesec'}.')');
+        }
+    }
+    $r->print('<br /><b>'.&mt('Time').':</b> '.$content{'time'});
     if ($baseurl) {
         if (defined($content{'courseid'}) && defined($env{'request.course.id'})) {
             if ($content{'courseid'} eq $env{'request.course.id'}) {
@@ -2093,6 +2175,38 @@ sub displaymessage {
     return;
 }
 
+sub retrieve_cc_recips {
+    my ($context,%content) = @_; 
+    my %reciphash =
+         &Apache::lonnet::get('nohist_emailrecip',[$content{'recipid'}],
+                              $content{'senderdomain'},$content{'sendername'});
+    my $recipinfo = $reciphash{$content{'recipid'}};
+    my @ccs;
+    if (ref($recipinfo) eq 'HASH') {
+        if (ref($recipinfo->{'cc'}) eq 'HASH') {
+            foreach my $cc (sort(keys(%{$recipinfo->{'cc'}}))) {
+                my ($ccname,$ccdom) = split(/:/,$cc);
+                if (!(($ccname eq $env{'user.name'}) &&
+                     ($ccdom eq $env{'user.domain'}))) {
+                    my $showcc ='<span class="LC_nobreak">';
+                    if ($context eq 'replying') { 
+                        $showcc = '<label><input type="checkbox" name="replying_cc" value="'.$cc.'" />';
+                    }
+                    $showcc .= &Apache::loncommon::aboutmewrapper(
+                                       &Apache::loncommon::plainname($ccname,
+                                         $ccdom),$ccname,$ccdom);
+		    if ($context eq 'replying') {
+			$showcc .='</label>';
+		    }
+		    $showcc .= '</span>';
+		    push(@ccs,$showcc);
+                }
+            }
+        }
+    }
+    return @ccs;
+}
+
 # =========================================================== Show the citation
 
 sub displayresource {
@@ -2177,10 +2291,10 @@ sub storedcommentlisting {
     my ($r)=@_;
     my %msgs=&Apache::lonnet::dump('nohist_stored_comments',undef,undef,
        '^'.&escape(&escape($env{'form.showcommentbaseurl'})));
-    $r->print(&Apache::loncommon::start_page('Stored Comment Listing',undef,
+    $r->print(&Apache::loncommon::start_page('Saved Comment Listing',undef,
 					     {'onlybody' => 1}));
     if ((keys %msgs)[0]=~/^error\:/) {
-	$r->print(&mt('No stored comments yet.'));
+	$r->print(&mt('No saved comments yet.'));
     } else {
 	my $found=0;
 	foreach my $key (sort(keys(%msgs))) {
@@ -2188,7 +2302,7 @@ sub storedcommentlisting {
 	    $found=1;
 	}
 	unless ($found) {
-	    $r->print(&mt('No stored comments yet for this resource.'));
+	    $r->print(&mt('No saved comments yet for this resource.'));
 	}
     }
 }
@@ -2199,8 +2313,9 @@ sub sendoffmail {
     my ($r,$folder)=@_;
     my $suffix=&Apache::lonmsg::foldersuffix($folder);
     my $sendstatus='';
-    my %specialmsg_status;
-    my $numspecial = 0;
+    my %msg_status;
+    my $numsent = 0;
+    my $nosentstore = 1;
     my ($cdom,$cnum,$group);
     if (exists($env{'form.group'})) {
         $group = $env{'form.group'};
@@ -2239,7 +2354,7 @@ sub sendoffmail {
 	    &Apache::loncommon::get_env_multiple('form.selectedusers_forminput');
 	my $mode = $env{'form.sendmode'};
 
-	my %toaddr;
+	my (%toaddr,$cc,$bcc);
 	if (@to) {
 	    foreach my $dest (@to) {
 		my ($user,$domain) = split(/:/, $dest);
@@ -2257,6 +2372,7 @@ sub sendoffmail {
 	 	}
 	    }
 	} elsif ($env{'form.sendmode'} eq 'upload') {
+            $nosentstore = 0;
 	    foreach my $line (split(/[\n\r\f]+/,$env{'form.upfile'})) {
                 my ($rec,$txt) = ($line =~ /^([^:]+:[^:]+):(.*)$/);
 		if ($txt) {
@@ -2268,17 +2384,38 @@ sub sendoffmail {
 	} else {
 	    if (($env{'form.recuname'} ne '') && ($env{'form.recdomain'} ne '')) {
 		$toaddr{$env{'form.recuname'}.':'.$env{'form.recdomain'}}='';
+                $cc->{$env{'form.recuname'}.':'.$env{'form.recdomain'}}='';
 	    }
 	}
-	if ($env{'form.additionalrec'}) {
-	    foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec'})) {
+	if ($env{'form.additionalrec_cc'}) {
+	    foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec_cc'})) {
 		my ($auname,$audom)=split(/:/,$rec);
 		if (($auname ne "") && ($audom ne "")) {
-		    $toaddr{$auname.':'.$audom}='';
+                    $toaddr{$auname.':'.$audom}='';
+		    $cc->{$auname.':'.$audom}='';
 		}
 	    }
 	}
-
+        if ($env{'form.additionalrec_bcc'}) {
+            foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec_bcc'})) {
+                my ($auname,$audom)=split(/:/,$rec);
+                if (($auname ne "") && ($audom ne "")) {
+                    $toaddr{$auname.':'.$audom}='';
+                    $bcc->{$auname.':'.$audom}='';
+                }
+            }
+        }
+        if ($env{'form.replying_cc'}) {
+            my @ccreplies = 
+                &Apache::loncommon::get_env_multiple('form.replying_cc');
+            foreach my $rec (@ccreplies) {
+                my ($auname,$audom)=split(/:/,$rec);
+                if (($auname ne "") && ($audom ne "")) {
+                    $toaddr{$auname.':'.$audom}='';
+                    $cc->{$auname.':'.$audom}='';
+                }
+            }
+        }
         my $savemsg;
         my $msgtype;
         my %sentmessage;
@@ -2294,11 +2431,24 @@ sub sendoffmail {
         } else {
             $savemsg=&Apache::lonfeedback::clear_out_html($env{'form.message'});
         }
-	
+        my %reciphash = (
+                           cc => $cc,
+                           bcc => $bcc,
+                        ); 
+        my ($recipid,$recipstatus) = 
+            &Apache::lonmsg::store_recipients($msgsubj,$env{'user.name'},
+                                       $env{'user.domain'},\%reciphash);
+        if ($recipstatus ne 'ok') {
+            &Apache::lonnet::logthis('Failed to store Bcc and Cc recipients for '.$env{'user.name'}.':'.$env{'user.domain'});
+        }  
+        my @recusers;
+        my @recudoms;
 	foreach my $address (sort(keys(%toaddr))) {
 	    my ($recuname,$recdomain)=split(/\:/,$address);
             my $msgtxt = $savemsg;
-	    if ($toaddr{$address}) { $msgtxt.='<hr />'.$toaddr{$address}; }
+            if ($toaddr{$address}) {
+	        $msgtxt.='<hr />'.$toaddr{$address};
+            }
 	    my @thismsg;
 	    if ($msgtype eq 'critical') {
 		$r->print(&mt('Sending critical message').' '.
@@ -2308,7 +2458,8 @@ sub sendoffmail {
 						   $msgsubj,$msgtxt,
 						   $env{'form.sendbck'},
 						   $env{'form.permanent'},
-						   \$sentmessage{$address});
+						   \$sentmessage{$address},
+                                                   $nosentstore,$recipid);
 	    } else {
 		$r->print(&mt('Sending').' '.$recuname.':'.$recdomain.': ');
 		@thismsg=
@@ -2317,95 +2468,93 @@ sub sendoffmail {
 						     $content{'citation'},
 						     undef,undef,
 						     $env{'form.permanent'},
-						     \$sentmessage{$address});
-            }
-	    if (($env{'request.course.id'}) && (($msgtype eq 'critical') || 
-                                         ($env{'form.sendmode'} eq 'group'))) {
-	        $specialmsg_status{$recuname.':'.$recdomain} =
-		    join(' ',@thismsg);
-		foreach my $result (@thismsg) {
-		    if ($result eq 'ok' || $result eq 'con_delayed') {
-			$numspecial++;
-		    }
-		}
+						     \$sentmessage{$address},
+                                                     undef,undef,undef,
+                                                     $nosentstore,$recipid);
+            }
+	    $msg_status{$recuname.':'.$recdomain}=join(' ',@thismsg);
+	    if ($msg_status{$recuname.':'.$recdomain} =~ /(ok|con_delayed)/) {  
+	        $numsent++;
+                push(@recusers,$recuname);
+                push(@recudoms,$recdomain);
 	    }
 	    $sendstatus.=' '.join(' ',@thismsg);
 	}
-        if (($env{'request.course.id'}) && (($env{'form.sendmode'} eq 'group')
-                                              || ($msgtype eq 'critical'))) {
-            my $subj_prefix;
-            if ($msgtype eq 'critical') {
-                $subj_prefix = 'Critical.';
-            } else {
-                $subj_prefix = 'Broadcast.';
-            }
-            my ($specialmsgid,$specialresult);
-            my $course_str = &escape('['.$cnum.':'.$cdom.']');
+        my $subj_prefix;
+        if ($numsent > 0) {
+            if (($env{'request.course.id'}) && 
+                (($env{'form.sendmode'} eq 'group') ||
+                 ($env{'form.courserecord'}) ||
+                 ($msgtype eq 'critical'))) {
+                if ($msgtype eq 'critical') {
+                    $subj_prefix = 'Critical.';
+                } elsif ($env{'form.sendmode'} eq 'group') {
+                    $subj_prefix = 'Broadcast.';
+                } else {
+                    $subj_prefix = 'Archive';
+                }
+                my ($specialmsgid,$specialresult);
+                my $course_str = &escape('['.$cnum.':'.$cdom.']');
 
-            if ($numspecial) {
-                $specialresult = &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,$subj_prefix.
-                    ' '.$course_str,$savemsg,undef,undef,undef,
-                    undef,undef,\$specialmsgid);
+                $specialresult = 
+                    &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,
+                        $subj_prefix.' '.$course_str,$savemsg,undef,undef,
+                        undef,undef,undef,\$specialmsgid,undef,undef,undef,
+                        undef,undef,1);
                 $specialmsgid = &unescape($specialmsgid);
-            }
-            if ($specialresult eq 'ok') {
-                my $record_sent;
-                my @recusers;
-                my @recudoms;
-                my ($stamp,$crssubj,$msgname,$msgdom,$msgcount,$context,$pid) =
-		    split(/\:/,&unescape($specialmsgid));
-
-                foreach my $recipient (sort(keys(%toaddr))) {
-                    if ($specialmsg_status{$recipient} =~ /\s*(ok|con_delayed)\s*/) {
-                        my $usersubj = $subj_prefix.'['.$recipient.']';
-                        my $usermsgid = 
-			    &Apache::lonmsg::buildmsgid($stamp,$usersubj,
-							$msgname,$msgdom,
-							$msgcount,$context,
-							$pid);
-                        &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,$subj_prefix.
-                                             ' ['.$recipient.']',$msgsubj,undef,
-                        undef,undef,undef,$usermsgid,undef,undef,$specialmsgid);
-                        my ($uname,$udom) = split(/:/,$recipient);
-                        push(@recusers,$uname);
-                        push(@recudoms,$udom);
+                if ($specialresult eq 'ok') {
+                    my ($stamp,$crssubj,$msgname,$msgdom,$msgcount,$context,$pid) =
+		        split(/\:/,&unescape($specialmsgid));
+
+                    foreach my $recipient (sort(keys(%toaddr))) {
+                        if ($msg_status{$recipient} =~ /\s*(ok|con_delayed)\s*/) {
+                            my $usersubj = $subj_prefix.'['.$recipient.']';
+                            my $usermsgid = 
+			        &Apache::lonmsg::buildmsgid($stamp,$usersubj,
+							    $msgname,$msgdom,
+							    $msgcount,$context,
+							    $pid);
+                            &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,
+                                $subj_prefix.' ['.$recipient.']',$msgsubj,
+                                undef,undef,undef,undef,$usermsgid,undef,
+                                undef,$specialmsgid,undef,undef,undef,1);
+                        }
                     }
-                }
-                if (@recusers) {
-                    my $specialmessage;
-                    my $sentsubj = 
-			$subj_prefix.' ('.$numspecial.' sent) '.$msgsubj;
-                    $sentsubj = &HTML::Entities::encode($sentsubj,'<>&"');
-                    my $sentmsgid = 
-			&Apache::lonmsg::buildmsgid($stamp,$sentsubj,$msgname,
-						    $msgdom,$msgcount,$context,
-						    $pid);
-                    ($specialmsgid,$specialmessage) = &Apache::lonmsg::packagemsg($msgsubj,$savemsg,
-                            undef,undef,undef,\@recusers,\@recudoms,$sentmsgid);
-                    $record_sent = &Apache::lonmsg::store_sent_mail($specialmsgid,$specialmessage);
+                    if (($env{'form.sendmode'} ne 'upload') && (@recusers > 0)) {
+                        &Apache::lonmsg::process_sent_mail($msgsubj,
+                           $subj_prefix,$numsent,$stamp,$msgname,$msgdom,
+                           $msgcount,$context,$pid,$savemsg,\@recusers,
+                           \@recudoms);
+                    }
+                } else {
+                    &Apache::lonnet::logthis('Failed to create record of critical, broadcast or archived message in '.$env{'course.'.$env{'request.course.id'}.'.num'}.' at '.$env{'course.'.$env{'request.course.id'}.'.domain'}.' - no msgid generated');
                 }
             } else {
-                &Apache::lonnet::logthis('Failed to create record of critical message or broadcast in '.$env{'course.'.$env{'request.course.id'}.'.num'}.' at '.$env{'course.'.$env{'request.course.id'}.'.domain'}.' - no msgid generated');
+                my $stamp = time;
+                my $msgcount = &Apache::lonmsg::get_uniq();
+                my $context = &Apache::lonmsg::get_course_context();
+                &Apache::lonmsg::process_sent_mail($msgsubj,$subj_prefix,
+                       $numsent,$stamp,$env{'user.name'},
+                       $env{'user.domain'},$msgcount,$context,
+                       $$,$savemsg,\@recusers,\@recudoms);
             }
         }
-    } else {
-	&printheader($r,'','No messages sent.'); 
-    }
-    if (!$env{'form.multiforward'}) { 
-        if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
-	    $r->print('<br /><span class="LC_success">'.&mt('Completed.').
-                      '</span>');
-	    if ($env{'form.displayedcrit'}) {
-	        &discrit($r);
+        if (!$env{'form.multiforward'}) { 
+            if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
+	        $r->print('<br /><span class="LC_success">'.&mt('Completed.').
+                          '</span>');
+	        if ($env{'form.displayedcrit'}) {
+	            &discrit($r);
+                }
+                if ($group ne '') {
+                    $r->print(&groupmail_sent($group,$cdom,$cnum)); 
+	        } else {
+	            &Apache::loncommunicate::menu($r);
+	        }
+            } else {
+	        $r->print('<p><span class="LC_error">'.&mt('Could not deliver message').'</span> '.
+		          &mt('Please use the browser "Back" button and correct the recipient addresses '."($sendstatus)").'</p>');
             }
-            if ($group ne '') {
-                $r->print(&groupmail_sent($group,$cdom,$cnum)); 
-	    } else {
-	        &Apache::loncommunicate::menu($r);
-	    }
-        } else {
-	    $r->print('<p><span class="LC_error">'.&mt('Could not deliver message').'</span> '.
-		  &mt('Please use the browser "Back" button and correct the recipient addresses '."($sendstatus)").'</p>');
         }
     }
     return $sendstatus;
@@ -2495,16 +2644,18 @@ sub handler {
 	&printheader($r,'','Confirmed Receipt');
 	my $replying = 0;
 	foreach my $envkey (keys(%env)) {
-	    if ($envkey=~/^form\.rec\_(.*)$/) {
-		$r->print('<b>'.&mt('Confirming Receipt').':</b> '.
-			  &Apache::lonmsg::user_crit_received($1).'<br>');
-	    }
-	    if ($envkey=~/^form\.reprec\_(.*)$/) {
-		my $msgid=$1;
-		$r->print('<b>'.&mt('Confirming Receipt').':</b> '.
-			  &Apache::lonmsg::user_crit_received($msgid).'<br>');
-		&compout($r,'','','',$msgid);
-		$replying = 1;
+	    if ($envkey=~/^form\.(rep)?rec\_(.*)$/) {
+       		my $msgid = $2;
+		$r->print('<b>'.&mt('Confirming Receipt').':</b> ');
+		my $result = &Apache::lonmsg::user_crit_received($msgid);
+                if ($result =~ /trans:\s+ok/) {
+                    &statuschange($msgid,'read');
+                }
+                $r->print($result.'<br>');
+                if ($1 eq 'rep') {
+		    &compout($r,'','','',$msgid);
+		    $replying = 1;
+                }
 	    }
 	}
 	if (!$replying) {