--- loncom/interface/lonmsg.pm 2004/01/15 18:25:36 1.80
+++ loncom/interface/lonmsg.pm 2004/03/01 01:06:10 1.86
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging
#
-# $Id: lonmsg.pm,v 1.80 2004/01/15 18:25:36 www Exp $
+# $Id: lonmsg.pm,v 1.86 2004/03/01 01:06:10 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -139,6 +139,7 @@ sub packagemsg {
'
'.&mt('Subject').': '.$content{'subject'}.
'
'. &Apache::lontexconvert::msgtexconverted($content{'message'}). - ''. + ''. +&mt('You have to confirm that you received this message. After confirmation, this message will be moved to your regular inbox'). + '
Subject:
@@ -1056,14 +1060,18 @@ sub handler {
&Apache::loncommon::bodytag('EMail and Messages').
&Apache::loncommon::help_open_faq(12).
&Apache::loncommon::help_open_bug('Communication Tools'));
- $r->print(''.&mt('Subject').': '.$content{'subject'}.
- '
'.&mt('From').': '.
+ my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'});
+
+ $r->print('
'.&mt('Subject').': '.$content{'subject'}.
+ '
'.&mt('From').': '.
&Apache::loncommon::aboutmewrapper(
&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
$content{'sendername'},$content{'senderdomain'}).' ('.
$content{'sendername'}.' at '.
$content{'senderdomain'}.') '.
- '
'.&mt('Time').': '.$content{'time'}.'
'.
+ ($content{'courseid'}?'
'.&mt('Course').': '.$courseinfo{'description'}.
+($content{'coursesec'}?' ('.&mt('Group/Section').': '.$content{'coursesec'}.')':''):'').
+ '
'.&mt('Time').': '.$content{'time'}.'
'. '
'.&mt('Functions').': | '. ''.&mt('Reply').' | '. @@ -1084,7 +1092,7 @@ $content{'sendername'},$content{'senderd '">'.&mt('Next').''); } $r->print('
'. - &Apache::lontexconvert::msgtexconverted($content{'message'}). + &Apache::lontexconvert::msgtexconverted($content{'message'},1). '