--- loncom/interface/lonmsg.pm	2004/01/15 18:25:36	1.80
+++ loncom/interface/lonmsg.pm	2004/04/06 15:56:37	1.97
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.80 2004/01/15 18:25:36 www Exp $
+# $Id: lonmsg.pm,v 1.97 2004/04/06 15:56:37 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -101,6 +101,7 @@ use Apache::lontexconvert();
 use HTML::Entities();
 use Mail::Send;
 use Apache::lonlocal;
+use Apache::loncommunicate;
 
 # Querystring component with sorting type
 my $sqs;
@@ -109,15 +110,15 @@ my $sqs;
 
 sub packagemsg {
     my ($subject,$message,$citation,$baseurl,$attachmenturl)=@_;
-    $message =&HTML::Entities::encode($message);
-    $citation=&HTML::Entities::encode($citation);
-    $subject =&HTML::Entities::encode($subject);
+    $message =&HTML::Entities::encode($message,'<>&"');
+    $citation=&HTML::Entities::encode($citation,'<>&"');
+    $subject =&HTML::Entities::encode($subject,'<>&"');
     #remove machine specification
     $baseurl =~ s|^http://[^/]+/|/|;
-    $baseurl =&HTML::Entities::encode($baseurl);
+    $baseurl =&HTML::Entities::encode($baseurl,'<>&"');
     #remove machine specification
     $attachmenturl =~ s|^http://[^/]+/|/|;
-    $attachmenturl =&HTML::Entities::encode($attachmenturl);
+    $attachmenturl =&HTML::Entities::encode($attachmenturl,'<>&"');
 
     my $now=time;
     $msgcount++;
@@ -139,6 +140,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>'.
@@ -203,7 +205,7 @@ sub sendemail {
     my $msg = new Mail::Send;
     $msg->to($to);
     $msg->subject('[LON-CAPA] '.$subject);
-    if (my $fh = $msg->open('smtp',Server => 'localhost')) {
+    if (my $fh = $msg->open()) {
 	print $fh $body;
 	$fh->close;
     }
@@ -396,7 +398,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').' '.
@@ -507,7 +509,7 @@ sub discourse {
             'cfs' => 'Check for Section/Group',
             'cfn' => 'Check for None');
     $r->print(<<ENDDISHEADER);
-<input type=hidden name=sendmode value=group>
+<input type="hidden" name="sendmode" value="group" />
 <script>
     function checkall() {
 	for (i=0; i<document.forms.compemail.elements.length; i++) {
@@ -537,10 +539,10 @@ sub discourse {
         }
     }
 </script>
-<input type=button onClick="checkall()" value="$lt{'cfa'}">&nbsp;
-<input type=button onClick="checksec()" value="$lt{'cfs'}">
-<input type=text size=5 name=chksec>&nbsp;
-<input type=button onClick="uncheckall()" value="$lt{'cfn'}">
+<input type="button" onClick="checkall()" value="$lt{'cfa'}" />&nbsp;
+<input type="button" onClick="checksec()" value="$lt{'cfs'}" />
+<input type="text" size="5" name=chksec />&nbsp;
+<input type="button" onClick="uncheckall()" value="$lt{'cfn'}" />
 <p>
 ENDDISHEADER
     my %coursepersonnel=
@@ -599,7 +601,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').'">';
@@ -615,51 +619,6 @@ $content{'sendername'}.'@'.
     $r->print('<input type=hidden name="displayedcrit" value="true"></form>');
 }
 
-# =============================================================== Compose reply
-
-sub comprep {
-    my ($r,$msgid)=@_;
-      my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
-      my %content=&unpackagemsg($message{$msgid},1);
-      my $quotemsg='> '.$content{'message'};
-      $quotemsg=~s/\r/\n/g;
-      $quotemsg=~s/\f/\n/g;
-      $quotemsg=~s/\n+/\n\> /g;
-      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=
- '<input type=checkbox name=critmsg> '.&mt('Send as critical message').' ' . $crithelp . 
- '<br>'.
- '<input type=checkbox name=sendbck> '.&mt('Send as critical message').' ' .
- &mt('and return receipt') . $crithelp . '<p>';
-      }
-    my %lt=&Apache::lonlocal::texthash(
-				   'to' => 'To',
-				   'sb' => 'Subject',
-				   'sr' => 'Send Reply',
-				   'ca' => 'Cancel'
-				   );
-      $r->print(<<"ENDREPLY");
-<form action="/adm/email" method="post">
-<input type="hidden" name="sendreply" value="$msgid">
-$lt{'to'}: $torepl<br />
-$lt{'sb'}: <input type="text" size=50 name="subject" value="$subject"><p>
-<textarea name="message" cols="84" rows="10" wrap="hard">
-$quotemsg
-</textarea></p><br />
-$dispcrit
-<input type="submit" name="send" value="$lt{'sr'}" />
-<input type="submit" name="cancel" value="$lt{'ca'}"/ >
-</form>
-ENDREPLY
-}
-
 sub sortedmessages {
     my @messages = &Apache::lonnet::getkeys('nohist_email');
     #unpack the varibles and repack into temp for sorting
@@ -780,7 +739,7 @@ ENDDISHEADER
 	    }
 	    $r->print('<td><a href="/adm/email?display='.$origID.$sqs. 
 		      '">'.&mt('Open').'</a></td><td><a href="/adm/email?markdel='.$origID.$sqs.
-		      '">'.&mt('Delete').'</a><input type=checkbox name="delmark_'.$origID.'"></td>'.
+		      '">'.&mt('Delete').'</a><input type=checkbox name="delmark_'.$origID.'" /></td>'.
 		      '<td>'.&Apache::lonlocal::locallocaltime($sendtime).'</td><td>'.
 		      $fromname.'</td><td>'.$fromdomain.'</td><td>'.
 		      &Apache::lonnet::unescape($shortsubj).'</td><td>'.
@@ -791,15 +750,42 @@ ENDDISHEADER
               '<a href="javascript:checkall()">'.&mt('Check All').'</a>&nbsp;'.
               '<a href="javascript:uncheckall()">'.&mt('Uncheck All').'</a><p>'.
 	      '<input type="hidden" name="sortedby" value="'.$ENV{'form.sortedby'}.'" />'.
-              '<input type=submit name="markeddel" value="'.&mt('Delete Checked').'">'.
+              '<input type="submit" name="markeddel" value="'.&mt('Delete Checked').'" />'.
               '</form></body></html>');
 }
 
 # ============================================================== Compose output
 
 sub compout {
-    my ($r,$forwarding,$broadcast)=@_;
-      my $dispcrit='';
+    my ($r,$forwarding,$replying,$broadcast,$replycrit)=@_;
+
+    if ($broadcast eq 'individual') {
+	&printheader($r,'/adm/email?compose=individual',
+	     'Send a Message');
+    } elsif ($broadcast) {
+	&printheader($r,'/adm/email?compose=group',
+	     'Broadcast Message');
+    } elsif ($forwarding) {
+	&Apache::lonhtmlcommon::add_breadcrumb
+        ({href=>"/adm/email?display=".&Apache::lonnet::escape($forwarding),
+          text=>"Display Message"});
+	&printheader($r,'/adm/email?forward='.&Apache::lonnet::escape($forwarding),
+	     'Forwarding a Message');
+    } elsif ($replying) {
+	&Apache::lonhtmlcommon::add_breadcrumb
+        ({href=>"/adm/email?display=".&Apache::lonnet::escape($replying),
+          text=>"Display Message"});
+	&printheader($r,'/adm/email?replyto='.&Apache::lonnet::escape($replying),
+	     'Replying to a Message');
+    } elsif ($replycrit) {
+	$r->print('<h3>'.&mt('Replying to a Critical Message').'</h3>');
+	$replying=$replycrit;
+    } else {
+	&printheader($r,'/adm/email?compose=upload',
+	     'Distribute from Uploaded File');
+    }
+
+    my $dispcrit='';
     my $dissub='';
     my $dismsg='';
     my $func=&mt('Send New');
@@ -813,50 +799,75 @@ sub compout {
     if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
 	 my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");
          $dispcrit=
- '<input type="checkbox" name="critmsg"> '.&mt('Send as critical message').' ' . $crithelp . 
+ '<input type="checkbox" name="critmsg" /> '.&mt('Send as critical message').' ' . $crithelp . 
  '<br>'.
- '<input type="checkbox" name="sendbck"> '.&mt('Send as critical message').'  ' .
+ '<input type="checkbox" name="sendbck" /> '.&mt('Send as critical message').'  ' .
  &mt('and return receipt') . $crithelp . '<p>';
-      }
+     }
+    my %message;
+    my %content;
+    my $defdom=$ENV{'user.domain'};
     if ($forwarding) {
-       $dispcrit.='<input type="hidden" name="forwid" value="'.
-	   $forwarding.'">';
-       $func=&mt('Forward');
-      my %message=&Apache::lonnet::get('nohist_email',[$forwarding]);
-      my %content=&unpackagemsg($message{$forwarding});
-
-       $dissub=&mt('Forwarding').': '.$content{'subject'};
-       $dismsg=&mt('Forwarded message from').' '.
-	   $content{'sendername'}.' '.&mt('at').' '.$content{'senderdomain'};
+	%message=&Apache::lonnet::get('nohist_email',[$forwarding]);
+	%content=&unpackagemsg($message{$forwarding});
+	$dispcrit.='<input type="hidden" name="forwid" value="'.
+	    $forwarding.'" />';
+	$func=&mt('Forward');
+	
+	$dissub=&mt('Forwarding').': '.$content{'subject'};
+	$dismsg=&mt('Forwarded message from').' '.
+	    $content{'sendername'}.' '.&mt('at').' '.$content{'senderdomain'};
+    }
+    if ($replying) {
+	%message=&Apache::lonnet::get('nohist_email',[$replying]);
+	%content=&unpackagemsg($message{$replying});
+	$dispcrit.='<input type="hidden" name="forwid" value="'.
+	    $forwarding.'" />';
+	$func=&mt('Replying to');
+	
+	$dissub=&mt('Reply').': '.$content{'subject'};       
+	$dismsg='> '.$content{'message'};
+	$dismsg=~s/\r/\n/g;
+	$dismsg=~s/\f/\n/g;
+	$dismsg=~s/\n+/\n\> /g;
     }
-    my $defdom=$ENV{'user.domain'};
     if ($ENV{'form.recdom'}) { $defdom=$ENV{'form.recdom'}; }
       $r->print(
                 '<form action="/adm/email"  name="compemail" method="post"'.
                 ' enctype="multipart/form-data">'."\n".
-                '<input type="hidden" name="sendmail" value="on">'."\n".
+                '<input type="hidden" name="sendmail" value="on" />'."\n".
                 '<table>');
     unless (($broadcast eq 'group') || ($broadcast eq 'upload')) {
-        my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');
-        my $selectlink=&Apache::loncommon::selectstudent_link
+	if ($replying) {
+	    $r->print('<tr><td colspan="2">'.&mt('Replying to').' '.
+		      &Apache::loncommon::aboutmewrapper(
+							 &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('.
+		      $content{'sendername'}.'@'.
+		      $content{'senderdomain'}.')'.
+		      '<input type="hidden" name="recuname" value="'.$content{'sendername'}.'" />'.
+		      '<input type="hidden" name="recdomain" value="'.$content{'senderdomain'}.'" />'.
+		      '</td></tr>');
+	} else {
+	    my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');
+	    my $selectlink=&Apache::loncommon::selectstudent_link
 	    ('compemail','recuname','recdomain');
-       $r->print(<<"ENDREC");
-<table>
+	    $r->print(<<"ENDREC");
 <tr><td>$lt{'us'}:</td><td><input type="text" size="12" name="recuname" value="$ENV{'form.recname'}"></td><td rowspan="2">$selectlink</td></tr>
 <tr><td>$lt{'do'}:</td>
 <td>$domform</td></tr>
 ENDREC
+        }
     }
     my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
     if ($broadcast ne 'upload') {
        $r->print(<<"ENDCOMP");
 <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{'sb'}:</td><td><input type="text" size="50" name="subject" value="$dissub">
+<input type="text" size="50" name="additionalrec" /></td></tr>
+<tr><td>$lt{'sb'}:</td><td><input type="text" size="50" name="subject" value="$dissub" />
 </td></tr></table>
 $latexHelp
-<textarea name="message" cols="80" rows="10" wrap="hard">$dismsg
+<textarea name="message" cols="80" rows="15" wrap="hard">$dismsg
 </textarea></p><br />
 $dispcrit
 <input type="submit" name="send" value="$func $lt{'ma'}" />
@@ -864,13 +875,14 @@ $dispcrit
 ENDCOMP
     } else { # $broadcast is 'upload'
 	$r->print(<<ENDUPLOAD);
-<input type=hidden name=sendmode value=upload>
+<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>
+Subject: <input type="text" size="50" name="subject" />
 </p>
 <p>General message text<br />
-<textarea name=message cols=60 rows=10 wrap=hard>$dismsg
+<textarea name="message" cols="60" rows="10" wrap="hard">$dismsg
 </textarea></p>
 <p>
 The file format for the uploaded portion of the message is:
@@ -884,9 +896,9 @@ username3\@domain1: text
 The messages will be assembled from all lines with the respective 
 <tt>username\@domain</tt>, and appended to the general message text.</p>
 <p>
-<input type=file name=upfile size=20><p>
+<input type="file" name="upfile" size="40" /></p><p>
 $dispcrit
-<input type=submit value="Upload and send">
+<input type="submit" value="Upload and Send" /></p>
 ENDUPLOAD
     }
     if ($broadcast eq 'group') {
@@ -918,7 +930,7 @@ sub disfacetoface {
             $result.='<h3>'.&mt('Sent Message').'</h3>';
             %content=&unpackagemsg($content{'message'});
             $content{'message'}=
-                '<b>Subject: '.$content{'subject'}.'</b><br />'.
+                '<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br />'.
 		$content{'message'};
         }
         $result.=&mt('By').': <b>'.
@@ -926,13 +938,13 @@ sub disfacetoface {
  &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
 $content{'sendername'}.'@'.
             $content{'senderdomain'}.') '.$content{'time'}.
-            '<br><blockquote>'.
+            '<br /><blockquote>'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).
 	      '</blockquote>';
      }
     # Check to see if there were any messages.
     if ($result eq '') {
-        $r->print("<p><b>No notes, face-to-face discussion records, or critical messages in this course.</b></p>");
+        $r->print("<p><b>".&mt("No notes, face-to-face discussion records, or critical messages in this course.")."</b></p>");
     } else {
        $r->print($result);
     }
@@ -945,7 +957,11 @@ sub facetoface {
     unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
 	return;
     }
+    &printheader($r,
+		 '/adm/email?recordftf=query',
+		 "User Notes, Face-to-Face, Critical Messages");
 # from query string
+
     if ($ENV{'form.recname'}) { $ENV{'form.recuname'}=$ENV{'form.recname'}; }
     if ($ENV{'form.recdom'}) { $ENV{'form.recdomain'}=$ENV{'form.recdom'}; }
 
@@ -956,17 +972,23 @@ sub facetoface {
     my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');
     my $stdbrws = &Apache::loncommon::selectstudent_link
 	('stdselect','recuname','recdomain');
+    my %lt=&Apache::lonlocal::texthash('user' => 'Username',
+				       'dom' => 'Domain',
+				       'head' => 'User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course',
+				       'subm' => 'Retrieve discussion and message records',
+				       'newr' => 'New Record (record is visible to course faculty and staff)',
+				       'post' => 'Post this Record');
     $r->print(<<"ENDTREC");
-<h3>User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course</h3>
+<h3>$lt{'head'}</h3>
 <form method="post" action="/adm/email" name="stdselect">
 <input type="hidden" name="recordftf" value="retrieve" />
 <table>
-<tr><td>Username:</td><td><input type=text size=12 name=recuname value="$ENV{'form.recuname'}"></td>
+<tr><td>$lt{'user'}:</td><td><input type="text" size="12" name="recuname" value="$ENV{'form.recuname'}" /></td>
 <td rowspan="2">
 $stdbrws
-<input type="submit" value="Retrieve discussion and message records"></td>
+<input type="submit" value="$lt{'subm'}" /></td>
 </tr>
-<tr><td>Domain:</td>
+<tr><td>$lt{'dom'}:</td>
 <td>$domform</td></tr>
 </table>
 </form>
@@ -978,7 +1000,8 @@ ENDTREC
            &user_normal_msg_raw(
             $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
             $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-            'Record ['.$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}.']',
+            &mt('Record').
+	     ' ['.$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}.']',
 	    $ENV{'form.newrecord'});
         }
         $r->print('<h3>'.&Apache::loncommon::plainname($ENV{'form.recuname'},
@@ -990,28 +1013,114 @@ ENDTREC
 <input name="recuname" value="$ENV{'form.recuname'}" type="hidden" />
 ENDRHEAD
         $r->print(<<ENDBFORM);
-<hr />New Record (record is visible to course faculty and staff)<br />
+<hr />$lt{'newr'}<br />
 <textarea name="newrecord" cols="80" rows="10" wrap="hard"></textarea>
 <br />
 <input type="hidden" name="recordftf" value="post" />
-<input type="submit" value="Post this record" />
+<input type="submit" value="$lt{'post'}" />
 </form>
 ENDBFORM
     }
 }
 
+# ----------------------------------------------------------- Display a message
+
+sub displaymessage {
+    my ($r,$msgid)=@_;
+    &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
+# start output
+    &printheader($r,'/adm/email?display='.&Apache::lonnet::escape($msgid),'Display a Message','',$content{'baseurl'});
+    my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'});
+# Functions
+    $r->print('<table border="2" width="100%"><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>');
+    $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><pre>'.
+	      &Apache::lontexconvert::msgtexconverted($content{'message'},1).
+	      '</pre><hr />'.$content{'citation'}.'</p>');
+    return;   
+}
+
+# ================================================================== The Header
+
+sub header {
+    my ($r,$title,$baseurl)=@_;
+    $r->print('<html><head><title>Communication and Messages</title>');
+    if ($baseurl) {
+	$r->print("<base href=\"http://$ENV{'SERVER_NAME'}/$baseurl\" />");
+    }
+    $r->print(&Apache::loncommon::studentbrowser_javascript().'</head>'.
+	      &Apache::loncommon::bodytag('Communication and Messages'));
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs
+                  (undef,($title?$title:'Communication and Messages')));
+
+}
+
+# ---------------------------------------------------------------- Print header
+
+sub printheader {
+    my ($r,$url,$desc,$title,$baseurl)=@_;
+    &Apache::lonhtmlcommon::add_breadcrumb
+	({href=>$url,
+	  text=>$desc});
+    &header($r,$title,$baseurl);
+}
+
+
 # ===================================================================== Handler
 
 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',
