Diff for /loncom/interface/lonmsg.pm between versions 1.25 and 1.34

version 1.25, 2001/11/05 21:01:54 version 1.34, 2002/06/26 20:41:55
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 #  
 # Routines for messaging  # Routines for messaging
 #  #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
   #
 # (Routines to control the menu  # (Routines to control the menu
 #  #
 # (TeX Conversion Module  # (TeX Conversion Module
Line 15 Line 39
 # 07/27 Guy Albertelli  # 07/27 Guy Albertelli
 # 07/27,07/28,07/30,08/03,08/06,08/08,08/09,08/10,8/13,8/15,  # 07/27,07/28,07/30,08/03,08/06,08/08,08/09,08/10,8/13,8/15,
 # 10/1,11/5 Gerd Kortemeyer  # 10/1,11/5 Gerd Kortemeyer
   # YEAR=2002
   # 1/1,3/18 Gerd Kortemeyer
   #
 package Apache::lonmsg;  package Apache::lonmsg;
   
 use strict;  use strict;
Line 38  sub packagemsg { Line 64  sub packagemsg {
     $msgcount++;      $msgcount++;
     my $partsubj=$subject;      my $partsubj=$subject;
     $partsubj=&Apache::lonnet::escape($partsubj);      $partsubj=&Apache::lonnet::escape($partsubj);
     $partsubj=substr($partsubj,0,50);  
     my $msgid=&Apache::lonnet::escape(      my $msgid=&Apache::lonnet::escape(
            $now.':'.$partsubj.':'.$ENV{'user.name'}.':'.             $now.':'.$partsubj.':'.$ENV{'user.name'}.':'.
            $ENV{'user.domain'}.':'.$msgcount.':'.$$);             $ENV{'user.domain'}.':'.$msgcount.':'.$$);
Line 252  sub discourse { Line 277  sub discourse {
 <input type=button onClick="uncheckall()" value="Check for None">  <input type=button onClick="uncheckall()" value="Check for None">
 <p>  <p>
 ENDDISHEADER  ENDDISHEADER
     map {      foreach (sort keys %courselist) {
         my ($end,$start)=split(/\:/,$courselist{$_});          my ($end,$start)=split(/\:/,$courselist{$_});
         my $active=1;          my $active=1;
         if (($end) && ($now>$end)) { $active=0; }          if (($end) && ($now>$end)) { $active=0; }
Line 271  ENDDISHEADER Line 296  ENDDISHEADER
                       $reply{'generation'}.                        $reply{'generation'}.
                       ' ('.$_.') '.$section);                        ' ('.$_.') '.$section);
         }           } 
     } sort keys %courselist;      }
 }  }
   
 # ==================================================== Display Critical Message  # ==================================================== Display Critical Message
   
 sub discrit {  sub discrit {
     my $r=shift;      my $r=shift;
       $r->print('<h1><font color=red>Critical Messages</font></h1>'.      my $header = '<h1><font color=red>Critical Messages</font></h1>'.
          '<form action=/adm/email method=post>'.          '<form action=/adm/email method=post>'.
          '<input type=hidden name=confirm value=true>');          '<input type=hidden name=confirm value=true>';
       my %what=&Apache::lonnet::dump('critical');      my %what=&Apache::lonnet::dump('critical');
       map {      my $result = '';
           my %content=&unpackagemsg($what{$_});      foreach (sort keys %what) {
           $content{'message'}=~s/\n/\<br\>/g;          my %content=&unpackagemsg($what{$_});
   $r->print('<hr>From: <b>'.$content{'sendername'}.'@'.          next if ($content{'senderdomain'} eq '');
                     $content{'senderdomain'}.'</b> ('.$content{'time'}.          $content{'message'}=~s/\n/\<br\>/g;
                     ')<br><blockquote>'.$content{'message'}.'</blockquote>'.          $result.='<hr>From: <b>'.$content{'sendername'}.'@'.
   '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">'.              $content{'senderdomain'}.'</b> ('.$content{'time'}.
  '<input type=submit name="reprec_'.$_.'" value="Confirm Receipt and Reply">');              ')<br>Subject: '.$content{'subject'}.
       } sort keys %what;              '<br><blockquote>'.$content{'message'}.'</blockquote>'.
       $r->print(              '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">'.
           '<input type=hidden name="displayedcrit" value="true"></form>');              '<input type=submit name="reprec_'.$_.'" '.
                     'value="Confirm Receipt and Reply">';
       }
       # Check to see if there were any messages.
       if ($result eq '') {
           $result = "<h2>You have no critical messages.</h2>";
       } else {
           $r->print($header);
       }
       $r->print($result);
       $r->print('<input type=hidden name="displayedcrit" value="true"></form>');
 }  }
   
 # =============================================================== Compose reply  # =============================================================== Compose reply
