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

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

version 1.46, 2002/12/30 14:10:58 version 1.51, 2003/03/30 21:58:17
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,$baseurl,$attachmenturl)=@_;
     $message=~s/\</\&lt\;/g;      $message =&HTML::Entities::encode($message);
     $message=~s/\>/\&gt\;/g;      $citation=&HTML::Entities::encode($citation);
     $citation=~s/\</\&lt\;/g;      $subject =&HTML::Entities::encode($subject);
     $citation=~s/\>/\&gt\;/g;      #remove machine specification
     $subject=~s/\</\&lt\;/g;      $baseurl =~ s|^http://[^/]+/|/|;
     $subject=~s/\>/\&gt\;/g;      $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 69  sub packagemsg { Line 74  sub packagemsg {
     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.':'.$$);
     return $msgid,      my $result='<sendername>'.$ENV{'user.name'}.'</sendername>'.
            '<sendername>'.$ENV{'user.name'}.'</sendername>'.  
            '<senderdomain>'.$ENV{'user.domain'}.'</senderdomain>'.             '<senderdomain>'.$ENV{'user.domain'}.'</senderdomain>'.
            '<subject>'.$subject.'</subject>'.             '<subject>'.$subject.'</subject>'.
    '<time>'.localtime($now).'</time>'.     '<time>'.localtime($now).'</time>'.
Line 86  sub packagemsg { Line 90  sub packagemsg {
    '<role>'.$ENV{'request.role'}.'</role>'.     '<role>'.$ENV{'request.role'}.'</role>'.
    '<resource>'.$ENV{'request.filename'}.'</resource>'.     '<resource>'.$ENV{'request.filename'}.'</resource>'.
            '<msgid>'.$msgid.'</msgid>'.             '<msgid>'.$msgid.'</msgid>'.
    '<message>'.$message.'</message>'.     '<message>'.$message.'</message>';
    '<citation>'.$citation.'</citation>';      if (defined($citation)) {
    $result.='<citation>'.$citation.'</citation>';
       }
       if (defined($baseurl)) {
    $result.= '<baseurl>'.$baseurl.'</baseurl>';
       }
       if (defined($attachmenturl)) {
    $result.= '<attachmenturl>'.$baseurl.'</attachmenturl>';
       }
       return $msgid,$result;
 }  }
   
 # ================================================== Unpack message into a hash  # ================================================== Unpack message into a hash
Line 236  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)=@_;      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);         ($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).'='.
Line 262  sub user_normal_msg_raw { Line 276  sub user_normal_msg_raw {
 # New routine that respects "forward" and calls old routine  # New routine that respects "forward" and calls old routine
   
 sub user_normal_msg {  sub user_normal_msg {
     my ($user,$domain,$subject,$message,$citation)=@_;      my ($user,$domain,$subject,$message,$citation,$baseurl)=@_;
     my $status='';      my $status='';
     my %userenv = &Apache::lonnet::get('environment',['msgforward'],      my %userenv = &Apache::lonnet::get('environment',['msgforward'],
                                        $domain,$user);                                         $domain,$user);
Line 272  sub user_normal_msg { Line 286  sub user_normal_msg {
  my ($forwuser,$forwdomain)=split(/\:/,$_);   my ($forwuser,$forwdomain)=split(/\:/,$_);
          $status.=           $status.=
   &user_normal_msg_raw($forwuser,$forwdomain,$subject,$message,    &user_normal_msg_raw($forwuser,$forwdomain,$subject,$message,
                                                              $citation).' ';         $citation,$baseurl).' ';
        }         }
     } else {       } else { 
  $status=   $status=&user_normal_msg_raw($user,$domain,$subject,$message,
           &user_normal_msg_raw($user,$domain,$subject,$message,$citation);       $citation,$baseurl);
     }      }
     return $status;      return $status;
 }  }
Line 713  sub handler { Line 727  sub handler {
 # ------------------------------------------------------ They checked for email  # ------------------------------------------------------ They checked for email
   &Apache::lonnet::put('email_status',{'recnewemail'=>0});    &Apache::lonnet::put('email_status',{'recnewemail'=>0});
 # --------------------------------------------------------------- Render Output  # --------------------------------------------------------------- Render Output
       if (!$ENV{'form.display'}) {
   $r->print('<html><head><title>EMail and Messaging</title>'.        $r->print('<html><head><title>EMail and Messaging</title>'.
             &Apache::loncommon::studentbrowser_javascript().'</head>'.   &Apache::loncommon::studentbrowser_javascript().'</head>'.
             &Apache::loncommon::bodytag('EMail and Messages'));   &Apache::loncommon::bodytag('EMail and Messages'));
     }
   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('<html><head><title>EMail and Messaging</title>');
         if (defined($content{'baseurl'})) {
     $r->print("<base href=\"http://$ENV{'SERVER_NAME'}/$content{'baseurl'}\" />");
         }
         $r->print(&Apache::loncommon::studentbrowser_javascript().
    '</head>'.
    &Apache::loncommon::bodytag('EMail and Messages'));
       $r->print('<b>Subject:</b> '.$content{'subject'}.        $r->print('<b>Subject:</b> '.$content{'subject'}.
              '<br><b>From:</b> '.               '<br><b>From:</b> '.
 &Apache::loncommon::aboutmewrapper(  &Apache::loncommon::aboutmewrapper(
Removed from v.1.46  
changed lines
  Added in v.1.51

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