--- loncom/interface/lonmsg.pm	2004/09/28 14:12:40	1.109
+++ loncom/interface/lonmsg.pm	2004/12/15 01:17:09	1.124
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.109 2004/09/28 14:12:40 matthew Exp $
+# $Id: lonmsg.pm,v 1.124 2004/12/15 01:17:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -523,20 +523,29 @@ sub folderlist {
 	&mt('Folder').': '.
 	&Apache::loncommon::select_form($folder,'folder',
 			     ('' => &mt('INBOX'),'trash' => &mt('TRASH'),
+			      'new' => &mt('New Messages Only'),
+                              'critical' => &mt('Critical'),
 			      'sent' => &mt('Sent Messages'),
 			      map { $_ => $_ } @allfolders)).
 			      ' '.&mt('Show').' '.
 	    &Apache::loncommon::select_form($interdis,'interdis',
 (' 10' => '10', ' 20' => '20', ' 50' => '50', '100' => '100', '200' => '200')).	
    '<input type="submit" value="'.&mt('View Folder').'" /><br />'.
+    '<input type="hidden" name="sortedby" value="'.$ENV{'form.sortedby'}.'" />'.
+			      ($folder=~/^(new|critical)/?'</form>':'');
+}
+
+sub scrollbuttons {
+    my ($start,$maxdis,$first,$finish,$total)=@_;
+    unless ($total>0) { return ''; }
+    $start++; $maxdis++;$first++;$finish++;
+    return 
    '<input type="submit" name="firstview" value="'.&mt('First').'" />'.
    '<input type="submit" name="prevview" value="'.&mt('Previous').'" />'.
-   '<input type="text" size="5" name="startdis" value="'.$startdis.'" />'.
+   '<input type="text" size="5" name="startdis" value="'.$start.'" onChange="this.form.submit()" /> of '.$maxdis.
    '<input type="submit" name="nextview" value="'.&mt('Next').'" />'.
-   '<input type="submit" name="lastview" value="'.&mt('Last').'" />'.
-	'<a href="/adm/email?critical=display'.$sqs.'">'.
-	    &mt('View Critical Messages').'</a>'.
-	    '</form>';
+   '<input type="submit" name="lastview" value="'.&mt('Last').'" /><br />'.
+   &mt('Messages [_1] through [_2] of [_3]',$first,$finish,$total).'</form>';
 }
 
 # =============================================================== Folder suffix
@@ -568,6 +577,10 @@ sub statuschange {
 
 sub makefolder {
     my ($newfolder)=@_;
+    if (($newfolder eq 'sent')
+     || ($newfolder eq 'critical')
+     || ($newfolder eq 'trash')
+     || ($newfolder eq 'new')) { return; }
     &Apache::lonnet::put('email_folders',{$newfolder => time});
 }
 
@@ -655,7 +668,7 @@ ENDDISHEADER
                       '<td>('.$_.'),</td><td><i>'.$role.'</i></td></tr>');
         }
     }
-    $r->print('</table><p><table>');
+    $r->print('</table><table>');
     while (my ($student,$info) = each(%$classlist)) {
         my ($sname,$sdom,$status,$fullname,$section) =
             (@{$info}[&Apache::loncoursedata::CL_SNAME(),
@@ -663,7 +676,7 @@ ENDDISHEADER
                       &Apache::loncoursedata::CL_STATUS(),
                       &Apache::loncoursedata::CL_FULLNAME(),
                       &Apache::loncoursedata::CL_SECTION()]);
-        # next if ($status ne 'Active');
+        next if ($status ne 'Active');
         my $key = 'send_to_&&&'.$section.'&&&'.$student;
         if (! defined($fullname) || $fullname eq '') { $fullname = $sname; }
         $r->print('<tr><td><label>'.
@@ -671,7 +684,7 @@ ENDDISHEADER
                   $fullname.'</td><td>'.$sname.'@'.$sdom.'</td><td>'.$section.
                   '</td></tr>');
     }
-    $r->print('</table></p>');
+    $r->print('</table>');
 }
 
 # ==================================================== Display Critical Message