Line 330  ENDREPLY Line 365  ENDREPLY
   
 sub disall {  sub disall {
     my $r=shift;      my $r=shift;
     $r->print(       $r->print(<<ENDDISHEADER);
      '<h1>Display All Messages</h1><form method=post action="/adm/email">'.  <script>
       function checkall() {
    for (i=0; i<document.forms.disall.elements.length; i++) {
               if 
             (document.forms.disall.elements[i].name.indexOf('delmark_')==0) {
         document.forms.disall.elements[i].checked=true;
               }
           }
       }
   
       function uncheckall() {
    for (i=0; i<document.forms.disall.elements.length; i++) {
               if 
             (document.forms.disall.elements[i].name.indexOf('delmark_')==0) {
         document.forms.disall.elements[i].checked=false;
               }
           }
       }
   </script>
   ENDDISHEADER
      $r->print(
    '<h1>Display All Messages</h1><form method=post name=disall '.
    'action="/adm/email">'.
      '<table border=2><tr><th colspan=2>&nbsp</th><th>Date</th>'.       '<table border=2><tr><th colspan=2>&nbsp</th><th>Date</th>'.
      '<th>Username</th><th>Domain</th><th>Subject</th><th>Status</th></tr>');       '<th>Username</th><th>Domain</th><th>Subject</th><th>Status</th></tr>');
     map {      foreach (sort split(/\&/,&Apache::lonnet::reply('keys:'.
    $ENV{'user.domain'}.':'.
                                           $ENV{'user.name'}.':nohist_email',
                                           $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 355  sub disall { Line 415  sub disall {
       &Apache::lonnet::unescape($shortsubj).'</td><td>'.        &Apache::lonnet::unescape($shortsubj).'</td><td>'.
                       $status.'</td></tr>');                        $status.'</td></tr>');
        }         }
     } sort split(/\&/,&Apache::lonnet::reply('keys:'.      }
  $ENV{'user.domain'}.':'.  
                                         $ENV{'user.name'}.':nohist_email',  
                                         $ENV{'user.home'}));  
     $r->print('</table><p>'.      $r->print('</table><p>'.
                 '<a href="javascript:checkall()">Check All</a>&nbsp;'.
                 '<a href="javascript:uncheckall()">Uncheck All</a><p>'.
               '<input type=submit name="markeddel" value="Delete Checked">'.                '<input type=submit name="markeddel" value="Delete Checked">'.
               '</form></body></html>');                '</form></body></html>');
 }  }
