--- loncom/interface/lonmsgdisplay.pm	2006/04/23 05:34:45	1.9
+++ loncom/interface/lonmsgdisplay.pm	2006/04/25 23:12:34	1.16
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.9 2006/04/23 05:34:45 albertel Exp $
+# $Id: lonmsgdisplay.pm,v 1.16 2006/04/25 23:12:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -338,7 +338,7 @@ ENDDISHEADER
         if (! defined($fullname) || $fullname eq '') { $fullname = $sname; }
         $r->print('<tr><td><label>'.
                   qq{<input type="checkbox" name="$key" />}.('&nbsp;'x2).
-                  $fullname.'</label></td><td>'.$sname.'@'.$sdom.'</td><td>'.$section.
+                  $fullname.'</label></td><td>'.$sname.':'.$sdom.'</td><td>'.$section.
                   '</td></tr>');
     }
     $r->print('</table>');
@@ -359,7 +359,7 @@ sub discrit {
         $result.='<hr />'.&mt('From').': <b>'.
 &Apache::loncommon::aboutmewrapper(
  &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
-$content{'sendername'}.'@'.
+$content{'sendername'}.':'.
             $content{'senderdomain'}.') '.$content{'time'}.
             '<br />'.&mt('Subject').': '.$content{'subject'}.
             '<br /><pre>'.
@@ -392,18 +392,30 @@ sub sortedmessages {
     my %descriptions;
     my %status_cache = 
 	&Apache::lonnet::get('email_status'.&Apache::lonmsg::foldersuffix($folder),\@messages);
-    foreach (@messages) {
-	my $msgid=&Apache::lonnet::escape($_);
+
+    my $get_received;
+    if ($folder eq 'sent' 
+	&& ($env{'form.sortedby'} =~ m/^(rev)?(user|domain)$/)) {
+	$get_received = 1;
+    }
+
+    foreach my $msgid (@messages) {
+	my $esc_msgid=&Apache::lonnet::escape($msgid);
 	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid)=
-	    &Apache::lonmsg::unpackmsgid($msgid,$folder,undef,
+	    &Apache::lonmsg::unpackmsgid($esc_msgid,$folder,undef,
 					 \%status_cache);
         my $description = &get_course_desc($fromcid,\%descriptions);
 	my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status,
-		     $msgid,$description);
+		     $esc_msgid,$description);
+	if ($get_received) {
+	    my %message = &Apache::lonnet::get('nohist_email'.$suffix,
+					       [$msgid]);
+	    my %content = &Apache::lonmsg::unpackagemsg($message{$msgid});
+	    push(@temp1,$content{'recuser'},$content{'recdomain'});
+	}
         # Check whether message was sent during blocking period.
         if ($sendtime >= $startblock && ($sendtime <= $endblock && $endblock > 0) ) {
-            my $escid = &Apache::lonnet::unescape($msgid);
-            $$blocked{$escid} = 'ON';
+            $$blocked{$msgid} = 'ON';
             $$numblocked ++;
         } else { 
             push @temp ,\@temp1;
@@ -418,16 +430,32 @@ sub sortedmessages {
     	@temp = sort  {$b->[0] <=> $a->[0]} @temp; 
     }
     if ($env{'form.sortedby'} eq "user"){
-	@temp = sort  {lc($a->[2]) cmp lc($b->[2])} @temp;
+	if ($get_received) {
+	    @temp = sort  {lc($a->[7][0]) cmp lc($b->[7][0])} @temp;
+	} else {
+	    @temp = sort  {lc($a->[2])    cmp lc($b->[2])}    @temp;
+	}
     }
     if ($env{'form.sortedby'} eq "revuser"){
-	@temp = sort  {lc($b->[2]) cmp lc($a->[2])} @temp;
+	if ($get_received) {
+	    @temp = sort  {lc($b->[7][0]) cmp lc($a->[7][0])} @temp;
+	} else {
+	    @temp = sort  {lc($b->[2])    cmp lc($a->[2])}    @temp;
+	}
     }
     if ($env{'form.sortedby'} eq "domain"){
-        @temp = sort  {$a->[3] cmp $b->[3]} @temp;
+	if ($get_received) {
+	    @temp = sort  {$a->[8][0] cmp $b->[8][0]} @temp;
+	} else {
+	    @temp = sort  {$a->[3]    cmp $b->[3]}    @temp;
+	}
     }
     if ($env{'form.sortedby'} eq "revdomain"){
-        @temp = sort  {$b->[3] cmp $a->[3]} @temp;
+	if ($get_received) {
+	    @temp = sort  {$b->[8][0] cmp $a->[8][0]} @temp;
+	} else {
+	    @temp = sort  {$b->[3]    cmp $a->[3]}    @temp;
+	}
     }
     if ($env{'form.sortedby'} eq "subject"){
         @temp = sort  {lc($a->[1]) cmp lc($b->[1])} @temp;
@@ -584,7 +612,7 @@ sub disfolder {
     my $numblocked = 0;
     &blockcheck(\%setters,\$startblock,\$endblock);
     $r->print(<<ENDDISHEADER);
-<script>
+<script type="text/javascript">
     function checkall() {
 	for (i=0; i<document.forms.disall.elements.length; i++) {
             if 
@@ -662,7 +690,9 @@ ENDDISHEADER
 
     my $suffix = &Apache::lonmsg::foldersuffix($folder);
     for (my $n=$firstdis;$n<=$lastdis;$n++) {
-	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID,$description)= @{$temp[$n]};
+	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID,
+	    $description,$recv_name,$recv_domain)= 
+		@{$temp[$n]};
 	if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
 	    if ($status eq 'new') {
 		$r->print('<tr class="LC_mail_new">');
@@ -675,12 +705,17 @@ ENDDISHEADER
 	    }
 	    my ($dis_name,$dis_domain) = ($fromname,$fromdomain);
 	    if ($folder eq 'sent') {
-		my $msg_id = &Apache::lonnet::unescape($origID);
-		my %message=&Apache::lonnet::get('nohist_email'.$suffix,
-						 [$msg_id]);
-		my %content=&Apache::lonmsg::unpackagemsg($message{$msg_id});
-		$dis_name   = join('<br />',@{$content{'recuser'}});
-		$dis_domain = join('<br />',@{$content{'recdomain'}});
+		if (defined($recv_name) && !defined($recv_domain)) {
+		    $dis_name   = join('<br />',@{$recv_name});
+		    $dis_domain = join('<br />',@{$recv_domain});
+		} else {
+		    my $msg_id  = &Apache::lonnet::unescape($origID);
+		    my %message = &Apache::lonnet::get('nohist_email'.$suffix,
+						       [$msg_id]);
+		    my %content = &Apache::lonmsg::unpackagemsg($message{$msg_id});
+		    $dis_name   = join('<br />',@{$content{'recuser'}});
+		    $dis_domain = join('<br />',@{$content{'recdomain'}});
+		}
 	    }
 	    $r->print('<td><input type="checkbox" name="delmark_'.$origID.'" /></td><td><a href="/adm/email?display='.$origID.$sqs. 
 		      '">'.&mt('Open').'</a></td><td>'.
@@ -832,7 +867,7 @@ sub compout {
 	    $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{'sendername'}.':'.
 		      $content{'senderdomain'}.')'.
 		      '<input type="hidden" name="recuname" value="'.$content{'sendername'}.'" />'.
 		      '<input type="hidden" name="recdomain" value="'.$content{'senderdomain'}.'" />'.
@@ -925,7 +960,7 @@ sub retrieve_instructor_comments {
         next if ($content{'subject'} !~ /^Record/);
 	# &Apache::lonfeedback::newline_to_br(\$content{'message'});
 	$result.='Recorded by '.
-            $content{'sendername'}.'@'.$content{'senderdomain'}."\n";
+            $content{'sendername'}.':'.$content{'senderdomain'}."\n";
         $result.=
             &Apache::lontexconvert::msgtexconverted($content{'message'})."\n";
      }
@@ -983,7 +1018,7 @@ sub disfacetoface {
         $result.=&mt('By').': <b>'.
 &Apache::loncommon::aboutmewrapper(
  &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
-$content{'sendername'}.'@'.
+$content{'sendername'}.':'.
             $content{'senderdomain'}.') '.$content{'time'}.
             '<br /><pre>'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).
@@ -1197,7 +1232,7 @@ sub blockstore {
         unless ( defined($cancels{$_}) ) {
             my ($newstart,$newend) = &get_dates_from_form($_);
             my $newkey = $newstart.'____'.$newend;
-            $blocking{$newkey} = $env{'user.name'}.'@'.$env{'user.domain'}.':'.$env{'form.title_'.$_};
+            $blocking{$newkey} = $env{'user.name'}.':'.$env{'user.domain'}.':'.$env{'form.title_'.$_};
         }
     }
     if ($addtotal + $modtotal > 0) {
@@ -1240,41 +1275,30 @@ sub get_blockdates {
                          $env{'course.'.$env{'request.course.id'}.'.domain'},
                          $env{'course.'.$env{'request.course.id'}.'.num'}
                          );
-    $$blockcount = keys %{$records};
-                                                                                                             
-    foreach (keys %{$records}) {
-        if ($_ eq 'error: 2 tie(GDBM) Failed while attempting dump') {
-            $$blockcount = 0;
-            last;
-        }
+    $$blockcount = keys(%{$records});
+
+    if ((keys(%{$records}))[0] =~ /^error: 2 /) {
+	$records = {};
+	$$blockcount = 0;
     }
 }
 
 sub display_blocker_status {
     my ($r,$records,$ltext) = @_;
     my $parmcount = 0;
-    my @bgcols = ("#eeeeee","#dddddd");
-    my $function = &Apache::loncommon::get_users_function();
-    my $color = &Apache::loncommon::designparm($function.'.tabbg',
-                                                    $env{'user.domain'});
+  
     my %lt = &Apache::lonlocal::texthash(
         'modi' => 'Modify',
         'canc' => 'Cancel',
     );
     $r->print(<<"END");
-<table border="0" cellpadding="0" cellspacing="0">
- <tr>
-  <td width="100%" bgcolor="#000000">
-   <table width="100%" border="0" cellpadding="1" cellspacing="0">
-    <tr>
-     <td width="100%" bgcolor="#000000">
-      <table border="0" cellpadding="3" cellspacing="3" bgcolor="#FFFFFF">
-       <tr bgcolor="$color">
-        <td><b>$$ltext{'dura'}</b></td>
-        <td><b>$$ltext{'setb'}</b></td>
-        <td><b>$$ltext{'even'}</b></td>
-        <td><b>$$ltext{'actn'}?</b></td>
-       </tr>
+<table class="LC_data_table">
+  <tr>
+    <th>$$ltext{'dura'}</th>
+    <th>$$ltext{'setb'}</th>
+    <th>$$ltext{'even'}</th>
+    <th>$$ltext{'actn'}?</th>
+  </tr>
 END
     foreach (sort keys %{$records}) {
         my $iter = $parmcount%2;
@@ -1284,11 +1308,11 @@ END
         my ($start,$end) = split/____/,$_;
         my $startform = &Apache::lonhtmlcommon::date_setter('blockform','startdate_'.$parmcount,$start,$onchange);
         my $endform = &Apache::lonhtmlcommon::date_setter('blockform','enddate_'.$parmcount,$end,$onchange);
-        my ($setter,$title) = split/:/,$$records{$_};
-        my ($setuname,$setudom) = split/@/,$setter;
+	
+	my ($setuname,$setudom,$title) = &parse_block_record($$records{$_});
         my $settername = &Apache::loncommon::plainname($setuname,$setudom);
         $r->print(<<"END");
-       <tr bgcolor="$bgcols[$iter]">
+       <tr>
         <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>
@@ -1298,12 +1322,6 @@ END
         $parmcount ++;
     }
     $r->print(<<"END");
-      </table>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
 </table>
 <br />
 <br />
@@ -1311,6 +1329,19 @@ END
     return $parmcount;
 }
 
+sub parse_block_record {
+    my ($record) = @_;
+    my ($setuname,$setudom,$title);
+    my @data = split(/:/,$record,3);
+    if (scalar(@data) eq 2) {
+	$title = $data[1];
+	($setuname,$setudom) = split(/@/,$data[0]);
+    } else {
+	($setuname,$setudom,$title) = @data;
+    }
+    return ($setuname,$setudom,$title);
+}
+
 sub display_addblocker_table {
     my ($r,$parmcount,$ltext) = @_;
     my $start = time;
@@ -1320,9 +1351,6 @@ sub display_addblocker_table {
                    'checked=true;"';
     my $startform = &Apache::lonhtmlcommon::date_setter('blockform','startdate_'.$parmcount,$start,$onchange);
     my $endform = &Apache::lonhtmlcommon::date_setter('blockform','enddate_'.$parmcount,$end,$onchange);
-    my $function = &Apache::loncommon::get_users_function();
-    my $color = &Apache::loncommon::designparm($function.'.tabbg',
-                                                    $env{'user.domain'});
     my %lt = &Apache::lonlocal::texthash(
         'addb' => 'Add block',
         'exam' => 'e.g., Exam 1',
@@ -1330,30 +1358,18 @@ sub display_addblocker_table {
     );
     $r->print(<<"END");
 <h4>$lt{'addn'}</h4> 
-<table border="0" cellpadding="0" cellspacing="0">
- <tr>
-  <td width="100%" bgcolor="#000000">
-   <table width="100%" border="0" cellpadding="1" cellspacing="0">
-    <tr>
-     <td width="100%" bgcolor="#000000">
-      <table border="0" cellpadding="3" cellspacing="3" bgcolor="#FFFFFF">
-       <tr bgcolor="#CCCCFF">
-        <td><b>$$ltext{'dura'}</b></td>
-        <td><b>$$ltext{'even'} $lt{'exam'}</b></td>
-        <td><b>$$ltext{'actn'}?</b></td>
-       </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><label>$lt{'addb'}?&nbsp;<input type="checkbox" name="add_$parmcount" value="1" /></label></td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
+ <table class="LC_data_table">
+   <tr>
+     <th>$$ltext{'dura'}</th>
+     <th>$$ltext{'even'} $lt{'exam'}</th>
+     <th>$$ltext{'actn'}?</th>
+   </tr>
+   <tr>
+     <td>$$ltext{'star'}:&nbsp;$startform<br />$$ltext{'endd'}:&nbsp;&nbsp;$endform</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>
 END
     return;
 }
@@ -1361,66 +1377,52 @@ END
 sub blockcheck {
     my ($setters,$startblock,$endblock) = @_;
     # Retrieve active student roles and active course coordinator/instructor roles
-    my @livecses = ();
-    my @staffcses = ();
-    $$startblock = 0;
-    $$endblock = 0;
-    foreach (keys %env) {
-        if ($_ =~ m-^user\.role\.(st|cc|in)\./(.+)$-) {
-            my $role = $1;
-            my $cse = $2;
-            $cse =~ s|/|_|;
-            if ($env{$_} =~ m/^(\d*)\.(\d*)$/) {
-                unless (($2 > 0 && $2 < time) || ($1 > time)) {
-                    if ($role eq 'st') {
-                        push @livecses, $cse;
-                    } else {
-                        unless (grep/^$cse$/,@staffcses) {
-                            push @staffcses, $cse;
-                        }
-                    }
-                }
-            }
-        } elsif ($_ =~ m-user\.role\.cr/(\w+)/(\w+)/([^/]+)\./(.+)$- ) { 
-            my $rolepriv = $env{'user.role..rolesdef_'.$3};
-        }
-    }
-    # Retrieve blocking times and identity of blocker for active courses for students.
-    if (@livecses > 0) {
-        foreach my $cse (@livecses) {
-            my ($cdom,$crs) = split/_/,$cse;
-            if ( (grep/^$cse$/,@staffcses) && ($env{'request.role'} !~ m-^st\./$cdom/$crs$-) ) {
-                next;
-            } else {
-                %{$$setters{$cse}} = ();
-                @{$$setters{$cse}{'staff'}} = ();
-                @{$$setters{$cse}{'times'}} = ();
-                my %records = &Apache::lonnet::dump('comm_block',$cdom,$crs);
-                foreach (keys %records) {
-                    if ($_ =~ m/^(\d+)____(\d+)$/) {
-                        if ($1 <= time && $2 >= time) {
-                            my ($staff,$title) = split/:/,$records{$_};
-                            push @{$$setters{$cse}{'staff'}}, $staff;
-                            push @{$$setters{$cse}{'times'}}, $_;
-                            if ( ($$startblock == 0) || ($$startblock > $1) ) {
-                                $$startblock = $1;
-                            }
-                            if ( ($$endblock == 0) || ($$endblock < $2) ) {
-                                $$endblock = $2;
-                            }
-                        }
-                    }
-                }
-            }
-        }
+    my %live_courses =
+	map { $_ => 1} &Apache::loncommon::findallcourses();
+    # FIXME should really probe for apriv, but ::allowed can only probe the 
+    #       currently active role
+    my %staff_of =
+	map { $_ => 1} &Apache::loncommon::findallcourses(['cc','in']);
+
+    # Retrieve blocking times and identity of blocker for active courses
+    # for students.
+    return if (!%live_courses);
+
+    &Apache::lonnet::logthis("hmm");
+    &Apache::lonnet::logthis(join(" ",%live_courses));
+    &Apache::lonnet::logthis(join(" ",%staff_of));
+
+    foreach my $course (keys(%live_courses)) {
+	my ($cdom,$cnum) = split(/_/,$course);
+
+	# if they are a staff member and are currently not playing student
+	next if ( $staff_of{$course} 
+		  && ($env{'request.role'} !~ m{^st\./$cdom/$cnum}));
+
+	$setters->{$course} = {};
+	$setters->{$course}{'staff'} = [];
+	$setters->{$course}{'times'} = [];
+	my %records = &Apache::lonnet::dump('comm_block',$cdom,$cnum);
+	foreach my $record (keys %records) {
+	    my ($start,$end) = ($record =~ m/^(\d+)____(\d+)$/);
+	    if ($start <= time && $end >= time) {
+		my ($staff_name,$staff_dom,$title) = 
+		    &parse_block_record($records{$record});
+		push(@{$$setters{$course}{'staff'}}, [$staff_name,$staff_dom]);
+		push(@{$$setters{$course}{'times'}}, [$start,$end]);
+		if ( ($$startblock == 0) || ($$startblock > $1) ) {
+		    $$startblock = $1;
+		}
+		if ( ($$endblock == 0) || ($$endblock < $2) ) {
+		    $$endblock = $2;
+		}
+	    }
+	}
     }
 }
 
 sub build_block_table {
     my ($r,$startblock,$endblock,$setters) = @_;
-    my $function = &Apache::loncommon::get_users_function();
-    my $color = &Apache::loncommon::designparm($function.'.tabbg',
-                                                    $env{'user.domain'});
     my %lt = &Apache::lonlocal::texthash(
         'cacb' => 'Currently active communication blocks',
         'cour' => 'Course',
@@ -1429,34 +1431,28 @@ sub build_block_table {
     ); 
     $r->print(<<"END");
 <br /<br />$lt{'cacb'}:<br /><br />
-<table border="0" cellpadding="0" cellspacing="0">
- <tr>
-  <td width="100%" bgcolor="#000000">
-   <table width="100%" border="0" cellpadding="1" cellspacing="0">
-    <tr>
-     <td width="100%" bgcolor="#000000">
-      <table border="0" cellpadding="3" cellspacing="3" bgcolor="#FFFFFF">
-       <tr bgcolor="$color">
-        <td><b>$lt{'cour'}</b></td>
-        <td><b>$lt{'dura'}</b></td>
-        <td><b>$lt{'blse'}</b></td>
-       </tr>
+<table class="LC_data_table">
+<tr>
+ <th>$lt{'cour'}</th>
+ <th>$lt{'dura'}</th>
+ <th>$lt{'blse'}</th>
+</tr>
 END
     foreach (keys %{$setters}) {
         my %courseinfo=&Apache::lonnet::coursedescription($_);
         for (my $i=0; $i<@{$$setters{$_}{staff}}; $i++) {
-            my ($uname,$udom) = split/\@/,$$setters{$_}{staff}[$i];
+            my ($uname,$udom) = @{$$setters{$_}{staff}[$i]};
             my $fullname = &Apache::loncommon::plainname($uname,$udom);
-            my ($openblock,$closeblock) = split/____/,$$setters{$_}{times}[$i];
+            my ($openblock,$closeblock) = @{$$setters{$_}{times}[$i]};
             $openblock = &Apache::lonlocal::locallocaltime($openblock);
             $closeblock= &Apache::lonlocal::locallocaltime($closeblock);
             $r->print('<tr><td>'.$courseinfo{'description'}.'</td>'.
                       '<td>'.$openblock.' to '.$closeblock.'</td>'.
-                      '<td>'.$fullname.' ('.$uname.'@'.$udom.
+                      '<td>'.$fullname.' ('.$uname.':'.$udom.
                       ')</td></tr>');
         }
     }
-    $r->print('</table></td></tr></table></td></tr></table>');
+    $r->print('</table>');
 }
 
 # ----------------------------------------------------------- Display a message
@@ -1684,17 +1680,17 @@ sub sendoffmail {
 	    %content=&Apache::lonmsg::unpackagemsg($message{$msgid},1);
 	    &statuschange($msgid,'replied',$folder);
 	}
-	my %toaddr=();
-	undef %toaddr;
+
+	my %toaddr;
 	if ($env{'form.sendmode'} eq 'group') {
-	    foreach (keys %env) {
-		if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
+	    foreach my $address (keys(%env)) {
+		if ($address=~/^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*/,$_);
+	    foreach my $line (split(/[\n\r\f]+/,$env{'form.upfile'})) {
+		my ($rec,$txt)=split(/\s*\:\s*/,$line);
 		if ($txt) {
 		    $rec=~s/\@/\:/;
 		    $toaddr{$rec}.=$txt."\n";
@@ -1726,33 +1722,43 @@ sub sendoffmail {
             $savemsg=&Apache::lonfeedback::clear_out_html($env{'form.message'});
         }
 	
-	foreach (keys %toaddr) {
-	    my ($recuname,$recdomain)=split(/\:/,$_);
+	foreach my $address (sort(keys(%toaddr))) {
+	    my ($recuname,$recdomain)=split(/\:/,$address);
             my $msgtxt = $savemsg;
-	    if ($toaddr{$_}) { $msgtxt.='<hr />'.$toaddr{$_}; }
-	    my $thismsg;
+	    if ($toaddr{$address}) { $msgtxt.='<hr />'.$toaddr{$address}; }
+	    my @thismsg;
 	    if ((($env{'form.critmsg'}) || ($env{'form.sendbck'})) && 
 		(&Apache::lonnet::allowed('srm',$env{'request.course.id'})
 		 || &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
 					     '/'.$env{'request.course.sec'}))) {
-		$r->print(&mt('Sending critical message').' '.$recuname.'@'.$recdomain.': ');
-		$thismsg=&Apache::lonmsg::user_crit_msg($recuname,$recdomain,$msgsubj,$msgtxt,
-				$env{'form.sendbck'},$env{'form.permanent'},
-                                                             \$sentmessage{$_});
+		$r->print(&mt('Sending critical message').' '.$recuname.':'.$recdomain.': ');
+		@thismsg=
+		    &Apache::lonmsg::user_crit_msg($recuname,$recdomain,
+						   $msgsubj,$msgtxt,
+						   $env{'form.sendbck'},
+						   $env{'form.permanent'},
+						   \$sentmessage{$address});
 	    } else {
-		$r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': ');
-		$thismsg=&Apache::lonmsg::user_normal_msg($recuname,$recdomain,$msgsubj,$msgtxt,
-					  $content{'citation'},undef,undef,$env{'form.permanent'},\$sentmessage{$_});
+		$r->print(&mt('Sending').' '.$recuname.':'.$recdomain.': ');
+		@thismsg=
+		    &Apache::lonmsg::user_normal_msg($recuname,$recdomain,
+						     $msgsubj,$msgtxt,
+						     $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}  = $thismsg;
-                if ($thismsg eq 'ok') {
-                    $numspecial ++;
-                }
+	        $specialmsg_status{$recuname.':'.$recdomain} =
+		    join(' ',@thismsg);
+		foreach my $result (@thismsg) {
+		    if ($result eq 'ok') {
+			$numspecial++;
+		    }
+		}
 	    }
-	    $r->print($thismsg.'<br />');
-	    $sendstatus.=' '.$thismsg;
+	    $sendstatus.=' '.join(' ',@thismsg);
 	}
         if (($env{'request.course.id'}) && (($env{'form.sendmode'} eq 'group')
                                               || ($msgtype eq 'critical'))) {
@@ -1775,10 +1781,11 @@ sub sendoffmail {
             }
             if ($specialresult eq 'ok') {
                 my $record_sent;
-                my @recusers = ();
-                my @recudoms = ();
-                my ($stamp,$crssubj,$msgname,$msgdom,$msgcount,$context,$pid) = 
-                            split(/\:/,&Apache::lonnet::unescape($specialmsgid));
+                my @recusers;
+                my @recudoms;
+                my ($stamp,$crssubj,$msgname,$msgdom,$msgcount,$context,$pid) =
+		    split(/\:/,&Apache::lonnet::unescape($specialmsgid));
+
                 foreach my $recipient (sort(keys(%toaddr))) {
                     if ($specialmsg_status{$recipient} eq 'ok') {
                         my $usersubj = $subj_prefix.'['.$recipient.']';
@@ -1790,15 +1797,15 @@ sub sendoffmail {
                         &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;
+                        my ($uname,$udom) = split(/:/,$recipient);
                         push(@recusers,$uname);
                         push(@recudoms,$udom);
                     }
                 }
                 if (@recusers) {
                     my $specialmessage;
-                    my $sentsubj = $subj_prefix.' ('.$numspecial.' sent) '.
-                                                                       $msgsubj;
+                    my $sentsubj = 
+			$subj_prefix.' ('.$numspecial.' sent) '.$msgsubj;
                     $sentsubj = &HTML::Entities::encode($sentsubj,'<>&"');
                     my $sentmsgid = 
 			&Apache::lonmsg::buildmsgid($stamp,$sentsubj,$msgname,
@@ -1934,7 +1941,8 @@ sub handler {
 	my ($result,$msg) = 
 	    &statuschange($env{'form.markdel'},'deleted',$folder);
 	if (!$result) {
-	    $r->print('<p class="LC_error">Failed to delete the message.</p>'.
+	    $r->print('<p class="LC_error">'.
+		      &mt('Failed to delete the message.').'</p>'.
 		      '<p class="LC_error">'.$msg."</p>\n");
 	}
 	&Apache::loncommunicate::menu($r);
@@ -1957,12 +1965,13 @@ sub handler {
 	&printheader($r,'','Moved Messages');
 	if ($failed) {
 	    $r->print('<p class="LC_error">
-                          Failed to move '.$failed.' message(s)</p>');
+                          '.&mt('Failed to move [_1] message(s)',$failed).
+		      '</p>');
 	    $r->print('<p class="LC_error">'.
 		      join("</p>\n<p class=\"LC_error\">",@failed_msg).
 		      "</p>\n");
 	}
-	$r->print('Moved '.$total.' message(s)<p>');
+	$r->print(&mt('Moved [_1] message(s)',$total).'<p>');
 	&Apache::loncommunicate::menu($r);
 	&disall($r,($folder?$folder:$dismode));
     } elsif ($env{'form.markeddel'}) {
@@ -1983,12 +1992,13 @@ sub handler {
 	&printheader($r,'','Deleted Messages');
 	if ($failed) {
 	    $r->print('<p class="LC_error">
-                          Failed to delete '.$failed.' message(s)</p>');
+                          '.&mt('Failed to delete [_1] message(s)',$failed).
+		      '</p>');
 	    $r->print('<p class="LC_error">'.
 		      join("</p>\n<p class=\"LC_error\">",@failed_msg).
 		      "</p>\n");
 	}
-	$r->print('Deleted '.$total.' message(s)<p>');
+	$r->print(&mt('Deleted [_1] message(s)',$total).'<p>');
 	&Apache::loncommunicate::menu($r);
 	&disall($r,($folder?$folder:$dismode));
     } elsif ($env{'form.markunread'}) {