--- loncom/interface/lonmsgdisplay.pm	2006/07/17 21:38:07	1.38
+++ loncom/interface/lonmsgdisplay.pm	2006/11/23 16:40:17	1.42
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.38 2006/07/17 21:38:07 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.42 2006/11/23 16:40:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -270,12 +270,14 @@ sub discourse {
 	    &Apache::lonselstudent::get_people_in_class($env{'request.course.sec'});
     unshift @$current_members, (@$course_personnel);
     my %defaultUsers;
+    
+    $result .= '<input type="hidden" name="sendmode" value="group" />'."\n";
 
-    $result = &Apache::lonselstudent::render_student_list($current_members,
-							  "compemail",
-							  "current",
-							  \%defaultUsers,
-							  1,"selectedusers",1);
+    $result .= &Apache::lonselstudent::render_student_list($current_members,
+							   "compemail",
+							   "current",
+							   \%defaultUsers,
+							   1,"selectedusers",1);
 
     $result .= &Apache::lonselstudent::render_student_list($expired_members,
 							   "compemail",
@@ -345,7 +347,7 @@ sub disgroup {
         foreach my $status (@statustypes)  {
             if (ref($numitems) eq 'HASH') {
                 if ((defined($$numitems{$status})) && ($$numitems{$status})) {
-                    $result.='<td align="top">'.
+                    $result.='<td valign="top">'.
                              '<fieldset><legend><b>'.$lt{$status}.
                              '</b></legend><nobr>'.
                              '<input type="button" value="check all" '.
@@ -356,12 +358,9 @@ sub disgroup {
                              '</nobr></fieldset><br />'.
                              &Apache::loncommon::start_data_table().
                              &Apache::loncommon::start_data_table_header_row();
-                    $result .= "<th><a href=\"javascript:changeSort('fullname')\">".
-                    "$lt{'name'}</a></th>".
-                    "<th><a href=\"javascript:changeSort('username')\">".
-                    "$lt{'usnm'}</a></th>".
-                    "<th><a href=\"javascript:changeSort('domain')\">".
-                    "$lt{'doma'}</a></th>".
+                    $result .= "<th>$lt{'name'}</a></th>".
+                               "<th>$lt{'usnm'}</a></th>".
+                               "<th>$lt{'doma'}</a></th>".
                     &Apache::loncommon::end_data_table_header_row();
                     foreach my $key (sort(keys(%{$Sortby{$status}}))) {
                         foreach my $user (@{$Sortby{$status}{$key}}) {
@@ -487,8 +486,8 @@ sub discrit {
         '<input type="hidden" name="confirm" value="true" />';
     my %what=&Apache::lonnet::dump('critical');
     my $result = '';
-    foreach (sort keys %what) {
-        my %content=&Apache::lonmsg::unpackagemsg($what{$_});
+    foreach my $key (sort(keys(%what))) {
+        my %content=&Apache::lonmsg::unpackagemsg($what{$key});
         next if ($content{'senderdomain'} eq '');
         $result.='<hr />'.&mt('From').': <b>'.
 &Apache::loncommon::aboutmewrapper(
@@ -501,8 +500,8 @@ $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_'.$_.'" '.
+            '<input type="submit" name="rec_'.$key.'" value="'.&mt('Confirm Receipt').'" />'.
+            '<input type="submit" name="reprec_'.$key.'" '.
                   'value="'.&mt('Confirm Receipt and Reply').'" />';
     }
     # Check to see if there were any messages.
@@ -659,8 +658,8 @@ sub disnew {
     my %status_cache = 
 	&Apache::lonnet::get('email_status',\@msgids);
     my %descriptions;
-    foreach (@msgids) {
-	my $msgid=&escape($_);
+    foreach my $id (@msgids) {
+	my $msgid=&escape($id);
         my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
 	    &Apache::lonmsg::unpackmsgid($msgid,undef,undef,\%status_cache);
         if (defined($sendtime) && $sendtime!~/error/) {
@@ -669,7 +668,7 @@ sub disnew {
             $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
             if ($status eq 'new') {
                 if ($numsendtime >= $startblock && ($numsendtime <= $endblock && $endblock > 0) ) {
-                    $blocked{$_} = 'ON';
+                    $blocked{$id} = 'ON';
                     $numblocked ++;
                 } else {
                     push @newmsgs, { 
@@ -695,8 +694,8 @@ TABLEHEAD
 <tr class="LC_mail_new">
 <td><a href="/adm/email?dismode=new&display=$msg->{'msgid'}">$lt{'op'}</a></td>
 ENDLINK
-            foreach ('sendtime','from','fromdom','shortsub','course') {
-                $r->print("<td>$msg->{$_}</td>");
+            foreach my $item ('sendtime','from','fromdom','shortsub','course') {
+                $r->print("<td>$msg->{$item}</td>");
             }
             $r->print("</td></tr>");
         }
@@ -767,7 +766,7 @@ sub disfolder {
 </script>
 ENDDISHEADER
     my $fsqs='&folder='.$folder;
-    my @temp=sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder);
+    my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder);
     my $totalnumber=$#temp+1;
     unless ($totalnumber>0) {
 	$r->print('<h2>'.&mt('Empty Folder').'</h2>');
@@ -1021,7 +1020,6 @@ sub compout {
     $r->print('<table>');
     if (($broadcast eq 'group') && ($group ne '') && 
         (!$can_grp_broadcast && !$viewgrps && !$editgrps)) {
-        print STDERR "$broadcast AND $env{'form.group'} AND $can_grp_broadcast\n";
         $r->print(&recipient_input_row($cdom,%lt));
     } 
     if (($broadcast ne 'group') && ($broadcast ne 'upload')) {
@@ -1137,8 +1135,8 @@ sub retrieve_instructor_comments {
 			 $env{'course.'.$env{'request.course.id'}.'.num'},
                          '%255b'.$user.'%253a'.$domain.'%255d');
     my $result='';
-    foreach (sort(keys(%records))) {
-        my %content=&Apache::lonmsg::unpackagemsg($records{$_});
+    foreach my $key (sort(keys(%records))) {
+        my %content=&Apache::lonmsg::unpackagemsg($records{$key});
         next if ($content{'senderdomain'} eq '');
         next if ($content{'subject'} !~ /^Record/);
 	# &Apache::lonfeedback::newline_to_br(\$content{'message'});
@@ -1165,8 +1163,8 @@ sub disfacetoface {
 			 $env{'course.'.$env{'request.course.id'}.'.num'},
                          '%255b'.$user.'%253a'.$domain.'%255d');
     my $result='';
-    foreach (sort keys %records) {
-        my %content=&Apache::lonmsg::unpackagemsg($records{$_});
+    foreach my $key (sort(keys(%records))) {
+        my %content=&Apache::lonmsg::unpackagemsg($records{$key});
         next if ($content{'senderdomain'} eq '');
 	&Apache::lonfeedback::newline_to_br(\$content{'message'});
         if ($content{'subject'}=~/^Record/) {
@@ -1389,35 +1387,35 @@ sub blockstore {
     my $addtotal = 0;
     my %blocking = ();
     $r->print('<h3>'.$lt{'head'}.'</h3>');
-    foreach (keys %env) {
-        if ($_ =~ m/^form\.modify_(\w+)$/) {
+    foreach my $envkey (keys(%env)) {
+        if ($envkey =~ m/^form\.modify_(\w+)$/) {
             $adds{$1} = $1;
             $removals{$1} = $1;
             $modtotal ++;
-        } elsif ($_ =~ m/^form\.cancel_(\d+)$/) {
+        } elsif ($envkey =~ m/^form\.cancel_(\d+)$/) {
             $cancels{$1} = $1;
             unless ( defined($removals{$1}) ) {
                 $removals{$1} = $1;
                 $canceltotal ++;
             }
-        } elsif ($_ =~ m/^form\.add_(\d+)$/) {
+        } elsif ($envkey =~ m/^form\.add_(\d+)$/) {
             $adds{$1} = $1;
             $addtotal ++;
         }
     }
 
-    foreach (keys %removals) {
-        my $hashkey = $env{'form.key_'.$_};
+    foreach my $key (keys(%removals)) {
+        my $hashkey = $env{'form.key_'.$key};
         &Apache::lonnet::del('comm_block',["$hashkey"],
                          $env{'course.'.$env{'request.course.id'}.'.domain'},
                          $env{'course.'.$env{'request.course.id'}.'.num'}
                          );
     }
-    foreach (keys %adds) {
-        unless ( defined($cancels{$_}) ) {
-            my ($newstart,$newend) = &get_dates_from_form($_);
+    foreach my $key (keys(%adds)) {
+        unless ( defined($cancels{$key}) ) {
+            my ($newstart,$newend) = &get_dates_from_form($key);
             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_'.$key};
         }
     }
     if ($addtotal + $modtotal > 0) {
@@ -1590,7 +1588,7 @@ sub blockcheck {
 	$setters->{$course}{'staff'} = [];
 	$setters->{$course}{'times'} = [];
 	my %records = &Apache::lonnet::dump('comm_block',$cdom,$cnum);
-	foreach my $record (keys %records) {
+	foreach my $record (keys(%records)) {
 	    my ($start,$end) = ($record =~ m/^(\d+)____(\d+)$/);
 	    if ($start <= time && $end >= time) {
 		my ($staff_name,$staff_dom,$title) = 
@@ -1792,7 +1790,7 @@ sub header {
     
     my $extra = &Apache::loncommon::studentbrowser_javascript();
     if ($baseurl) {
-	$extra .= "<base href=\"http://$ENV{'SERVER_NAME'}/$baseurl\" />";
+	$extra .= "<base href=\"".&Apache::lonnet::absolute_url()."/$baseurl\" />";
     }
     $r->print(&Apache::loncommon::start_page('Communication and Messages',
  					$extra));
@@ -1816,9 +1814,9 @@ 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";
+    foreach my $line (split(/[\n\r]/,$msgtxt)) {
+	unless ($line=~/^\s*(\>|\&gt\;)/) {
+	    $cleanmsgtxt.=$line."\n";
 	}
     }
     my $key=&escape($env{'form.baseurl'}).'___'.time;
@@ -1835,8 +1833,8 @@ sub storedcommentlisting {
 	$r->print(&mt('No stored comments yet.'));
     } else {
 	my $found=0;
-	foreach (sort keys %msgs) {
-	    $r->print("\n".$msgs{$_}."<hr />");
+	foreach my $key (sort(keys(%msgs))) {
+	    $r->print("\n".$msgs{$key}."<hr />");
 	    $found=1;
 	}
 	unless ($found) {
@@ -1920,8 +1918,8 @@ sub sendoffmail {
 	    }
 	}
 	if ($env{'form.additionalrec'}) {
-	    foreach (split(/\,/,$env{'form.additionalrec'})) {
-		my ($auname,$audom)=split(/\@/,$_);
+	    foreach my $rec (split(/\,/,$env{'form.additionalrec'})) {
+		my ($auname,$audom)=split(/\@/,$rec);
 		if (($auname ne "") && ($audom ne "")) {
 		    $toaddr{$auname.':'.$audom}='';
 		}
@@ -2142,12 +2140,12 @@ sub handler {
     } elsif ($env{'form.confirm'}) {
 	&printheader($r,'','Confirmed Receipt');
 	my $replying = 0;
-	foreach (keys %env) {
-	    if ($_=~/^form\.rec\_(.*)$/) {
+	foreach my $envkey (keys(%env)) {
+	    if ($envkey=~/^form\.rec\_(.*)$/) {
 		$r->print('<b>'.&mt('Confirming Receipt').':</b> '.
 			  &Apache::lonmsg::user_crit_received($1).'<br>');
 	    }
-	    if ($_=~/^form\.reprec\_(.*)$/) {
+	    if ($envkey=~/^form\.reprec\_(.*)$/) {
 		my $msgid=$1;
 		$r->print('<b>'.&mt('Confirming Receipt').':</b> '.
 			  &Apache::lonmsg::user_crit_received($msgid).'<br>');