--- loncom/interface/lonmsg.pm	2001/08/03 18:47:18	1.15
+++ loncom/interface/lonmsg.pm	2001/08/16 01:42:07	1.22
@@ -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 Gerd Kortemeyer
+# 07/27,07/28,07/30,08/03,08/06,08/08,08/09,08/10,8/13,8/15 Gerd Kortemeyer
 
 package Apache::lonmsg;
 
@@ -121,7 +121,6 @@ sub user_crit_msg {
     unless (($message)&&($user)&&($domain)) { $status='empty'; };
     my $homeserver=&Apache::lonnet::homeserver($user,$domain);
     if ($homeserver ne 'no_host') {
-       my $msgid;
        ($msgid,$message)=&packagemsg($subject,$message);
        $status=&Apache::lonnet::critical(
            'put:'.$domain.':'.$user.':critical:'.
@@ -175,7 +174,6 @@ sub user_normal_msg {
     unless (($message)&&($user)&&($domain)) { $status='empty'; };
     my $homeserver=&Apache::lonnet::homeserver($user,$domain);
     if ($homeserver ne 'no_host') {
-       my $msgid;
        ($msgid,$message)=&packagemsg($subject,$message,$citation);
        $status=&Apache::lonnet::critical(
            'put:'.$domain.':'.$user.':nohist_email:'.
@@ -206,6 +204,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 {
@@ -223,7 +289,8 @@ sub discrit {
   '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">'.
  '<input type=submit name="reprec_'.$_.'" value="Confirm Receipt and Reply">');
       } sort keys %what;
-      $r->print('</form>');
+      $r->print(
+          '<input type=hidden name="displayedcrit" value="true"></form>');
 }
 
 # =============================================================== Compose reply
@@ -292,7 +359,7 @@ sub disall {
 # ============================================================== Compose output
 
 sub compout {
-    my ($r,$forwarding)=@_;
+    my ($r,$forwarding,$broadcast)=@_;
       my $dispcrit='';
     my $dissub='';
     my $dismsg='';
@@ -313,21 +380,55 @@ 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'.
+                ' enctype="multipart/form-data">'.
+                '<input type=hidden name=sendmail value=on><table>');
+    unless (($broadcast eq 'group') || ($broadcast eq 'upload')) {
+       $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
+    }
+    unless ($broadcast eq 'upload') {
+       $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 'upload') {
+	$r->print(<<ENDUPLOAD);
+<input type=hidden name=sendmode value=upload>
+<h3>Generate messages from a file</h3>
+Subject: <input type=text size=50 name=subject>
+<pre>
+username1\@domain1: text
+username2\@domain2: text
+username1\@domain1: text
+</pre>
+The messages will be assembled from all lines with the respective 
+<tt>username\@domain</tt>, and appended to the general message text.<p>
+<input type=file name=upfile size=20><p>
+General message text:<p>
+<textarea name=message cols=60 rows=10>$dismsg
+</textarea><p>
+$dispcrit
+<input type=submit value="Upload and send">
+ENDUPLOAD
+    }
+    if ($broadcast eq 'group') {
+       &discourse;
+    }
+    $r->print('</form>');
 }
 
 # ===================================================================== Handler
@@ -435,8 +536,67 @@ 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;
+      if ($ENV{'form.forwid'}) {
+        my $msgid=$ENV{'form.forwid'};
+        my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
+        %content=&unpackagemsg($message{$msgid});
+        &statuschange($msgid,'forwarded');
+        $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}='';
+              }
+          } keys %ENV;
+      } elsif ($ENV{'form.sendmode'} eq 'upload') {
+          map {
+              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 {
+              my ($auname,$audom)=split(/\@/,$_);
+              $toaddr{$auname.':'.$audom}='';
+          } split(/\,/,$ENV{'form.additionalrec'});
+      }
+    map {
+      my ($recuname,$recdomain)=split(/\:/,$_);
+      my $msgtxt=$ENV{'form.message'};
+      if ($toaddr{$_}) { $msgtxt.='<hr>'.$toaddr{$_}; }    
+      if (($ENV{'form.critmsg'}) && 
+          (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
+         $r->print('Sending critical: '.
+                &user_crit_msg($recuname,$recdomain,
+                                 $ENV{'form.subject'},
+                                 $msgtxt,
+                                 $content{'citation'}));
+      } else {
+         $r->print('Sending: '.&user_normal_msg($recuname,$recdomain,
+                                 $ENV{'form.subject'},
+                                 $msgtxt,
+                                 $content{'citation'}));
+      }
+      $r->print('<br>');
+    } keys %toaddr;
+      if ($ENV{'form.displayedcrit'}) {
+          &discrit($r);
+      } else {
+	  &disall($r);
+      }
   } else {
       &disall($r);
   }