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

Diff for /loncom/interface/lonmsg.pm between versions 1.29 and 1.41

version 1.29, 2002/03/18 18:38:04 version 1.41, 2002/10/11 20:09:36
Line 49  use Apache::lonnet(); Line 49  use Apache::lonnet();
 use vars qw($msgcount);  use vars qw($msgcount);
 use HTML::TokeParser;  use HTML::TokeParser;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
   use Apache::loncommon;
   use Apache::lontexconvert;
   
 # ===================================================================== Package  # ===================================================================== Package
   
Line 117  sub unpackmsgid { Line 119  sub unpackmsgid {
     return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid});      return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid});
 }   } 
   
   # ============================================================= Check for email
   
   sub newmail {
       if ((time-$ENV{'user.mailcheck.time'})>300) {
           my %what=&Apache::lonnet::get('email_status',['recnewemail']);
           &Apache::lonnet::appenv('user.mailcheck.time'=>time);
           if ($what{'recnewemail'}>0) { return 1; }
       }
       return 0;
   }
   
 # =============================== Automated message to the author of a resource  # =============================== Automated message to the author of a resource
   
 sub author_res_msg {  sub author_res_msg {
Line 139  sub author_res_msg { Line 152  sub author_res_msg {
   
 # ================================================== Critical message to a user  # ================================================== Critical message to a user
   
 sub user_crit_msg {  sub user_crit_msg_raw {
     my ($user,$domain,$subject,$message,$sendback)=@_;      my ($user,$domain,$subject,$message,$sendback)=@_;
 # Check if allowed missing  # Check if allowed missing
     my $status='';      my $status='';
Line 166  sub user_crit_msg { Line 179  sub user_crit_msg {
     return $status;      return $status;
 }  }
   
   # New routine that respects "forward" and calls old routine
   
   sub user_crit_msg {
       my ($user,$domain,$subject,$message,$sendback)=@_;
       my $status='';
       my %userenv = &Apache::lonnet::get('environment',['msgforward'],
                                          $domain,$user);
       my $msgforward=$userenv{'msgforward'};
       if ($msgforward) {
          foreach (split(/\,/,$msgforward)) {
    my ($forwuser,$forwdomain)=split(/\:/,$_);
            $status.=
      &user_crit_msg_raw($forwuser,$forwdomain,$subject,$message,
                   $sendback).' ';
          }
       } else { 
    $status=&user_crit_msg_raw($user,$domain,$subject,$message,$sendback);
       }
       return $status;
   }
   
 # =================================================== Critical message received  # =================================================== Critical message received
   
 sub user_crit_received {  sub user_crit_received {
Line 193  sub user_crit_received { Line 227  sub user_crit_received {
   
 # ======================================================== Normal communication  # ======================================================== Normal communication
   
 sub user_normal_msg {  sub user_normal_msg_raw {
     my ($user,$domain,$subject,$message,$citation)=@_;      my ($user,$domain,$subject,$message,$citation)=@_;
 # Check if allowed missing  # Check if allowed missing
     my $status='';      my $status='';
Line 206  sub user_normal_msg { Line 240  sub user_normal_msg {
            'put:'.$domain.':'.$user.':nohist_email:'.             'put:'.$domain.':'.$user.':nohist_email:'.
            &Apache::lonnet::escape($msgid).'='.             &Apache::lonnet::escape($msgid).'='.
            &Apache::lonnet::escape($message),$homeserver);             &Apache::lonnet::escape($message),$homeserver);
          &Apache::lonnet::put
                            ('email_status',{'recnewemail'=>time},$domain,$user);
     } else {      } else {
        $status='no_host';         $status='no_host';
     }      }
Line 215  sub user_normal_msg { Line 251  sub user_normal_msg {
     return $status;      return $status;
 }  }
   
   # New routine that respects "forward" and calls old routine
   
   sub user_normal_msg {
       my ($user,$domain,$subject,$message,$citation)=@_;
       my $status='';
       my %userenv = &Apache::lonnet::get('environment',['msgforward'],
                                          $domain,$user);
       my $msgforward=$userenv{'msgforward'};
       if ($msgforward) {
          foreach (split(/\,/,$msgforward)) {
    my ($forwuser,$forwdomain)=split(/\:/,$_);
            $status.=
     &user_normal_msg_raw($forwuser,$forwdomain,$subject,$message,
                                                                $citation).' ';
          }
       } else { 
    $status=
             &user_normal_msg_raw($user,$domain,$subject,$message,$citation);
       }
       return $status;
   }
   
   
 # =============================================================== Status Change  # =============================================================== Status Change
   
 sub statuschange {  sub statuschange {
Line 303  ENDDISHEADER Line 362  ENDDISHEADER
   
 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');
       foreach (sort keys %what) {      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>'.
   '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">'.  &Apache::loncommon::aboutmewrapper(
  '<input type=submit name="reprec_'.$_.'" value="Confirm Receipt and Reply">');   &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
       }  $content{'sendername'}.'@'.
       $r->print(              $content{'senderdomain'}.') '.$content{'time'}.
           '<input type=hidden name="displayedcrit" value="true"></form>');              '<br>Subject: '.$content{'subject'}.
               '<br><blockquote>'.
                 &Apache::lontexconvert::msgtexconverted($content{'message'}).
               '</blockquote>'.
               '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">'.
               '<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 333  sub comprep { Line 407  sub comprep {
       my $subject='Re: '.$content{'subject'};        my $subject='Re: '.$content{'subject'};
       my $dispcrit='';        my $dispcrit='';
       if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {        if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
    my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");
          $dispcrit=           $dispcrit=
  '<input type=checkbox name=critmsg> Send as critical message<br>'.   '<input type=checkbox name=critmsg> Send as critical message ' . $crithelp . 
  '<input type=checkbox name=sendbck> Send as critical message'.   '<br>'.
  ' and return receipt<p>';   '<input type=checkbox name=sendbck> Send as critical message ' .
    ' and return receipt' . $crithelp . '<p>';
       }        }
       $r->print(<<"ENDREPLY");        $r->print(<<"ENDREPLY");
 <form action="/adm/email" method=post>  <form action="/adm/email" method=post>
 <input type=hidden name=sendreply value="$msgid">  <input type=hidden name=sendreply value="$msgid">
 Subject: <input type=text size=50 name=subject value="$subject"><p>  Subject: <input type=text size=50 name=subject value="$subject"><p>
 <textarea name=message cols=64 rows=10 wrap=hard>  <textarea name=message cols=84 rows=10 wrap=hard>
 $quotemsg  $quotemsg
 </textarea><p>  </textarea><p>
 $dispcrit  $dispcrit
Line 387  ENDDISHEADER Line 463  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') {   if (($status ne 'deleted') && defined($sendtime) && $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') {
     $r->print('<tr bgcolor="#BBBB77">');   $r->print('<tr bgcolor="#BBBB77">');
         } elsif ($status eq 'replied') {      } elsif ($status eq 'replied') {
     $r->print('<tr bgcolor="#AAAA88">');   $r->print('<tr bgcolor="#AAAA88">');
  } else {      } else {
     $r->print('<tr bgcolor="#99BBBB">');   $r->print('<tr bgcolor="#99BBBB">');
         }      }
         $r->print('<td><a href="/adm/email?display='.$_.      $r->print('<td><a href="/adm/email?display='.$_.
                   '">Open</a></td><td><a href="/adm/email?markdel='.$_.        '">Open</a></td><td><a href="/adm/email?markdel='.$_.
                 '">Delete</a><input type=checkbox name="delmark_'.$_.'"></td>'.        '">Delete</a><input type=checkbox name="delmark_'.$_.'"></td>'.
                   '<td>'.localtime($sendtime).'</td><td>'.        '<td>'.localtime($sendtime).'</td><td>'.
                   $fromname.'</td><td>'.$fromdomain.'</td><td>'.        $fromname.'</td><td>'.$fromdomain.'</td><td>'.
       &Apache::lonnet::unescape($shortsubj).'</td><td>'.        &Apache::lonnet::unescape($shortsubj).'</td><td>'.
                       $status.'</td></tr>');                        $status.'</td></tr>');
        }   }
     }      }
     $r->print('</table><p>'.      $r->print('</table><p>'.
               '<a href="javascript:checkall()">Check All</a>&nbsp;'.                '<a href="javascript:checkall()">Check All</a>&nbsp;'.
Line 422  sub compout { Line 498  sub compout {
     my $dismsg='';      my $dismsg='';
     my $func='Send New';      my $func='Send New';
       if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {        if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
    my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");
          $dispcrit=           $dispcrit=
  '<input type=checkbox name=critmsg> Send as critical message<br>'.   '<input type=checkbox name=critmsg> Send as critical message ' . $crithelp . 
  '<input type=checkbox name=sendbck> Send as critical message'.   '<br>'.
  ' and return receipt<p>';   '<input type=checkbox name=sendbck> Send as critical message ' .
    ' and return receipt' . $crithelp . '<p>';
       }        }
     if ($forwarding) {      if ($forwarding) {
        $dispcrit.='<input type=hidden name=forwid value="'.         $dispcrit.='<input type=hidden name=forwid value="'.
Line 439  sub compout { Line 517  sub compout {
    $content{'sendername'}.' at '.$content{'senderdomain'};     $content{'sendername'}.' at '.$content{'senderdomain'};
     }      }
     my $defdom=$ENV{'user.domain'};      my $defdom=$ENV{'user.domain'};
       if ($ENV{'form.recdom'}) { $defdom=$ENV{'form.recdom'}; }
       $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 value="$ENV{'form.recname'}"></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>
 <input type=text size=50 name=additionalrec></td></tr>  <input type=text size=50 name=additionalrec></td></tr>
 <tr><td>Subject:</td><td><input type=text size=50 name=subject value="$dissub">  <tr><td>Subject:</td><td><input type=text size=50 name=subject value="$dissub">
 </td></tr></table>  </td></tr></table>
 <textarea name=message cols=60 rows=10 wrap=hard>$dismsg  <textarea name=message cols=80 rows=10 wrap=hard>$dismsg
 </textarea><p>  </textarea><p>
 $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 503  sub handler { Line 591  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'},
           ['display','replyto','forward','markread','markdel','markunread',
            'sendreply','compose','sendmail','critical','recname','recdom']);
   
     foreach (split(/&/,$ENV{'QUERY_STRING'})) {  # ------------------------------------------------------ They checked for email
        my ($name, $value) = split(/=/,$_);    &Apache::lonnet::put('email_status',{'recnewemail'=>0});
        $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
       
   $r->print('<html><head><title>EMail and Messaging</title></head>');    $r->print('<html><head><title>EMail and Messaging</title></head>'.
   $r->print(              &Apache::loncommon::bodytag('EMail and Messages'));
    '<body bgcolor="#FFFFFF"><img align=right src=/adm/lonIcons/lonlogos.gif>');  
   $r->print('<h1>EMail</h1>');  
   if ($ENV{'form.display'}) {    if ($ENV{'form.display'}) {
       my $msgid=$ENV{'form.display'};        my $msgid=$ENV{'form.display'};
       &statuschange($msgid,'read');        &statuschange($msgid,'read');
       my %message=&Apache::lonnet::get('nohist_email',[$msgid]);        my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
       my %content=&unpackagemsg($message{$msgid});        my %content=&unpackagemsg($message{$msgid});
       $r->print('<b>Subject:</b> '.$content{'subject'}.        $r->print('<b>Subject:</b> '.$content{'subject'}.
              '<br><b>From:</b> '.$content{'sendername'}.' at '.               '<br><b>From:</b> '.
                                  $content{'senderdomain'}.  &Apache::loncommon::aboutmewrapper(
   &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
   $content{'sendername'},$content{'senderdomain'}).' ('.
                                    $content{'sendername'}.' at '.
                                    $content{'senderdomain'}.') '.
              '<br><b>Time:</b> '.$content{'time'}.'<p>'.               '<br><b>Time:</b> '.$content{'time'}.'<p>'.
              '<table border=2><tr bgcolor="#FFFFAA"><td>Functions:</td>'.               '<table border=2><tr bgcolor="#FFFFAA"><td>Functions:</td>'.
            '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).             '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).
Line 543  sub handler { Line 623  sub handler {
              '"><b>Mark Unread</b></a></td>'.               '"><b>Mark Unread</b></a></td>'.
         '<td><a href="/adm/email"><b>Display all Messages</b></a></td>'.          '<td><a href="/adm/email"><b>Display all Messages</b></a></td>'.
              '</tr></table><p><pre>'.               '</tr></table><p><pre>'.
              $content{'message'}.'</pre><hr>'.$content{'citation'});               &Apache::lontexconvert::msgtexconverted($content{'message'}).
                '</pre><hr>'.$content{'citation'});
   } elsif ($ENV{'form.replyto'}) {    } elsif ($ENV{'form.replyto'}) {
       &comprep($r,$ENV{'form.replyto'});        &comprep($r,$ENV{'form.replyto'});
   } elsif ($ENV{'form.sendreply'}) {    } elsif ($ENV{'form.sendreply'}) {
Removed from v.1.29  
changed lines
  Added in v.1.41

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