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

Diff for /loncom/interface/lonmsg.pm between versions 1.50 and 1.51

version 1.50, 2003/03/17 17:02:38 version 1.51, 2003/03/30 21:58:17
Line 56  use HTML::Entities(); Line 56  use HTML::Entities();
 # ===================================================================== Package  # ===================================================================== Package
   
 sub packagemsg {  sub packagemsg {
     my ($subject,$message,$citation,$baseurl)=@_;      my ($subject,$message,$citation,$baseurl,$attachmenturl)=@_;
     $message =&HTML::Entities::encode($message);      $message =&HTML::Entities::encode($message);
     $citation=&HTML::Entities::encode($citation);      $citation=&HTML::Entities::encode($citation);
     $subject =&HTML::Entities::encode($subject);      $subject =&HTML::Entities::encode($subject);
     #remove machine specification      #remove machine specification
     $baseurl =~ s|^http://[^/]+/|/|;      $baseurl =~ s|^http://[^/]+/|/|;
     $baseurl =&HTML::Entities::encode($baseurl);      $baseurl =&HTML::Entities::encode($baseurl);
       #remove machine specification
       $attachmenturl =~ s|^http://[^/]+/|/|;
       $attachmenturl =&HTML::Entities::encode($baseurl);
   
     my $now=time;      my $now=time;
     $msgcount++;      $msgcount++;
     my $partsubj=$subject;      my $partsubj=$subject;
Line 93  sub packagemsg { Line 97  sub packagemsg {
     if (defined($baseurl)) {      if (defined($baseurl)) {
  $result.= '<baseurl>'.$baseurl.'</baseurl>';   $result.= '<baseurl>'.$baseurl.'</baseurl>';
     }      }
       if (defined($attachmenturl)) {
    $result.= '<attachmenturl>'.$baseurl.'</attachmenturl>';
       }
     return $msgid,$result;      return $msgid,$result;
 }  }
   
Line 242  sub user_crit_received { Line 249  sub user_crit_received {
 # ======================================================== Normal communication  # ======================================================== Normal communication
   
 sub user_normal_msg_raw {  sub user_normal_msg_raw {
     my ($user,$domain,$subject,$message,$citation,$baseurl)=@_;      my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl)=@_;
 # Check if allowed missing  # Check if allowed missing
     my $status='';      my $status='';
     my $msgid='undefined';      my $msgid='undefined';
     unless (($message)&&($user)&&($domain)) { $status='empty'; };      unless (($message)&&($user)&&($domain)) { $status='empty'; };
     my $homeserver=&Apache::lonnet::homeserver($user,$domain);      my $homeserver=&Apache::lonnet::homeserver($user,$domain);
     if ($homeserver ne 'no_host') {      if ($homeserver ne 'no_host') {
        ($msgid,$message)=&packagemsg($subject,$message,$citation,$baseurl);         ($msgid,$message)=&packagemsg($subject,$message,$citation,$baseurl,
                                        $attachmenturl);
        $status=&Apache::lonnet::critical(         $status=&Apache::lonnet::critical(
            'put:'.$domain.':'.$user.':nohist_email:'.             'put:'.$domain.':'.$user.':nohist_email:'.
            &Apache::lonnet::escape($msgid).'='.             &Apache::lonnet::escape($msgid).'='.
Removed from v.1.50  
changed lines
  Added in v.1.51

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