--- loncom/interface/lonmsg.pm 2003/03/17 17:02:38 1.50
+++ 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.50 2003/03/17 17:02:38 albertel Exp $
+# $Id: lonmsg.pm,v 1.51 2003/03/30 21:58:17 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -56,13 +56,17 @@ use HTML::Entities();
# ===================================================================== Package
sub packagemsg {
- my ($subject,$message,$citation,$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;
@@ -93,6 +97,9 @@ sub packagemsg {
if (defined($baseurl)) {
$result.= ''.$baseurl.'';
}
+ if (defined($attachmenturl)) {
+ $result.= ''.$baseurl.'';
+ }
return $msgid,$result;
}
@@ -242,14 +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') {
- ($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).'='.