--- loncom/interface/lonmsgdisplay.pm 2007/05/05 03:14:21 1.78
+++ loncom/interface/lonmsgdisplay.pm 2007/08/06 22:00:53 1.82
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.78 2007/05/05 03:14:21 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.82 2007/08/06 22:00:53 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -892,8 +892,7 @@ sub get_course_desc {
sub disall {
my ($r,$folder,$msgstatus)=@_;
- my %saveable = ('folder' => 'scalar',
- 'msgstatus' => 'scalar',
+ my %saveable = ('msgstatus' => 'scalar',
'sortedby' => 'scalar',
'interdis' => 'scalar',
);
@@ -1518,9 +1517,9 @@ sub additional_rec_row {
my $bcc = &mt('Bcc:');
my $output = <<"ENDADD";
$lt->{'ad'} : username:domain,username:domain, ...
- | $cc
+ | $cc
-$bcc |
+$bcc
ENDADD
return $output;
}
@@ -2074,6 +2073,22 @@ sub displaymessage {
$counter++;
}
$r->print('');
+
+ my $see_anonymous;
+ my $from_student = 0;
+ if ($env{'request.course.id'} eq $content{'courseid'}) {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $username = $content{'sendername'}.':'.$content{'senderdomain'};
+ my %classlist_entry =
+ &Apache::lonnet::get('classlist',[$username],$cdom,$cnum);
+ if (exists($classlist_entry{$username})) {
+ $from_student = 1;
+ $see_anonymous = &Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
+ }
+ }
+
+
my $number_of_messages = scalar(@messages); #subtract 1 for last index
# start output
&printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'});
@@ -2108,6 +2123,7 @@ sub displaymessage {
$symb=&Apache::lonnet::symbread($content{'baseurl'});
}
if ($env{'user.adv'}) {
+ my $adv_actions;
$r->print(''.&mt('Currently available actions (will open extra window)').': | ');
if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
$r->print(''.&Apache::loncommon::track_student_link(&mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check').' | ');
@@ -2147,7 +2163,10 @@ sub displaymessage {
if (defined($content{'baseurl'})) {
$baseurl = &Apache::lonenc::check_encrypt($content{'baseurl'});
}
- $r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}));
+ if ($from_student && $see_anonymous ) {
+ $r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}));
+ }
+
$r->print('
'.&mt('Subject').': '.$content{'subject'});
if ($folder eq 'sent') {
$r->print('
'.&mt('To').': '.$tolist);
@@ -2173,7 +2192,7 @@ sub displaymessage {
$replytoname.' '.&mt('at').' '.$replytodom);
}
} else {
- $r->print(' ('.$content{'sendername'}.' '&mt('at').' '.
+ $r->print(' ('.$content{'sendername'}.' '.&mt('at').' '.
$content{'senderdomain'}.') ');
}
if ($cclist) {