--- loncom/interface/lonmsg.pm	2003/02/18 15:47:40	1.49
+++ loncom/interface/lonmsg.pm	2003/03/30 21:58:17	1.51
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.49 2003/02/18 15:47:40 albertel Exp $
+# $Id: lonmsg.pm,v 1.51 2003/03/30 21:58:17 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,14 +56,17 @@ use HTML::Entities();
 # ===================================================================== Package
 
 sub packagemsg {
-    my ($subject,$message,$citation,$baseurl)=@_;
-    &Apache::lonnet::logthis("base is $baseurl");
+    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($baseurl);
+
     my $now=time;
     $msgcount++;
     my $partsubj=$subject;
@@ -94,6 +97,9 @@ sub packagemsg {
     if (defined($baseurl)) {
 	$result.= '<baseurl>'.$baseurl.'</baseurl>';
     }
+    if (defined($attachmenturl)) {
+	$result.= '<attachmenturl>'.$baseurl.'</attachmenturl>';
+    }
     return $msgid,$result;
 }
 
@@ -109,8 +115,6 @@ sub unpackagemsg {
 	   my $entry=$token->[1];
            my $value=$parser->get_text('/'.$entry);
            $content{$entry}=$value;
-	   &Apache::lonnet::logthis("setting $entry to $value");
-
        }
     }
     return %content;
@@ -245,15 +249,15 @@ sub user_crit_received {
 # ======================================================== Normal communication
 
 sub user_normal_msg_raw {
-    my ($user,$domain,$subject,$message,$citation,$baseurl)=@_;
+    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') {
-    &Apache::lonnet::logthis("baseraw is $baseurl");
-       ($msgid,$message)=&packagemsg($subject,$message,$citation,$baseurl);
+       ($msgid,$message)=&packagemsg($subject,$message,$citation,$baseurl,
+                                     $attachmenturl);
        $status=&Apache::lonnet::critical(
            'put:'.$domain.':'.$user.':nohist_email:'.
            &Apache::lonnet::escape($msgid).'='.