--- loncom/interface/lonmsg.pm	2005/01/31 11:27:14	1.132
+++ loncom/interface/lonmsg.pm	2005/02/17 04:39:58	1.137
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.132 2005/01/31 11:27:14 www Exp $
+# $Id: lonmsg.pm,v 1.137 2005/02/17 04:39:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -414,7 +414,7 @@ sub user_crit_msg_raw {
 =cut
 
 sub user_crit_msg {
-    my ($user,$domain,$subject,$message,$sendback)=@_;
+    my ($user,$domain,$subject,$message,$sendback,$toperm)=@_;
     my $status='';
     my %userenv = &Apache::lonnet::get('environment',['msgforward'],
                                        $domain,$user);
@@ -424,10 +424,10 @@ sub user_crit_msg {
 	 my ($forwuser,$forwdomain)=split(/\:/,$_);
          $status.=
 	   &user_crit_msg_raw($forwuser,$forwdomain,$subject,$message,
-                $sendback).' ';
+                $sendback,$toperm).' ';
        }
     } else { 
-	$status=&user_crit_msg_raw($user,$domain,$subject,$message,$sendback);
+	$status=&user_crit_msg_raw($user,$domain,$subject,$message,$sendback,$toperm);
     }
     return $status;
 }
@@ -675,7 +675,7 @@ 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="text" size="5" name="chksec" />&nbsp;
 <input type="button" onClick="uncheckall()" value="$lt{'cfn'}" />
 <p>
 ENDDISHEADER
@@ -693,7 +693,15 @@ ENDDISHEADER
         }
     }
     $r->print('</table><table>');
