--- loncom/interface/lonmsg.pm	2001/08/09 14:57:33	1.17
+++ loncom/interface/lonmsg.pm	2001/10/01 19:24:49	1.23
@@ -13,7 +13,8 @@
 # 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,08/08,08/09 Gerd Kortemeyer
+# 07/27,07/28,07/30,08/03,08/06,08/08,08/09,08/10,8/13,8/15,
+# 10/1 Gerd Kortemeyer
 
 package Apache::lonmsg;
 
@@ -121,7 +122,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 +175,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:'.
@@ -227,6 +226,16 @@ sub discourse {
         }
     }
 
+    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 
@@ -236,7 +245,9 @@ sub discourse {
         }
     }
 </script>
-<input type=button onClick="checkall()" value="Check for All">
+<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
@@ -249,12 +260,15 @@ ENDDISHEADER
            my %reply=&Apache::lonnet::get('environment',
               ['firstname','middlename','lastname','generation'],
               $sdom,$sname);
-           $r->print('<br><input type=checkbox name="send_to_'.$_.'"> '.
+           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;
 }
@@ -300,7 +314,7 @@ sub comprep {
 <form action="/adm/email" method=post>
 <input type=hidden name=sendreply value="$msgid">
 Subject: <input type=text size=50 name=subject value="$subject"><p>
-<textarea name=message cols=60 rows=10>
+<textarea name=message cols=64 rows=10 wrap=hard>
 $quotemsg
 </textarea><p>
 $dispcrit
@@ -367,9 +381,11 @@ sub compout {
 	   $content{'sendername'}.' at '.$content{'senderdomain'};
     }
     my $defdom=$ENV{'user.domain'};
-      $r->print('<form action="/adm/email"  name="compemail" method=post>'.
+      $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') {
+    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>
@@ -377,14 +393,39 @@ sub compout {
 <td><input type=text size=12 name=recdomain value="$defdom"></td></tr>
 ENDREC
     }
-    $r->print(<<"ENDCOMP");
+    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 name=message cols=60 rows=10 wrap=hard>$dismsg
 </textarea><p>
 $dispcrit
 <input type=submit value="$func Mail">
 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 wrap=hard>$dismsg
+</textarea><p>
+$dispcrit
+<input type=submit value="Upload and send">
+ENDUPLOAD
+    }
     if ($broadcast eq 'group') {
        &discourse;
     }
@@ -508,21 +549,50 @@ 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}='';
+              }
+          } 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($ENV{'form.recuname'},
-                                 $ENV{'form.recdomain'},
+                &user_crit_msg($recuname,$recdomain,
                                  $ENV{'form.subject'},
-                                 $ENV{'form.message'},
+                                 $msgtxt,
                                  $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'},
+                                 $msgtxt,
                                  $content{'citation'}));
       }
+      $r->print('<br>');
+    } keys %toaddr;
       if ($ENV{'form.displayedcrit'}) {
           &discrit($r);
       } else {