Diff for /loncom/interface/lonmsg.pm between versions 1.40 and 1.42.2.1

version 1.40, 2002/10/11 20:04:34 version 1.42.2.1, 2003/03/17 16:55:06
Line 47  package Apache::lonmsg; Line 47  package Apache::lonmsg;
 use strict;  use strict;
 use Apache::lonnet();  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::loncommon();
 use Apache::lontexconvert;  use Apache::lontexconvert();
   use HTML::Entities();
   
 # ===================================================================== Package  # ===================================================================== Package
   
 sub packagemsg {  sub packagemsg {
     my ($subject,$message,$citation)=@_;      my ($subject,$message,$citation)=@_;
     $message=~s/\</\&lt\;/g;  #    $message=~s/\</\&lt\;/g;
     $message=~s/\>/\&gt\;/g;  #    $message=~s/\>/\&gt\;/g;
     $citation=~s/\</\&lt\;/g;      $message =&HTML::Entities::encode($message);
     $citation=~s/\>/\&gt\;/g;      $citation=&HTML::Entities::encode($citation);
     $subject=~s/\</\&lt\;/g;      $subject =&HTML::Entities::encode($subject);
     $subject=~s/\>/\&gt\;/g;  #    $subject=~s/\</\&lt\;/g;
   #    $subject=~s/\>/\&gt\;/g;
     my $now=time;      my $now=time;
     $msgcount++;      $msgcount++;
     my $partsubj=$subject;      my $partsubj=$subject;
Line 125  sub newmail { Line 127  sub newmail {
     if ((time-$ENV{'user.mailcheck.time'})>300) {      if ((time-$ENV{'user.mailcheck.time'})>300) {
         my %what=&Apache::lonnet::get('email_status',['recnewemail']);          my %what=&Apache::lonnet::get('email_status',['recnewemail']);
         &Apache::lonnet::appenv('user.mailcheck.time'=>time);          &Apache::lonnet::appenv('user.mailcheck.time'=>time);
         &Apache::lonnet::logthis('Check Mail: '.$what{'recnewemail'});  
         if ($what{'recnewemail'}>0) { return 1; }          if ($what{'recnewemail'}>0) { return 1; }
     }      }
     return 0;      return 0;
Line 211  sub user_crit_received { Line 212  sub user_crit_received {
      &user_normal_msg($contents{'sendername'},$contents{'senderdomain'},       &user_normal_msg($contents{'sendername'},$contents{'senderdomain'},
                      'Receipt: '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},                       'Receipt: '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},
                      'User '.$ENV{'user.name'}.' at '.$ENV{'user.domain'}.                       'User '.$ENV{'user.name'}.' at '.$ENV{'user.domain'}.
                      ' acknowledged receipt of message "'.                       ' acknowledged receipt of message'."\n".'   "'.
                      $contents{'subject'}.'" dated '.$contents{'time'}.".\n\n"                       $contents{'subject'}.'"'."\n".'dated '.
                      .'Message ID: '.$contents{'msgid'}):'no msg req');                       $contents{'time'}.".\n"
                        ):'no msg req');
     $status.=' trans: '.      $status.=' trans: '.
      &Apache::lonnet::put(       &Apache::lonnet::put(
      'nohist_email',{$contents{'msgid'} => $message{$msgid}});       'nohist_email',{$contents{'msgid'} => $message{$msgid}});

Removed from v.1.40  
changed lines
  Added in v.1.42.2.1


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