@@ -686,7 +699,6 @@ sub discrit {
     foreach (sort keys %what) {
         my %content=&unpackagemsg($what{$_});
         next if ($content{'senderdomain'} eq '');
-        $content{'message'}=~s/\n/\<br\>/g;
         $result.='<hr />'.&mt('From').': <b>'.
 &Apache::loncommon::aboutmewrapper(
  &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
@@ -770,10 +782,108 @@ sub sortedmessages {
     return @temp;
 }
 
+# ======================================================== Display new messages
+
+
+sub disnew {
+    my $r=shift;
+    my %lt=&Apache::lonlocal::texthash(
+				       'nm' => 'New Messages',
+				       'su' => 'Subject',
+				       'da' => 'Date',
+				       'us' => 'Username',
+				       'op' => 'Open',
+				       'do' => 'Domain'
+				       );
+    my @msgids = sort split(/\&/,&Apache::lonnet::reply
+                            ('keys:'.$ENV{'user.domain'}.':'.
+                             $ENV{'user.name'}.':nohist_email',
+                             $ENV{'user.home'}));
+    my @newmsgs;
+    my %setters = ();
+    my $startblock = 0;
+    my $endblock = 0;
+    my %blocked = ();
+    my $numblocked = 0;
+    # Check for blocking of display because of scheduled online exams.
+    &blockcheck(\%setters,\$startblock,\$endblock);
+    foreach (@msgids) {
+        my ($sendtime,$shortsubj,$fromname,$fromdom,$status)=
+	    &Apache::lonmsg::unpackmsgid($_);
+        if (defined($sendtime) && $sendtime!~/error/) {
+            my $numsendtime = $sendtime;
+            $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
+            if ($status eq 'new') {
+                if ($numsendtime >= $startblock && ($numsendtime <= $endblock && $endblock > 0) ) {
+                    $blocked{$_} = 'ON';
+                    $numblocked ++;
+                } else {
+                    push @newmsgs, { 
+                        msgid    => $_,
+                        sendtime => $sendtime,
+                        shortsub => &Apache::lonnet::unescape($shortsubj),
+                        from     => $fromname,
+                        fromdom  => $fromdom 
+                        }
+                }
+            }
+        }
+    }
+    if ($#newmsgs >= 0) {
+        $r->print(<<TABLEHEAD);
+<h2>$lt{'nm'}</h2>
+<table border=2><tr><th>&nbsp</th>
+<th>$lt{'da'}</th><th>$lt{'us'}</th><th>$lt{'do'}</th><th>$lt{'su'}</th></tr>
+TABLEHEAD
+        foreach my $msg (@newmsgs) {
+            $r->print(<<"ENDLINK");
+<tr bgcolor="#FFBB77">
+<td><a href="/adm/email?display=$msg->{'msgid'}">$lt{'op'}</a></td>
+ENDLINK
+            foreach ('sendtime','from','fromdom','shortsub') {
+                $r->print("<td>$msg->{$_}</td>");
+            }
+            $r->print("</td></tr>");
+        }
+        $r->print('</table></body></html>');
+    } elsif ($numblocked == 0) {
+        $r->print("<h3>".&mt('You have no unread messages')."</h3>");
+    }
+    if ($numblocked > 0) {
+        my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
+        my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
+        if ($numblocked == 1) {
+            $r->print("<h3>".&mt('You have').' '.$numblocked.' '.&mt('blocked unread message').".</h3>");
+            $r->print(&mt('This message is not viewable because').' ');
+        } else {
+            $r->print("<h3>".&mt('You have').' '.$numblocked.' '.&mt('blocked unread messages').".</h3>");
+            $r->print(&mt('These').' '.$numblocked.' '.&mt('messages are not viewable because '));
+        }
+        $r->print(
+&mt('display of LON-CAPA messages sent to you by other students between').' '.$beginblock.' '.&mt('and').' '.$finishblock.' '.&mt('is currently being blocked because of online exams').'.');
+        &build_block_table($r,$startblock,$endblock,\%setters);
+    }
+}
+
+
 # ======================================================== Display all messages
 
 sub disall {
     my ($r,$folder)=@_;
+    $r->print(&folderlist($folder));
+    if ($folder eq 'new') {
+	&disnew($r);
+    } elsif ($folder eq 'critical') {
+	&discrit($r);
+    } else {
+	&disfolder($r,$folder);
+    }
+}
+
+# ============================================================ Display a folder
+
+sub disfolder {
+    my ($r,$folder)=@_;
     my %blocked = ();
     my %setters = ();
     my $startblock;
@@ -804,14 +914,18 @@ ENDDISHEADER
     my $fsqs='&folder='.$folder;
     my @temp=sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder);
     my $totalnumber=$#temp+1;
-    my $number=int($totalnumber/$interdis)+1;
+    unless ($totalnumber>0) {
+	$r->print('<h2>'.&mt('Empty Folder').'</h2>');
+	return;
+    }
+    my $number=int($totalnumber/$interdis);
+    if (($startdis<0) || ($startdis>$number)) { $startdis=$number; }
     my $firstdis=$interdis*$startdis;
     if ($firstdis>$#temp) { $firstdis=$#temp-$interdis+1; }
     my $lastdis=$firstdis+$interdis-1;
     if ($lastdis>$#temp) { $lastdis=$#temp; }
-    $r->print('<h2>'.&mt('Display All Messages').'</h2>'.
-	      &folderlist($folder).
-	      '<form method="post" name="disall" action="/adm/email">'.
+    $r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber));
+    $r->print('<form method="post" name="disall" action="/adm/email">'.
 	      '<table border=2><tr><th colspan="3">&nbsp</th><th>');
     if ($ENV{'form.sortedby'} eq "revdate") {
 	$r->print('<a href = "?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
@@ -876,7 +990,7 @@ ENDDISHEADER
 	$r->print(
 	      '<p><input type="submit" name="markeddel" value="'.&mt('Delete Checked').'" /></p>');
     }
-$r->print('<p><input type="submit" name="markedmove" value="'.&mt('Move Checked to Folder').'" />');
+    $r->print('<p><input type="submit" name="markedmove" value="'.&mt('Move Checked to Folder').'" />');
     my @allfolders=&Apache::lonnet::getkeys('email_folders');
     if ($allfolders[0]=~/^error:/) { @allfolders=(); }
     $r->print(
@@ -897,6 +1011,7 @@ $r->print('<p><input type="submit" name=
 
 sub compout {
     my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder)=@_;
+    my $suffix=&foldersuffix($folder);
 
     if ($broadcast eq 'individual') {
 	&printheader($r,'/adm/email?compose=individual',
@@ -927,6 +1042,7 @@ sub compout {
     my $dispcrit='';
     my $dissub='';
     my $dismsg='';
+    my $disbase='';
     my $func=&mt('Send New');
     my %lt=&Apache::lonlocal::texthash('us' => 'Username',
 				       'do' => 'Domain',
@@ -947,7 +1063,7 @@ sub compout {
     my %content;
     my $defdom=$ENV{'user.domain'};
     if ($forwarding) {
-	%message=&Apache::lonnet::get('nohist_email',[$forwarding]);
+	%message=&Apache::lonnet::get('nohist_email'.$suffix,[$forwarding]);
 	%content=&unpackagemsg($message{$forwarding},$folder);
 	$dispcrit.='<input type="hidden" name="forwid" value="'.
 	    $forwarding.'" />';
@@ -956,9 +1072,12 @@ sub compout {
 	$dissub=&mt('Forwarding').': '.$content{'subject'};
 	$dismsg=&mt('Forwarded message from').' '.
 	    $content{'sendername'}.' '.&mt('at').' '.$content{'senderdomain'};
+	if ($content{'baseurl'}) {
+	    $disbase='<input type="hidden" name="baseurl" value="'.&Apache::lonnet::escape($content{'baseurl'}).'" />';
+	}
     }
     if ($replying) {
-	%message=&Apache::lonnet::get('nohist_email',[$replying]);
+	%message=&Apache::lonnet::get('nohist_email'.$suffix,[$replying]);
 	%content=&unpackagemsg($message{$replying},$folder);
 	$dispcrit.='<input type="hidden" name="replyid" value="'.
 	    $replying.'" />';
@@ -969,7 +1088,17 @@ sub compout {
 	$dismsg=~s/\r/\n/g;
 	$dismsg=~s/\f/\n/g;
 	$dismsg=~s/\n+/\n\> /g;
+	if ($content{'baseurl'}) {
+	    $disbase='<input type="hidden" name="baseurl" value="'.&Apache::lonnet::escape($content{'baseurl'}).'" />';
+	    if ($ENV{'user.adv'}) {
+		$disbase.='<input type="checkbox" name="storebasecomment" />'.&mt('Store message for re-use').
+		    ' <a href="/adm/email?showcommentbaseurl='.
+		    &Apache::lonnet::escape($content{'baseurl'}).'" target="comments">'.
+		    &mt('Show re-usable messages').'</a><br />';
+	    }
+	}
     }
+    my $citation=&displayresource(%content);
     if ($ENV{'form.recdom'}) { $defdom=$ENV{'form.recdom'}; }
       $r->print(
                 '<form action="/adm/email"  name="compemail" method="post"'.
@@ -1009,8 +1138,10 @@ $latexHelp
 <textarea name="message" cols="80" rows="15" wrap="hard">$dismsg
 </textarea></p><br />
 $dispcrit
+$disbase
 <input type="submit" name="send" value="$func $lt{'ma'}" />
-<input type="submit" name="cancel" value="$lt{'ca'}" />
+<input type="submit" name="cancel" value="$lt{'ca'}" /><hr />
+$citation
 ENDCOMP
     } else { # $broadcast is 'upload'
 	$r->print(<<ENDUPLOAD);
@@ -1632,12 +1763,48 @@ sub displaymessage {
 	      ($content{'courseid'}?'<br /><b>'.&mt('Course').':</b> '.$courseinfo{'description'}.
 	       ($content{'coursesec'}?' ('.&mt('Group/Section').': '.$content{'coursesec'}.')':''):'').
 	      '<br /><b>'.&mt('Time').':</b> '.$content{'time'}.
+	      ($content{'baseurl'}?'<br /><b>'.&mt('Refers to').':</b> <a href="'.$content{'baseurl'}.'">'.
+	       $content{'baseurl'}.' ('.&Apache::lonnet::gettitle($content{'baseurl'}).')</a>':'').
 	      '<p><pre>'.
 	      &Apache::lontexconvert::msgtexconverted($content{'message'},1).
-	      '</pre><hr />'.$content{'citation'}.'</p>');
+	      '</pre><hr />'.&displayresource(%content).'</p>');
     return;   
 }
 
+# =========================================================== Show the citation
+
+sub displayresource {
+    my %content=@_;
+#
+# If the recipient is in the same course that the message was sent from and
+# has sufficient privileges, show "all details," else show citation
+#
+    if (($ENV{'request.course.id'} eq $content{'courseid'})
+     && (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) {
+	my $symb=&Apache::lonnet::symbread($content{'baseurl'});
+# Could not get a symb, give up
+	unless ($symb) { return $content{'citation'}; }
+# Have a symb, can render
+	return '<h2>'.&mt('Current attempts of student (if applicable)').'</h2>'.
+	    &Apache::loncommon::get_previous_attempt($symb,
+						     $content{'sendername'},
+						     $content{'senderdomain'},
+						     $content{'courseid'}).
+	    '<hr /><h2>'.&mt('Current screen output (if applicable)').'</h2>'.
+	    &Apache::loncommon::get_student_view($symb,
+						 $content{'sendername'},
+						 $content{'senderdomain'},
+						 $content{'courseid'}).
+	    '<h2>'.&mt('Correct Answer(s) (if applicable)').'</h2>'.
+	    &Apache::loncommon::get_student_answers($symb,
+						    $content{'sendername'},
+						    $content{'senderdomain'},
+						    $content{'courseid'});
+    } else {
+	return $content{'citation'};
+    }
+}
+
 # ================================================================== The Header
 
 sub header {
@@ -1663,6 +1830,143 @@ sub printheader {
     &header($r,$title,$baseurl);
 }
 
+# ------------------------------------------------------------ Store the comment
+
+sub storecomment {
+    my ($r)=@_;
+    my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'});
+    my $cleanmsgtxt='';
+    foreach (split(/[\n\r]/,$msgtxt)) {
+	unless ($_=~/^\s*(\>|\&gt\;)/) {
+	    $cleanmsgtxt.=$_."\n";
+	}
+    }
+    my $key=&Apache::lonnet::escape($ENV{'form.baseurl'}).'___'.time;
+    &Apache::lonnet::put('nohist_stored_comments',{ $key => $cleanmsgtxt });
+}
+
+sub storedcommentlisting {
+    my ($r)=@_;
+    my %msgs=&Apache::lonnet::dump('nohist_stored_comments',undef,undef,
+       '^'.&Apache::lonnet::escape(&Apache::lonnet::escape($ENV{'form.showcommentbaseurl'})));
+    $r->print('<html><body>');
+    if ((keys %msgs)[0]=~/^error\:/) {
+	$r->print(&mt('No stored comments yet.'));
+    } else {
+	my $found=0;
+	foreach (sort keys %msgs) {
+	    $r->print("\n".$msgs{$_}."<hr />");
+	    $found=1;
+	}
+	unless ($found) {
+	    $r->print(&mt('No stored comments yet for this resource.'));
+	}
+    }
+}
+
+# ---------------------------------------------------------------- Send an email
+
+sub sendoffmail {
+    my ($r,$folder)=@_;
+    my $suffix=&foldersuffix($folder);
+    my $sendstatus='';
+    if ($ENV{'form.send'}) {
+	&printheader($r,'','Messages being sent.');
+	$r->rflush();
+	my %content=();
+	undef %content;
+	if ($ENV{'form.forwid'}) {
+	    my $msgid=$ENV{'form.forwid'};
+	    my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);
+	    %content=&unpackagemsg($message{$msgid},1);
+	    &statuschange($msgid,'forwarded',$folder);
+	    $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
+		$content{'message'};
+	}
+	if ($ENV{'form.replyid'}) {
+	    my $msgid=$ENV{'form.replyid'};
+	    my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);
+	    %content=&unpackagemsg($message{$msgid},1);
+	    &statuschange($msgid,'replied',$folder);
+	}
+	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;
+            if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) &&
+                (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
+                $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'},1);
+            } else {  
+	        $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'});
+            }
+	    if ($toaddr{$_}) { $msgtxt.='<hr />'.$toaddr{$_}; }
+	    my $thismsg;    
+	    if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
+		(&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
+		$r->print(&mt('Sending critical message').' '.$recuname.'@'.$recdomain.': ');
+		$thismsg=&user_crit_msg($recuname,$recdomain,
+					&Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+					$msgtxt,
+					$ENV{'form.sendbck'});
+	    } else {
+		$r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': ');
+		$thismsg=&user_normal_msg($recuname,$recdomain,
+					  &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+					  $msgtxt,
+					  $content{'citation'});
+		if (($ENV{'request.course.id'}) && ($ENV{'form.sendmode'} eq 'group')) {
+		    &user_normal_msg_raw(
+					 $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
+					 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+					 'Broadcast ['.$recuname.':'.$recdomain.']',
+					 $msgtxt);
+		}
+	    }
+	    $r->print($thismsg.'<br />');
+	    $sendstatus.=' '.$thismsg;
+	}
+    } else {
+	&printheader($r,'','No messages sent.'); 
+    }
+    if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
+	$r->print('<br /><font color="green">'.&mt('Completed.').'</font>');
+	if ($ENV{'form.displayedcrit'}) {
+	    &discrit($r);
+	} else {
+	    &Apache::loncommunicate::menu($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')
+		  );
+    }
+}
 
 # ===================================================================== Handler
 
@@ -1680,7 +1984,8 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
         ['display','replyto','forward','markread','markdel','markunread',
          'sendreply','compose','sendmail','critical','recname','recdom',
-         'recordftf','sortedby','block','folder','startdis','interdis']);
+         'recordftf','sortedby','block','folder','startdis','interdis',
+	 'showcommentbaseurl']);
     $sqs='&sortedby='.$ENV{'form.sortedby'}.
 	 '&startdis='.$ENV{'form.startdis'}.
 	 '&interdis='.$ENV{'form.interdis'};
@@ -1710,9 +2015,23 @@ sub handler {
 # --------------------------------------------------------------------- Display
 
     $startdis=$ENV{'form.startdis'};
+    $startdis--;
     unless ($startdis) { $startdis=0; }
     $interdis=$ENV{'form.interdis'};
     unless ($interdis) { $interdis=20; }
+    if ($ENV{'form.firstview'}) {
+	$startdis=0;
+    }
+    if ($ENV{'form.lastview'}) {
+	$startdis=-1;
+    }
+    if ($ENV{'form.prevview'}) {
+	$startdis--;
+    }
+    if ($ENV{'form.nextview'}) {
+	$startdis++;
+    }
+
 
 # --------------------------------------------------------------- Render Output
 
@@ -1739,10 +2058,11 @@ sub handler {
 	&printheader($r,'','Displaying Critical Messages');
 	&discrit($r);
     } elsif ($ENV{'form.forward'}) {
-	&compout($r,$ENV{'form.forward'});
+	&compout($r,$ENV{'form.forward'},undef,undef,undef,$folder);
     } elsif ($ENV{'form.markdel'}) {
 	&printheader($r,'','Deleted Message');
 	&statuschange($ENV{'form.markdel'},'deleted',$folder);
+	&Apache::loncommunicate::menu($r);
 	&disall($r,$folder);
     } elsif ($ENV{'form.markedmove'}) {
 	my $total=0;
@@ -1755,6 +2075,7 @@ sub handler {
 	}
 	&printheader($r,'','Moved Messages');
 	$r->print('Moved '.$total.' message(s)<p>');
+	&Apache::loncommunicate::menu($r);
 	&disall($r,$folder);
     } elsif ($ENV{'form.markeddel'}) {
 	my $total=0;
@@ -1766,10 +2087,12 @@ sub handler {
 	}
 	&printheader($r,'','Deleted Messages');
 	$r->print('Deleted '.$total.' message(s)<p>');
+	&Apache::loncommunicate::menu($r);
 	&disall($r,$folder);
     } elsif ($ENV{'form.markunread'}) {
 	&printheader($r,'','Marked Message as Unread');
 	&statuschange($ENV{'form.markunread'},'new');
+	&Apache::loncommunicate::menu($r);
 	&disall($r,$folder);
     } elsif ($ENV{'form.compose'}) {
 	&compout($r,'','',$ENV{'form.compose'});
@@ -1778,103 +2101,21 @@ sub handler {
     } elsif ($ENV{'form.block'}) {
         &examblock($r,$ENV{'form.block'});
     } elsif ($ENV{'form.sendmail'}) {
-	my $sendstatus='';
-	if ($ENV{'form.send'}) {
-	    &printheader($r,'','Messages being sent.');
-	    $r->rflush();
-	    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'};
-	    }
-	    if ($ENV{'form.replyid'}) {
-		my $msgid=$ENV{'form.replyid'};
-		my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
-		%content=&unpackagemsg($message{$msgid},1);
-		&statuschange($msgid,'replied');
-	    }
-	    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{$_}; }
-		my $thismsg;    
-		if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
-		    (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
-		    $r->print(&mt('Sending critical message').' '.$recuname.'@'.$recdomain.': ');
-		    $thismsg=&user_crit_msg($recuname,$recdomain,
-						    &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
-						    $msgtxt,
-						    $ENV{'form.sendbck'});
-		} else {
-		    $r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': ');
-		    $thismsg=&user_normal_msg($recuname,$recdomain,
-						      &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
-						      $msgtxt,
-						      $content{'citation'});
-                    if (($ENV{'request.course.id'}) && ($ENV{'form.sendmode'} eq 'group')) {
-                        &user_normal_msg_raw(
-                        $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
-                        $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-                        'Broadcast ['.$recuname.':'.$recdomain.']',
-                        $msgtxt);
-                    }
-		}
-		$r->print($thismsg.'<br />');
-		$sendstatus.=' '.$thismsg;
-	    }
-	} else {
-	    &printheader($r,'','No messages sent.'); 
-	}
-	if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
-	    $r->print('<br /><font color="green">'.&mt('Completed.').'</font>');
-	    if ($ENV{'form.displayedcrit'}) {
-		&discrit($r);
-	    } else {
-		&Apache::loncommunicate::menu($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')
-		      );
+	&sendoffmail($r,$folder);
+	if ($ENV{'form.storebasecomment'}) {
+	    &storecomment($r);
 	}
+	&disall($r,$folder);
     } elsif ($ENV{'form.newfolder'}) {
 	&printheader($r,'','New Folder');
 	&makefolder($ENV{'form.newfolder'});
+	&Apache::loncommunicate::menu($r);
 	&disall($r,$ENV{'form.newfolder'});
+    } elsif ($ENV{'form.showcommentbaseurl'}) {
+	&storedcommentlisting($r);
     } else {
 	&printheader($r,'','Display All Messages');
+	&Apache::loncommunicate::menu($r);
 	&disall($r,$folder);
     }
     $r->print('</body></html>');