[BACK]Return to lonmsg.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmsg.pm between versions 1.30 and 1.33

version 1.30, 2002/04/11 20:46:21 version 1.33, 2002/06/24 14:33:21
Line 396  ENDDISHEADER Line 396  ENDDISHEADER
                                         $ENV{'user.home'}))) {                                          $ENV{'user.home'}))) {
         my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=          my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
     &Apache::lonmsg::unpackmsgid($_);      &Apache::lonmsg::unpackmsgid($_);
        unless ($status eq 'deleted') {         unless (($status eq 'deleted') || ($sendtime=~/error/)) {
         if ($status eq 'new') {          if ($status eq 'new') {
     $r->print('<tr bgcolor="#FFBB77">');      $r->print('<tr bgcolor="#FFBB77">');
         } elsif ($status eq 'read') {          } elsif ($status eq 'read') {
Line 449  sub compout { Line 449  sub compout {
     }      }
     my $defdom=$ENV{'user.domain'};      my $defdom=$ENV{'user.domain'};
       $r->print(        $r->print(
                 '<form action="/adm/email"  name="compemail" method=post'.                  '<form action="/adm/email"  name="compemail" method="post"'.
                 ' enctype="multipart/form-data">'.                  ' enctype="multipart/form-data">'."\n".
                 '<input type=hidden name=sendmail value=on><table>');                  '<input type="hidden" name="sendmail" value="on">'."\n".
                   '<table>');
     unless (($broadcast eq 'group') || ($broadcast eq 'upload')) {      unless (($broadcast eq 'group') || ($broadcast eq 'upload')) {
           my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');
   
        $r->print(<<"ENDREC");         $r->print(<<"ENDREC");
 <table>  <table>
 <tr><td>Username:</td><td><input type=text size=12 name=recuname></td></tr>  <tr><td>Username:</td><td><input type=text size=12 name=recuname></td></tr>
 <tr><td>Domain:</td>  <tr><td>Domain:</td>
 <td><input type=text size=12 name=recdomain value="$defdom"></td></tr>  <td>$domform</td></tr>
 ENDREC  ENDREC
     }      }
     unless ($broadcast eq 'upload') {      if ($broadcast ne 'upload') {
        $r->print(<<"ENDCOMP");         $r->print(<<"ENDCOMP");
 <tr><td>Additional Recipients<br><tt>username\@domain,username\@domain, ...  <tr><td>Additional Recipients<br><tt>username\@domain,username\@domain, ...
 </tt></td><td>  </tt></td><td>
Line 472  ENDREC Line 475  ENDREC
 $dispcrit  $dispcrit
 <input type=submit value="$func Mail">  <input type=submit value="$func Mail">
 ENDCOMP  ENDCOMP
     }      } else { # $broadcast is 'upload'
     if ($broadcast eq 'upload') {  
  $r->print(<<ENDUPLOAD);   $r->print(<<ENDUPLOAD);
 <input type=hidden name=sendmode value=upload>  <input type=hidden name=sendmode value=upload>
 <h3>Generate messages from a file</h3>  <h3>Generate messages from a file</h3>
   <p>
 Subject: <input type=text size=50 name=subject>  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>  <pre>
 username1\@domain1: text  username1\@domain1: text
 username2\@domain2: text  username2\@domain2: text
 username1\@domain1: text  username3\@domain1: text
 </pre>  </pre>
   </p>
   <p>
 The messages will be assembled from all lines with the respective   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>  <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  $dispcrit
 <input type=submit value="Upload and send">  <input type=submit value="Upload and send">
 ENDUPLOAD  ENDUPLOAD
Line 512  sub handler { Line 521  sub handler {
   return OK if $r->header_only;    return OK if $r->header_only;
   
 # --------------------------- Get query string for limited number of parameters  # --------------------------- Get query string for limited number of parameters
       &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
     foreach (split(/&/,$ENV{'QUERY_STRING'})) {          ['display','replyto','forward','markread','markdel','markunread',
        my ($name, $value) = split(/=/,$_);           'sendreply','compose','sendmail','critical']);
        $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;  
    }  
        }  
     }  
   
 # --------------------------------------------------------------- Render Output  # --------------------------------------------------------------- Render Output
       
Removed from v.1.30  
changed lines
  Added in v.1.33

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>