--- loncom/interface/lonmsg.pm	2002/01/01 18:38:51	1.27
+++ loncom/interface/lonmsg.pm	2002/06/24 14:33:21	1.33
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.27 2002/01/01 18:38:51 www Exp $
+# $Id: lonmsg.pm,v 1.33 2002/06/24 14:33:21 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,7 +40,7 @@
 # 07/27,07/28,07/30,08/03,08/06,08/08,08/09,08/10,8/13,8/15,
 # 10/1,11/5 Gerd Kortemeyer
 # YEAR=2002
-# 1/1 Gerd Kortemeyer
+# 1/1,3/18 Gerd Kortemeyer
 #
 package Apache::lonmsg;
 
@@ -277,7 +277,7 @@ sub discourse {
 <input type=button onClick="uncheckall()" value="Check for None">
 <p>
 ENDDISHEADER
-    map {
+    foreach (sort keys %courselist) {
         my ($end,$start)=split(/\:/,$courselist{$_});
         my $active=1;
         if (($end) && ($now>$end)) { $active=0; }
@@ -296,28 +296,37 @@ ENDDISHEADER
                       $reply{'generation'}.
                       ' ('.$_.') '.$section);
         } 
-    } sort keys %courselist;
+    }
 }
 
 # ==================================================== Display Critical Message
 
 sub discrit {
     my $r=shift;
-      $r->print('<h1><font color=red>Critical Messages</font></h1>'.
-         '<form action=/adm/email method=post>'.
-         '<input type=hidden name=confirm value=true>');
-      my %what=&Apache::lonnet::dump('critical');
-      map {
-          my %content=&unpackagemsg($what{$_});
-          $content{'message'}=~s/\n/\<br\>/g;
-	  $r->print('<hr>From: <b>'.$content{'sendername'}.'@'.
-                    $content{'senderdomain'}.'</b> ('.$content{'time'}.
-                    ')<br><blockquote>'.$content{'message'}.'</blockquote>'.
-  '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">'.
- '<input type=submit name="reprec_'.$_.'" value="Confirm Receipt and Reply">');
-      } sort keys %what;
-      $r->print(
-          '<input type=hidden name="displayedcrit" value="true"></form>');
+    my $header = '<h1><font color=red>Critical Messages</font></h1>'.
+        '<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) {
+        my %content=&unpackagemsg($what{$_});
+        next if ($content{'senderdomain'} eq '');
+        $content{'message'}=~s/\n/\<br\>/g;
+        $result.='<hr>From: <b>'.$content{'sendername'}.'@'.
+            $content{'senderdomain'}.'</b> ('.$content{'time'}.
+            ')<br><blockquote>'.$content{'message'}.'</blockquote>'.
+            '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">'.
+            '<input type=submit name="reprec_'.$_.'" '.
+                  'value="Confirm Receipt and Reply">';
+    }
+    # Check to see if there were any messages.
+    if ($result eq '') {
+        $result = "<h2>You have no critical messages.</h2>";
+    } else {
+        $r->print($header);
+    }
+    $r->print($result);
+    $r->print('<input type=hidden name="displayedcrit" value="true"></form>');
 }
 
 # =============================================================== Compose reply