Line 391  sub compout { Line 450  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 414  ENDREC Line 476  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 454  sub handler { Line 522  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'},
     map {          ['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;  
    }  
        }  
     } (split(/&/,$ENV{'QUERY_STRING'}));  
   
 # --------------------------------------------------------------- Render Output  # --------------------------------------------------------------- Render Output
       
Line 522  sub handler { Line 578  sub handler {
   &disall($r);    &disall($r);
       }        }
   } elsif ($ENV{'form.confirm'}) {    } elsif ($ENV{'form.confirm'}) {
       map {        foreach (keys %ENV) {
           if ($_=~/^form\.rec\_(.*)$/) {            if ($_=~/^form\.rec\_(.*)$/) {
       $r->print('<b>Confirming Receipt:</b> '.        $r->print('<b>Confirming Receipt:</b> '.
                         &user_crit_received($1).'<br>');                          &user_crit_received($1).'<br>');
Line 533  sub handler { Line 589  sub handler {
                         &user_crit_received($msgid).'<br>');                          &user_crit_received($msgid).'<br>');
               &comprep($r,$msgid);                &comprep($r,$msgid);
           }            }
       } keys %ENV;        }
       &discrit($r);        &discrit($r);
   } elsif ($ENV{'form.critical'}) {    } elsif ($ENV{'form.critical'}) {
       &discrit($r);        &discrit($r);
Line 545  sub handler { Line 601  sub handler {
       &disall($r);        &disall($r);
   } elsif ($ENV{'form.markeddel'}) {    } elsif ($ENV{'form.markeddel'}) {
       my $total=0;        my $total=0;
       map {        foreach (keys %ENV) {
           if ($_=~/^form\.delmark_(.*)$/) {            if ($_=~/^form\.delmark_(.*)$/) {
       &statuschange(&Apache::lonnet::unescape($1),'deleted');        &statuschange(&Apache::lonnet::unescape($1),'deleted');
               $total++;                $total++;
           }            }
       } keys %ENV;        }
       $r->print('Deleted '.$total.' message(s)<p>');        $r->print('Deleted '.$total.' message(s)<p>');
       &disall($r);        &disall($r);
   } elsif ($ENV{'form.markunread'}) {    } elsif ($ENV{'form.markunread'}) {
Line 572  sub handler { Line 628  sub handler {
       my %toaddr=();        my %toaddr=();
       undef %toaddr;        undef %toaddr;
       if ($ENV{'form.sendmode'} eq 'group') {        if ($ENV{'form.sendmode'} eq 'group') {
           map {            foreach (keys %ENV) {
       if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {        if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
   $toaddr{$1}='';    $toaddr{$1}='';
               }                }
           } keys %ENV;            }
       } elsif ($ENV{'form.sendmode'} eq 'upload') {        } elsif ($ENV{'form.sendmode'} eq 'upload') {
           map {            foreach (split(/[\n\r\f]+/,$ENV{'form.upfile'})) {
               my ($rec,$txt)=split(/\s*\:\s*/,$_);                my ($rec,$txt)=split(/\s*\:\s*/,$_);
               if ($txt) {                if ($txt) {
   $rec=~s/\@/\:/;    $rec=~s/\@/\:/;
                   $toaddr{$rec}.=$txt."\n";                    $toaddr{$rec}.=$txt."\n";
               }                }
           } split(/[\n\r\f]+/,$ENV{'form.upfile'});            }
       } else {        } else {
   $toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}='';    $toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}='';
       }        }
       if ($ENV{'form.additionalrec'}) {        if ($ENV{'form.additionalrec'}) {
   map {    foreach (split(/\,/,$ENV{'form.additionalrec'})) {
               my ($auname,$audom)=split(/\@/,$_);                my ($auname,$audom)=split(/\@/,$_);
               $toaddr{$auname.':'.$audom}='';                $toaddr{$auname.':'.$audom}='';
           } split(/\,/,$ENV{'form.additionalrec'});            }
       }        }
     map {      foreach (keys %toaddr) {
       my ($recuname,$recdomain)=split(/\:/,$_);        my ($recuname,$recdomain)=split(/\:/,$_);
       my $msgtxt=$ENV{'form.message'};        my $msgtxt=$ENV{'form.message'};
       if ($toaddr{$_}) { $msgtxt.='<hr>'.$toaddr{$_}; }            if ($toaddr{$_}) { $msgtxt.='<hr>'.$toaddr{$_}; }    
Line 612  sub handler { Line 668  sub handler {
                                  $content{'citation'}));                                   $content{'citation'}));
       }        }
       $r->print('<br>');        $r->print('<br>');
     } keys %toaddr;      }
       if ($ENV{'form.displayedcrit'}) {        if ($ENV{'form.displayedcrit'}) {
           &discrit($r);            &discrit($r);
       } else {        } else {
Line 627  sub handler { Line 683  sub handler {
 }  }
 # ================================================= Main program, reset counter  # ================================================= Main program, reset counter
   
 sub BEGIN {  BEGIN {
     $msgcount=0;      $msgcount=0;
 }  }
   

Removed from v.1.25  
changed lines
  Added in v.1.34


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