-    while (my ($student,$info) = each(%$classlist)) {
+    my $sort = sub {
+	my $aname=lc($classlist->{$a}[&Apache::loncoursedata::CL_FULLNAME()]);
+	if (!$aname) { $aname=$a; }
+	my $bname=lc($classlist->{$b}[&Apache::loncoursedata::CL_FULLNAME()]);
+	if (!$bname) { $bname=$b; }
+	return $aname cmp $bname;
+    };
+    foreach my $student (sort $sort (keys(%{$classlist}))) {
+	my $info=$classlist->{$student};
         my ($sname,$sdom,$status,$fullname,$section) =
             (@{$info}[&Apache::loncoursedata::CL_SNAME(),
                       &Apache::loncoursedata::CL_SDOM(),
@@ -704,8 +712,8 @@ ENDDISHEADER
         my $key = 'send_to_&&&'.$section.'&&&_'.$student;
         if (! defined($fullname) || $fullname eq '') { $fullname = $sname; }
         $r->print('<tr><td><label>'.
-                  qq{<input type="checkbox" name="$key">}.('&nbsp;'x2).
-                  $fullname.'</td><td>'.$sname.'@'.$sdom.'</td><td>'.$section.
+                  qq{<input type="checkbox" name="$key" />}.('&nbsp;'x2).
+                  $fullname.'</label></td><td>'.$sname.'@'.$sdom.'</td><td>'.$section.
                   '</td></tr>');
     }
     $r->print('</table>');
@@ -716,8 +724,8 @@ ENDDISHEADER
 sub discrit {
     my $r=shift;
     my $header = '<h1><font color=red>'.&mt('Critical Messages').'</font></h1>'.
-        '<form action=/adm/email method=post>'.
-        '<input type=hidden name=confirm value=true>';
+        '<form action="/adm/email" method="POST">'.
+        '<input type="hidden" name="confirm" value="true" />';
     my %what=&Apache::lonnet::dump('critical');
     my $result = '';
     foreach (sort keys %what) {
@@ -734,9 +742,9 @@ $content{'sendername'}.'@'.
             '</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_'.$_.'" value="'.&mt('Confirm Receipt').'">'.
-            '<input type=submit name="reprec_'.$_.'" '.
-                  'value="'.&mt('Confirm Receipt and Reply').'">';
+            '<input type="submit" name="rec_'.$_.'" value="'.&mt('Confirm Receipt').'" />'.
+            '<input type="submit" name="reprec_'.$_.'" '.
+                  'value="'.&mt('Confirm Receipt and Reply').'" />';
     }
     # Check to see if there were any messages.
     if ($result eq '') {
@@ -979,9 +987,9 @@ ENDDISHEADER
     }
     $r->print('</th><th>');
     if ($ENV{'form.sortedby'} eq "revstatus") {
-	$r->print('<a href = "?sortedby=status'.$fsqs.'">'.&mt('Status').'</th>');
+	$r->print('<a href = "?sortedby=status'.$fsqs.'">'.&mt('Status').'</a></th>');
     } else {
-     	$r->print('<a href = "?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</th>');
+     	$r->print('<a href = "?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</a></th>');
     }
     $r->print("</tr>\n");
     for (my $n=$firstdis;$n<=$lastdis;$n++) {
@@ -996,10 +1004,10 @@ ENDDISHEADER
 	    } else {
 		$r->print('<tr bgcolor="#99BBBB">');
 	    }
-	    $r->print('<td></a><input type=checkbox name="delmark_'.$origID.'" /></td><td><a href="/adm/email?display='.$origID.$sqs. 
+	    $r->print('<td><input type="checkbox" name="delmark_'.$origID.'" /></td><td><a href="/adm/email?display='.$origID.$sqs. 
 		      '">'.&mt('Open').'</a></td><td>'.
 		      ($folder ne 'trash'?'<a href="/adm/email?markdel='.$origID.$sqs.
-		      '">'.&mt('Delete'):'&nbsp').'</td>'.
+		      '">'.&mt('Delete'):'&nbsp').'</a></td>'.
 		      '<td>'.&Apache::lonlocal::locallocaltime($sendtime).'</td><td>'.
 		      $fromname.'</td><td>'.$fromdomain.'</td><td>'.
 		      &Apache::lonnet::unescape($shortsubj).'</td><td>'.
@@ -1082,10 +1090,12 @@ 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 . 
- '<br>'.
- '<input type="checkbox" name="sendbck" /> '.&mt('Send as critical message').'  ' .
- &mt('and return receipt') . $crithelp . '<p>';
+ '<p><label><input type="checkbox" name="critmsg" /> '.&mt('Send as critical message').'</label> ' . $crithelp . 
+ '</p><p>'.
+ '<label><input type="checkbox" name="sendbck" /> '.&mt('Send as critical message').'  ' .
+ &mt('and return receipt') . '</label>' . $crithelp . 
+ '</p><p><label><input type="checkbox" name="permanent" /> '.
+&mt('Send copy to permanent email address (if known)').'</label></p>';
      }
     my %message;
     my %content;
@@ -1119,8 +1129,8 @@ sub compout {
 	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='.
+		$disbase.='<label><input type="checkbox" name="storebasecomment" />'.&mt('Store message for re-use').
+		    '</label> <a href="/adm/email?showcommentbaseurl='.
 		    &Apache::lonnet::escape($content{'baseurl'}).'" target="comments">'.
 		    &mt('Show re-usable messages').'</a><br />';
 	    }
@@ -1148,7 +1158,7 @@ sub compout {
 	    my $selectlink=&Apache::loncommon::selectstudent_link
 	    ('compemail','recuname','recdomain');
 	    $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{'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
@@ -1549,8 +1559,8 @@ END
        <tr bgcolor="$bgcols[$iter]">
         <td>$$ltext{'star'}:&nbsp;$startform<br/>$$ltext{'endd'}:&nbsp;&nbsp;$endform</td>
         <td>$settername</td>
-        <td><input type="text" name="title_$parmcount" size="15" value="$title"/><input type="hidden" name="key_$parmcount" value="$_"></td>
-        <td>$lt{'modi'}?&nbsp;<input type="checkbox" name="modify_$parmcount"/><br />$lt{'canc'}?&nbsp;&nbsp;<input type="checkbox" name="cancel_$parmcount"/>
+        <td><input type="text" name="title_$parmcount" size="15" value="$title" /><input type="hidden" name="key_$parmcount" value="$_" /></td>
+        <td><label>$lt{'modi'}?&nbsp;<input type="checkbox" name="modify_$parmcount" /></label><br /><label>$lt{'canc'}?&nbsp;&nbsp;<input type="checkbox" name="cancel_$parmcount" /></label>
        </tr>
 END
         $parmcount ++;
@@ -1602,8 +1612,8 @@ sub display_addblocker_table {
        </tr>
        <tr bgcolor="#eeeeee">
         <td>$$ltext{'star'}:&nbsp;$startform<br />$$ltext{'endd'}:&nbsp;&nbsp;$endform</td>
-        <td><input type="text" name="title_$parmcount" size="15" value=""/></td>
-        <td>$lt{'addb'}?&nbsp;<input type="checkbox" name="add_$parmcount" value="1"/></td>
+        <td><input type="text" name="title_$parmcount" size="15" value="" /></td>
+        <td><label>$lt{'addb'}?&nbsp;<input type="checkbox" name="add_$parmcount" value="1" /></label></td>
        </tr>
       </table>
      </td>
@@ -1837,7 +1847,9 @@ sub displayresource {
 
 sub header {
     my ($r,$title,$baseurl)=@_;
-    $r->print('<html><head><title>Communication and Messages</title>');
+    $r->print(&Apache::lonxml::xmlbegin().
+	      '<head>'.&Apache::lonxml::fontsettings().
+	      '<title>Communication and Messages</title>');
     if ($baseurl) {
 	$r->print("<base href=\"http://$ENV{'SERVER_NAME'}/$baseurl\" />");
     }
@@ -1877,7 +1889,8 @@ 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>');
+    $r->print(&Apache::lonxml::xmlbegin().'<head>'.
+	      &Apache::lonxml::fontsettings().'</head><body>');
     if ((keys %msgs)[0]=~/^error\:/) {
 	$r->print(&mt('No stored comments yet.'));
     } else {
@@ -1960,13 +1973,13 @@ sub sendoffmail {
 		$thismsg=&user_crit_msg($recuname,$recdomain,
 					&Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
 					$msgtxt,
-					$ENV{'form.sendbck'});
+					$ENV{'form.sendbck'},$ENV{'form.permanent'});
 	    } else {
 		$r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': ');
 		$thismsg=&user_normal_msg($recuname,$recdomain,
 					  &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
 					  $msgtxt,
-					  $content{'citation'});
+					  $content{'citation'},undef,undef,$ENV{'form.permanent'});
 		if (($ENV{'request.course.id'}) && ($ENV{'form.sendmode'} eq 'group')) {
 		    &user_normal_msg_raw(
 					 $ENV{'course.'.$ENV{'request.course.id'}.'.num'},