@@ -355,8 +364,30 @@ ENDREPLY
 
 sub disall {
     my $r=shift;
-    $r->print(
-     '<h1>Display All Messages</h1><form method=post action="/adm/email">'.
+     $r->print(<<ENDDISHEADER);
+<script>
+    function checkall() {
+	for (i=0; i<document.forms.disall.elements.length; i++) {
+            if 
+          (document.forms.disall.elements[i].name.indexOf('delmark_')==0) {
+	      document.forms.disall.elements[i].checked=true;
+            }
+        }
+    }
+
+    function uncheckall() {
+	for (i=0; i<document.forms.disall.elements.length; i++) {
+            if 
+          (document.forms.disall.elements[i].name.indexOf('delmark_')==0) {
+	      document.forms.disall.elements[i].checked=false;
+            }
+        }
+    }
+</script>
+ENDDISHEADER
+   $r->print(
+ '<h1>Display All Messages</h1><form method=post name=disall '.
+ 'action="/adm/email">'.
      '<table border=2><tr><th colspan=2>&nbsp</th><th>Date</th>'.
      '<th>Username</th><th>Domain</th><th>Subject</th><th>Status</th></tr>');
     foreach (sort split(/\&/,&Apache::lonnet::reply('keys:'.
@@ -365,7 +396,7 @@ sub disall {
                                         $ENV{'user.home'}))) {
         my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
 	    &Apache::lonmsg::unpackmsgid($_);
-       unless ($status eq 'deleted') {
+       unless (($status eq 'deleted') || ($sendtime=~/error/)) {
         if ($status eq 'new') {
 	    $r->print('<tr bgcolor="#FFBB77">');
         } elsif ($status eq 'read') {
@@ -385,6 +416,8 @@ sub disall {
        }
     }
     $r->print('</table><p>'.
+              '<a href="javascript:checkall()">Check All</a>&nbsp;'.
+              '<a href="javascript:uncheckall()">Uncheck All</a><p>'.
               '<input type=submit name="markeddel" value="Delete Checked">'.
               '</form></body></html>');
 }
@@ -416,18 +449,21 @@ sub compout {
     }
     my $defdom=$ENV{'user.domain'};
       $r->print(
-                '<form action="/adm/email"  name="compemail" method=post'.
-                ' enctype="multipart/form-data">'.
-                '<input type=hidden name=sendmail value=on><table>');
+                '<form action="/adm/email"  name="compemail" method="post"'.
+                ' enctype="multipart/form-data">'."\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');
+
        $r->print(<<"ENDREC");
 <table>
 <tr><td>Username:</td><td><input type=text size=12 name=recuname></td></tr>
 <tr><td>Domain:</td>
-<td><input type=text size=12 name=recdomain value="$defdom"></td></tr>
+<td>$domform</td></tr>
 ENDREC
     }
-    unless ($broadcast eq 'upload') {
+    if ($broadcast ne 'upload') {
        $r->print(<<"ENDCOMP");
 <tr><td>Additional Recipients<br><tt>username\@domain,username\@domain, ...
 </tt></td><td>
@@ -439,23 +475,29 @@ ENDREC
 $dispcrit
 <input type=submit value="$func Mail">
 ENDCOMP
-    }
-    if ($broadcast eq 'upload') {
+    } else { # $broadcast is 'upload'
 	$r->print(<<ENDUPLOAD);
 <input type=hidden name=sendmode value=upload>
 <h3>Generate messages from a file</h3>
+<p>
 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></p>
+<p>
+The file format for the uploaded portion of the message is:
 <pre>
 username1\@domain1: text
 username2\@domain2: text
-username1\@domain1: text
+username3\@domain1: text
 </pre>
+</p>
+<p>
 The messages will be assembled from all lines with the respective 
-<tt>username\@domain</tt>, and appended to the general message text.<p>
+<tt>username\@domain</tt>, and appended to the general message text.</p>
+<p>
 <input type=file name=upfile size=20><p>
-General message text:<p>
-<textarea name=message cols=60 rows=10 wrap=hard>$dismsg
-</textarea><p>
 $dispcrit
 <input type=submit value="Upload and send">
 ENDUPLOAD
@@ -479,21 +521,9 @@ sub handler {
   return OK if $r->header_only;
 
 # --------------------------- Get query string for limited number of parameters
-
-    map {
-       my ($name, $value) = split(/=/,$_);
-       $value =~ tr/+/ /;
-       $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
-       if (($name eq 'display') || ($name eq 'replyto') || 
-           ($name eq 'forward') || ($name eq 'markread') ||
-           ($name eq 'markdel') || ($name eq 'markunread') ||
-           ($name eq 'sendreply') || ($name eq 'compose') ||
-           ($name eq 'sendmail') || ($name eq 'critical')) {
-           unless ($ENV{'form.'.$name}) {
-              $ENV{'form.'.$name}=$value;
-	   }
-       }
-    } (split(/&/,$ENV{'QUERY_STRING'}));
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+        ['display','replyto','forward','markread','markdel','markunread',
+         'sendreply','compose','sendmail','critical']);
 
 # --------------------------------------------------------------- Render Output
   
@@ -547,7 +577,7 @@ sub handler {
 	  &disall($r);
       }
   } elsif ($ENV{'form.confirm'}) {
-      map {
+      foreach (keys %ENV) {
           if ($_=~/^form\.rec\_(.*)$/) {
 	      $r->print('<b>Confirming Receipt:</b> '.
                         &user_crit_received($1).'<br>');
@@ -558,7 +588,7 @@ sub handler {
                         &user_crit_received($msgid).'<br>');
               &comprep($r,$msgid);
           }
-      } keys %ENV;
+      }
       &discrit($r);
   } elsif ($ENV{'form.critical'}) {
       &discrit($r);
@@ -570,12 +600,12 @@ sub handler {
       &disall($r);
   } elsif ($ENV{'form.markeddel'}) {
       my $total=0;
-      map {
+      foreach (keys %ENV) {
           if ($_=~/^form\.delmark_(.*)$/) {
 	      &statuschange(&Apache::lonnet::unescape($1),'deleted');
               $total++;
           }
-      } keys %ENV;
+      }
       $r->print('Deleted '.$total.' message(s)<p>');
       &disall($r);
   } elsif ($ENV{'form.markunread'}) {
@@ -597,29 +627,29 @@ sub handler {
       my %toaddr=();
       undef %toaddr;
       if ($ENV{'form.sendmode'} eq 'group') {
-          map {
+          foreach (keys %ENV) {
 	      if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
 		  $toaddr{$1}='';
               }
-          } keys %ENV;
+          }
       } elsif ($ENV{'form.sendmode'} eq 'upload') {
-          map {
+          foreach (split(/[\n\r\f]+/,$ENV{'form.upfile'})) {
               my ($rec,$txt)=split(/\s*\:\s*/,$_);
               if ($txt) {
 		  $rec=~s/\@/\:/;
                   $toaddr{$rec}.=$txt."\n";
               }
-          } split(/[\n\r\f]+/,$ENV{'form.upfile'});
+          }
       } else {
 	  $toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}='';
       }
       if ($ENV{'form.additionalrec'}) {
-	  map {
+	  foreach (split(/\,/,$ENV{'form.additionalrec'})) {
               my ($auname,$audom)=split(/\@/,$_);
               $toaddr{$auname.':'.$audom}='';
-          } split(/\,/,$ENV{'form.additionalrec'});
+          }
       }
-    map {
+    foreach (keys %toaddr) {
       my ($recuname,$recdomain)=split(/\:/,$_);
       my $msgtxt=$ENV{'form.message'};
       if ($toaddr{$_}) { $msgtxt.='<hr>'.$toaddr{$_}; }    
@@ -637,7 +667,7 @@ sub handler {
                                  $content{'citation'}));
       }
       $r->print('<br>');
-    } keys %toaddr;
+    }
       if ($ENV{'form.displayedcrit'}) {
           &discrit($r);
       } else {