--- loncom/interface/lonmsg.pm	2004/03/01 02:21:57	1.88
+++ loncom/interface/lonmsg.pm	2004/03/01 20:57:47	1.91
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.88 2004/03/01 02:21:57 www Exp $
+# $Id: lonmsg.pm,v 1.91 2004/03/01 20:57:47 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -802,7 +802,9 @@ ENDDISHEADER
 
 sub compout {
     my ($r,$forwarding,$broadcast)=@_;
-      my $dispcrit='';
+    &printheader($r,'/adm/email?compose=upload',
+	     'Distribute from uploaded file');
+    my $dispcrit='';
     my $dissub='';
     my $dismsg='';
     my $func=&mt('Send New');
@@ -855,8 +857,8 @@ ENDREC
        $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
@@ -867,14 +869,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:
@@ -888,9 +890,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') {
@@ -949,11 +951,9 @@ sub facetoface {
     unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
 	return;
     }
-    &Apache::lonhtmlcommon::add_breadcrumb
-	({href=>'/adm/dropadd?recordftf=query',
-	  text=>"User Notes, Face-to-Face, Critical Messages",
-	 faq=>12,bug=>'Communication Tools'});
-    &header($r);
+    &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'}; }
@@ -1017,10 +1017,78 @@ ENDBFORM
     }
 }
 
+# ----------------------------------------------- Generate the text input field
+
+sub textinputarea {
+    my ($r,$name,$quote)=@_;
+    $r->print('<textarea name="'.$name.
+	      '" cols="80" rows="12" wrap="hard">'.$quote.'</textarea>');
+}
+
+# ----------------------------------------------------------- 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='.$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,$baseurl)=@_;
+    my ($r,$title,$baseurl)=@_;
     $r->print('<html><head><title>Communication and Messages</title>');
     if ($baseurl) {
 	$r->print("<base href=\"http://$ENV{'SERVER_NAME'}/$baseurl\" />");
@@ -1028,10 +1096,21 @@ sub header {
     $r->print(&Apache::loncommon::studentbrowser_javascript().'</head>'.
 	      &Apache::loncommon::bodytag('Communication and Messages'));
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                  (undef,'Communication and Messages'));
+                  (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 {
@@ -1064,64 +1143,7 @@ sub handler {
 # --------------------------------------------------------------- Render Output
 
     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>');
-	$r->print(&Apache::loncommon::studentbrowser_javascript().
-		  '</head>'.
-		  &Apache::loncommon::bodytag('EMail and Messages').
-		  &Apache::loncommon::help_open_faq(12).
-		  &Apache::loncommon::help_open_bug('Communication Tools'));
-	my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'});
-	
-	$r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}.
-		  '<br /><b>'.&mt('From').':</b> '.
-		  &Apache::loncommon::aboutmewrapper(
-						     &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
-						     $content{'sendername'},$content{'senderdomain'}).' ('.
-		  $content{'sendername'}.' at '.
-		  $content{'senderdomain'}.') '.
-		  ($content{'courseid'}?'<br /><b>'.&mt('Course').':</b> '.$courseinfo{'description'}.
-		   ($content{'coursesec'}?' ('.&mt('Group/Section').': '.$content{'coursesec'}.')':''):'').
-		  '<br /><b>'.&mt('Time').':</b> '.$content{'time'}.'<p>'.
-		  '<table border=2><tr bgcolor="#FFFFAA"><td>'.&mt('Functions').':</td>'.
-		  '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).$sqs.
-		  '"><b>'.&mt('Reply').'</b></a></td>'.
-		  '<td><a href="/adm/email?forward='.&Apache::lonnet::escape($msgid).$sqs.
-		  '"><b>'.&mt('Forward').'</b></a></td>'.
-		  '<td><a href="/adm/email?markunread='.&Apache::lonnet::escape($msgid).$sqs.
-		  '"><b>'.&mt('Mark Unread').'</b></a></td>'.
-		  '<td><a href="/adm/email?markdel='.&Apache::lonnet::escape($msgid).$sqs.
-		  '"><b>Delete</b></a></td>'.
-		  '<td><a href="/adm/email?sortedby='.$ENV{'form.sortedby'}.
-		  '"><b>'.&mt('Display all Messages').'</b></a></td>');
-	if ($counter > 0){
-	    $r->print('<td><a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.
-		      '"><b>'.&mt('Previous').'</b></a></td>');
-	}
-	if ($counter < $number_of_messages - 1){
-	    $r->print('<td><a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.
-		      '"><b>'.&mt('Next').'</b></a></td>');
-	}
-	$r->print('</tr></table><p><pre>'.
-		  &Apache::lontexconvert::msgtexconverted($content{'message'},1).
-		  '</pre><hr>'.$content{'citation'});
+	&displaymessage($r,$ENV{'form.display'});
     } elsif ($ENV{'form.replyto'}) {
 	&comprep($r,$ENV{'form.replyto'});
     } elsif ($ENV{'form.sendreply'}) {