@@ -1019,217 +1128,150 @@ 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});
+
+# ----------------------------------------------------------------- Breadcrumbs
+
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    &Apache::lonhtmlcommon::add_breadcrumb
+        ({href=>"/adm/communicate",
+          text=>"Communication/Messages",
+          faq=>12,bug=>'Communication Tools',});
+
 # --------------------------------------------------------------- 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').
-	     &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
-# 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').
-	     &Apache::loncommon::help_open_faq(12).
-	     &Apache::loncommon::help_open_bug('Communication Tools'));
-      $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;
 
+    if ($ENV{'form.display'}) {
+	&displaymessage($r,$ENV{'form.display'});
+    } elsif ($ENV{'form.replyto'}) {
+	&compout($r,'',$ENV{'form.replyto'});
+    } elsif ($ENV{'form.confirm'}) {
+	&printheader($r,'','Confirmed Receipt');
+	foreach (keys %ENV) {
+	    if ($_=~/^form\.rec\_(.*)$/) {
+		$r->print('<b>'.&mt('Confirming Receipt').':</b> '.
+			  &user_crit_received($1).'<br>');
+	    }
+	    if ($_=~/^form\.reprec\_(.*)$/) {
+		my $msgid=$1;
+		$r->print('<b>'.&mt('Confirming Receipt').':</b> '.
+			  &user_crit_received($msgid).'<br>');
+		&compout($r,'','','',$msgid);
+	    }
+	}
+	&discrit($r);
+    } elsif ($ENV{'form.critical'}) {
+	&printheader($r,'','Displaying Critical Messages');
+	&discrit($r);
+    } elsif ($ENV{'form.forward'}) {
+	&compout($r,$ENV{'form.forward'});
+    } elsif ($ENV{'form.markdel'}) {
+	&printheader($r,'','Deleted Message');
+	&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++;
+	    }
+	}
+	&printheader($r,'','Deleted Messages');
+	$r->print('Deleted '.$total.' message(s)<p>');
+	&disall($r);
+    } elsif ($ENV{'form.markunread'}) {
+	&printheader($r,'','Marked Message as Unread');
+	&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'}) {
+	    &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'};
+	    }
+	    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'});
+		}
+		$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')
+		      );
+	}
+    } else {
+	&printheader($r,'','Display All Messages');
+	&disall($r);
+    }
+    $r->print('</body></html>');
+    return OK;
 }
 # ================================================= Main program, reset counter