--- loncom/interface/lonmsg.pm	2003/02/17 17:39:53	1.48
+++ loncom/interface/lonmsg.pm	2003/03/31 16:34:08	1.52
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.48 2003/02/17 17:39:53 albertel Exp $
+# $Id: lonmsg.pm,v 1.52 2003/03/31 16:34:08 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,10 +56,17 @@ use HTML::Entities();
 # ===================================================================== Package
 
 sub packagemsg {
-    my ($subject,$message,$citation)=@_;
+    my ($subject,$message,$citation,$baseurl,$attachmenturl)=@_;
     $message =&HTML::Entities::encode($message);
     $citation=&HTML::Entities::encode($citation);
     $subject =&HTML::Entities::encode($subject);
+    #remove machine specification
+    $baseurl =~ s|^http://[^/]+/|/|;
+    $baseurl =&HTML::Entities::encode($baseurl);
+    #remove machine specification
+    $attachmenturl =~ s|^http://[^/]+/|/|;
+    $attachmenturl =&HTML::Entities::encode($attachmenturl);
+
     my $now=time;
     $msgcount++;
     my $partsubj=$subject;
@@ -67,8 +74,7 @@ sub packagemsg {
     my $msgid=&Apache::lonnet::escape(
            $now.':'.$partsubj.':'.$ENV{'user.name'}.':'.
            $ENV{'user.domain'}.':'.$msgcount.':'.$$);
-    return $msgid,
-           '<sendername>'.$ENV{'user.name'}.'</sendername>'.
+    my $result='<sendername>'.$ENV{'user.name'}.'</sendername>'.
            '<senderdomain>'.$ENV{'user.domain'}.'</senderdomain>'.
            '<subject>'.$subject.'</subject>'.
 	   '<time>'.localtime($now).'</time>'.
@@ -84,14 +90,23 @@ sub packagemsg {
 	   '<role>'.$ENV{'request.role'}.'</role>'.
 	   '<resource>'.$ENV{'request.filename'}.'</resource>'.
            '<msgid>'.$msgid.'</msgid>'.
-	   '<message>'.$message.'</message>'.
-	   '<citation>'.$citation.'</citation>';
+	   '<message>'.$message.'</message>';
+    if (defined($citation)) {
+	$result.='<citation>'.$citation.'</citation>';
+    }
+    if (defined($baseurl)) {
+	$result.= '<baseurl>'.$baseurl.'</baseurl>';
+    }
+    if (defined($attachmenturl)) {
+	$result.= '<attachmenturl>'.$attachmenturl.'</attachmenturl>';
+    }
+    return $msgid,$result;
 }
 
 # ================================================== Unpack message into a hash
 
 sub unpackagemsg {
-    my $message=shift;
+    my ($message,$notoken)=@_;
     my %content=();
     my $parser=HTML::TokeParser->new(\$message);
     my $token;
@@ -102,6 +117,16 @@ sub unpackagemsg {
            $content{$entry}=$value;
        }
     }
+    if ($content{'attachmenturl'}) {
+       my ($fname,$ft)=($content{'attachmenturl'}=~/\/(\w+)\.(\w+)$/);
+       if ($notoken) {
+	   $content{'message'}.='<p>Attachment: <tt>'.$fname.'.'.$ft.'</tt>';
+       } else {
+	   $content{'message'}.='<p>Attachment: <a href="'.
+	       &Apache::lonnet::tokenwrapper($content{'attachmenturl'}).
+	       '"><tt>'.$fname.'.'.$ft.'</tt></a>';
+       }
+    }
     return %content;
 }
 
@@ -210,7 +235,7 @@ sub user_crit_msg {
 sub user_crit_received {
     my $msgid=shift;
     my %message=&Apache::lonnet::get('critical',[$msgid]);
-    my %contents=&unpackagemsg($message{$msgid});
+    my %contents=&unpackagemsg($message{$msgid},1);
     my $status='rec: '.($contents{'sendback'}?
      &user_normal_msg($contents{'sendername'},$contents{'senderdomain'},
                      'Receipt: '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},
@@ -234,14 +259,15 @@ sub user_crit_received {
 # ======================================================== Normal communication
 
 sub user_normal_msg_raw {
-    my ($user,$domain,$subject,$message,$citation)=@_;
+    my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl)=@_;
 # Check if allowed missing
     my $status='';
     my $msgid='undefined';
     unless (($message)&&($user)&&($domain)) { $status='empty'; };
     my $homeserver=&Apache::lonnet::homeserver($user,$domain);
     if ($homeserver ne 'no_host') {
-       ($msgid,$message)=&packagemsg($subject,$message,$citation);
+       ($msgid,$message)=&packagemsg($subject,$message,$citation,$baseurl,
+                                     $attachmenturl);
        $status=&Apache::lonnet::critical(
            'put:'.$domain.':'.$user.':nohist_email:'.
            &Apache::lonnet::escape($msgid).'='.
@@ -260,7 +286,7 @@ sub user_normal_msg_raw {
 # New routine that respects "forward" and calls old routine
 
 sub user_normal_msg {
-    my ($user,$domain,$subject,$message,$citation)=@_;
+    my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl)=@_;
     my $status='';
     my %userenv = &Apache::lonnet::get('environment',['msgforward'],
                                        $domain,$user);
@@ -270,11 +296,11 @@ sub user_normal_msg {
 	 my ($forwuser,$forwdomain)=split(/\:/,$_);
          $status.=
 	  &user_normal_msg_raw($forwuser,$forwdomain,$subject,$message,
-                                                             $citation).' ';
+			       $citation,$baseurl,$attachmenturl).' ';
        }
     } else { 
-	$status=
-          &user_normal_msg_raw($user,$domain,$subject,$message,$citation);
+	$status=&user_normal_msg_raw($user,$domain,$subject,$message,
+				     $citation,$baseurl,$attachmenturl);
     }
     return $status;
 }
@@ -405,7 +431,7 @@ $content{'sendername'}.'@'.
 sub comprep {
     my ($r,$msgid)=@_;
       my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
-      my %content=&unpackagemsg($message{$msgid});
+      my %content=&unpackagemsg($message{$msgid},1);
       my $quotemsg='> '.$content{'message'};
       $quotemsg=~s/\r/\n/g;
       $quotemsg=~s/\f/\n/g;
@@ -711,15 +737,23 @@ sub handler {
 # ------------------------------------------------------ They checked for email
   &Apache::lonnet::put('email_status',{'recnewemail'=>0});
 # --------------------------------------------------------------- Render Output
-  
-  $r->print('<html><head><title>EMail and Messaging</title>'.
-            &Apache::loncommon::studentbrowser_javascript().'</head>'.
-            &Apache::loncommon::bodytag('EMail and Messages'));
+  if (!$ENV{'form.display'}) {
+      $r->print('<html><head><title>EMail and Messaging</title>'.
+		&Apache::loncommon::studentbrowser_javascript().'</head>'.
+		&Apache::loncommon::bodytag('EMail and Messages'));
+  }
   if ($ENV{'form.display'}) {
       my $msgid=$ENV{'form.display'};
       &statuschange($msgid,'read');
       my %message=&Apache::lonnet::get('nohist_email',[$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'}.
              '<br><b>From:</b> '.
 &Apache::loncommon::aboutmewrapper(
@@ -746,7 +780,7 @@ $content{'sendername'},$content{'senderd
   } elsif ($ENV{'form.sendreply'}) {
       my $msgid=$ENV{'form.sendreply'};
       my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
-      my %content=&unpackagemsg($message{$msgid});
+      my %content=&unpackagemsg($message{$msgid},1);
       &statuschange($msgid,'replied');
       if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
           (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
@@ -812,7 +846,7 @@ $content{'sendername'},$content{'senderd
       if ($ENV{'form.forwid'}) {
         my $msgid=$ENV{'form.forwid'};
         my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
-        %content=&unpackagemsg($message{$msgid});
+        %content=&unpackagemsg($message{$msgid},1);
         &statuschange($msgid,'forwarded');
         $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
 	                       $content{'message'};