--- loncom/interface/lonmsg.pm	2001/08/06 11:41:11	1.16
+++ loncom/interface/lonmsg.pm	2001/08/13 19:36:39	1.20
@@ -13,7 +13,7 @@
 # 10/19,10/20,10/30,
 # 02/06/01 Gerd Kortemeyer
 # 07/27 Guy Albertelli
-# 07/27,07/28,07/30,08/03,08/06 Gerd Kortemeyer
+# 07/27,07/28,07/30,08/03,08/06,08/08,08/09,08/10,8/13 Gerd Kortemeyer
 
 package Apache::lonmsg;
 
@@ -206,6 +206,74 @@ sub statuschange {
     }
 }
 
+# ======================================================= Display a course list
+
+sub discourse {
+    my $r=shift;
+    my %courselist=&Apache::lonnet::dump(
+                   'classlist',
+		   $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+		   $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+    my $now=time;
+    $r->print(<<ENDDISHEADER);
+<input type=hidden name=sendmode value=group>
+<script>
+    function checkall() {
+	for (i=0; i<document.forms.compemail.elements.length; i++) {
+            if 
+          (document.forms.compemail.elements[i].name.indexOf('send_to_')==0) {
+	      document.forms.compemail.elements[i].checked=true;
+            }
+        }
+    }
+
+    function checksec() {
+	for (i=0; i<document.forms.compemail.elements.length; i++) {
+            if 
+          (document.forms.compemail.elements[i].name.indexOf
+           ('send_to_&&&'+document.forms.compemail.chksec.value)==0) {
+	      document.forms.compemail.elements[i].checked=true;
+            }
+        }
+    }
+
+    function uncheckall() {
+	for (i=0; i<document.forms.compemail.elements.length; i++) {
+            if 
+          (document.forms.compemail.elements[i].name.indexOf('send_to_')==0) {
+	      document.forms.compemail.elements[i].checked=false;
+            }
+        }
+    }
+</script>
+<input type=button onClick="checkall()" value="Check for All">&nbsp;
+<input type=button onClick="checksec()" value="Check for Section/Group">
+<input type=text size=5 name=chksec>&nbsp;
+<input type=button onClick="uncheckall()" value="Check for None">
+<p>
+ENDDISHEADER
+    map {
+        my ($end,$start)=split(/\:/,$courselist{$_});
+        my $active=1;
+        if (($end) && ($now>$end)) { $active=0; }
+        if ($active) {
+           my ($sname,$sdom)=split(/\:/,$_);
+           my %reply=&Apache::lonnet::get('environment',
+              ['firstname','middlename','lastname','generation'],
+              $sdom,$sname);
+           my $section=&Apache::lonnet::usection
+	       ($sdom,$sname,$ENV{'request.course.id'});
+           $r->print(
+        '<br><input type=checkbox name="send_to_&&&'.$section.'&&&_'.$_.'"> '.
+		      $reply{'firstname'}.' '. 
+                      $reply{'middlename'}.' '.
+                      $reply{'lastname'}.' '.
+                      $reply{'generation'}.
+                      ' ('.$_.') '.$section);
+        } 
+    } sort keys %courselist;
+}
+
 # ==================================================== Display Critical Message
 
 sub discrit {
@@ -293,7 +361,7 @@ sub disall {
 # ============================================================== Compose output
 
 sub compout {
-    my ($r,$forwarding)=@_;
+    my ($r,$forwarding,$broadcast)=@_;
       my $dispcrit='';
     my $dissub='';
     my $dismsg='';
@@ -314,21 +382,31 @@ sub compout {
 	   $content{'sendername'}.' at '.$content{'senderdomain'};
     }
     my $defdom=$ENV{'user.domain'};
-      $r->print(<<"ENDCOMP");
-<form action="/adm/email" method=post>
-<input type=hidden name=sendmail value=on>
+      $r->print('<form action="/adm/email"  name="compemail" method=post>'.
+                '<input type=hidden name=sendmail value=on><table>');
+    unless ($broadcast eq 'group') {
+       $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>
+ENDREC
+    }
+    $r->print(<<"ENDCOMP");
+<tr><td>Additional Recipients<br><tt>username\@domain,username\@domain, ...
+</tt></td><td>
+<input type=text size=50 name=additionalrec></td></tr>
 <tr><td>Subject:</td><td><input type=text size=50 name=subject value="$dissub">
 </td></tr></table>
 <textarea name=message cols=60 rows=10>$dismsg
 </textarea><p>
 $dispcrit
 <input type=submit value="$func Mail">
-</form>
 ENDCOMP
+    if ($broadcast eq 'group') {
+       &discourse;
+    }
+    $r->print('</form>');
 }
 
 # ===================================================================== Handler
@@ -436,7 +514,7 @@ sub handler {
       &statuschange($ENV{'form.markunread'},'new');
       &disall($r);
   } elsif ($ENV{'form.compose'}) {
-      &compout($r);
+      &compout($r,'',$ENV{'form.compose'});
   } elsif ($ENV{'form.sendmail'}) {
       my %content=();
       undef %content;
@@ -448,21 +526,40 @@ sub handler {
         $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
 	                       $content{'message'};
       }
+      my %toaddr=();
+      undef %toaddr;
+      if ($ENV{'form.sendmode'} eq 'group') {
+          map {
+	      if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
+		  $toaddr{$1}=1;
+              }
+          } keys %ENV;
+      } else {
+	  $toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}=1;
+      }
+      if ($ENV{'form.additionalrec'}) {
+	  map {
+              my ($auname,$audom)=split(/\@/,$_);
+              $toaddr{$auname.':'.$audom}=1;
+          } split(/\,/,$ENV{'form.additionalrec'});
+      }
+    map {
+      my ($recuname,$recdomain)=split(/\:/,$_);
       if (($ENV{'form.critmsg'}) && 
           (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
          $r->print('Sending critical: '.
-                &user_crit_msg($ENV{'form.recuname'},
-                                 $ENV{'form.recdomain'},
+                &user_crit_msg($recuname,$recdomain,
                                  $ENV{'form.subject'},
                                  $ENV{'form.message'},
                                  $content{'citation'}));
       } else {
-         $r->print('Sending: '.&user_normal_msg($ENV{'form.recuname'},
-                                 $ENV{'form.recdomain'},
+         $r->print('Sending: '.&user_normal_msg($recuname,$recdomain,
                                  $ENV{'form.subject'},
                                  $ENV{'form.message'},
                                  $content{'citation'}));
       }
+      $r->print('<br>');
+    } keys %toaddr;
       if ($ENV{'form.displayedcrit'}) {
           &discrit($r);
       } else {