--- loncom/interface/lonmsg.pm	2001/08/15 16:05:04	1.21
+++ loncom/interface/lonmsg.pm	2001/08/16 01:42:07	1.22
@@ -380,9 +380,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>
@@ -390,7 +392,8 @@ 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>
@@ -401,6 +404,27 @@ ENDREC
 $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>$dismsg
+</textarea><p>
+$dispcrit
+<input type=submit value="Upload and send">
+ENDUPLOAD
+    }
     if ($broadcast eq 'group') {
        &discourse;
     }
@@ -529,31 +553,41 @@ sub handler {
       if ($ENV{'form.sendmode'} eq 'group') {
           map {
 	      if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
-		  $toaddr{$1}=1;
+		  $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'}}=1;
+	  $toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}='';
       }
       if ($ENV{'form.additionalrec'}) {
 	  map {
               my ($auname,$audom)=split(/\@/,$_);
-              $toaddr{$auname.':'.$audom}=1;
+              $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'},
-                                 $ENV{'form.message'},
+                                 $msgtxt,
                                  $content{'citation'}));
       } else {
          $r->print('Sending: '.&user_normal_msg($recuname,$recdomain,
                                  $ENV{'form.subject'},
-                                 $ENV{'form.message'},
+                                 $msgtxt,
                                  $content{'citation'}));
       }
       $r->print('<br>');