version 1.156, 2011/05/03 10:37:14
|
version 1.157, 2011/05/12 21:56:13
|
Line 110 use Apache::lonfeedback;
|
Line 110 use Apache::lonfeedback;
|
use Apache::lonrss(); |
use Apache::lonrss(); |
use Apache::lonselstudent(); |
use Apache::lonselstudent(); |
use lib '/home/httpd/lib/perl/'; |
use lib '/home/httpd/lib/perl/'; |
use LONCAPA; |
use LONCAPA qw(:DEFAULT :match); |
|
|
# Querystring component with sorting type |
# Querystring component with sorting type |
my $sqs=''; |
my $sqs=''; |
Line 814 sub discrit {
|
Line 814 sub discrit {
|
foreach my $key (sort(keys(%what))) { |
foreach my $key (sort(keys(%what))) { |
my %content=&Apache::lonmsg::unpackagemsg($what{$key}); |
my %content=&Apache::lonmsg::unpackagemsg($what{$key}); |
next if ($content{'senderdomain'} eq ''); |
next if ($content{'senderdomain'} eq ''); |
my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'}); |
my $description; |
|
if ($content{'courseid'} ne '') { |
|
if ($content{'courseid'} =~ m{/^$match_domain\_$match_courseid$}) { |
|
my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'},{'one_time' => 1}); |
|
if ($courseinfo{'description'} ne '') { |
|
$description = $courseinfo{'description'}; |
|
} |
|
} |
|
} |
$result .= &Apache::lonhtmlcommon::start_pick_box() |
$result .= &Apache::lonhtmlcommon::start_pick_box() |
.&Apache::lonhtmlcommon::row_title(&mt('From'),undef,'LC_oddrow_value') |
.&Apache::lonhtmlcommon::row_title(&mt('From'),undef,'LC_oddrow_value') |
.'<b>'.&Apache::loncommon::aboutmewrapper( |
.'<b>'.&Apache::loncommon::aboutmewrapper( |
Line 827 sub discrit {
|
Line 835 sub discrit {
|
.&Apache::lonhtmlcommon::row_title(&mt('Subject'),undef,'LC_oddrow_value') |
.&Apache::lonhtmlcommon::row_title(&mt('Subject'),undef,'LC_oddrow_value') |
.$content{'subject'} |
.$content{'subject'} |
.&Apache::lonhtmlcommon::row_closure(1); |
.&Apache::lonhtmlcommon::row_closure(1); |
if ($courseinfo{'description'}) { |
if ($description ne '') { |
$result .= &Apache::lonhtmlcommon::row_title(&mt('Course'),undef,'LC_oddrow_value') |
$result .= &Apache::lonhtmlcommon::row_title(&mt('Course'),undef,'LC_oddrow_value') |
.$courseinfo{'description'} |
.$description |
.&Apache::lonhtmlcommon::row_closure(1); |
.&Apache::lonhtmlcommon::row_closure(1); |
} |
} |
$result .= &Apache::lonhtmlcommon::row_title(&mt('Message'),undef,'LC_evenrow_value') |
$result .= &Apache::lonhtmlcommon::row_title(&mt('Message'),undef,'LC_evenrow_value') |
Line 987 sub get_course_desc {
|
Line 995 sub get_course_desc {
|
if (defined($env{'course.'.$fromcid.'.description'})) { |
if (defined($env{'course.'.$fromcid.'.description'})) { |
$description = $env{'course.'.$fromcid.'.description'}; |
$description = $env{'course.'.$fromcid.'.description'}; |
} else { |
} else { |
my %courseinfo=&Apache::lonnet::coursedescription($fromcid); |
if ($fromcid =~ m{/^$match_domain\_$match_courseid$}) { |
$description = $courseinfo{'description'}; |
my %courseinfo=&Apache::lonnet::coursedescription($fromcid, |
|
{'one_time' => 1}); |
|
$description = $courseinfo{'description'}; |
|
} |
|
} |
|
if ($description ne '') { |
|
$$descriptions{$fromcid} = $description; |
} |
} |
$$descriptions{$fromcid} = $description; |
|
} |
} |
return $description; |
return $description; |
} |
} |
Line 2408 sub displaymessage {
|
Line 2421 sub displaymessage {
|
my $number_of_messages = scalar(@messages); #subtract 1 for last index |
my $number_of_messages = scalar(@messages); #subtract 1 for last index |
# start output |
# start output |
&printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'}); |
&printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'}); |
my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'}); |
|
|
|
# Prepare available functions |
# Prepare available functions |
my @functionlist; |
my @functionlist; |
Line 2667 sub displaymessage {
|
Line 2679 sub displaymessage {
|
} |
} |
|
|
# Course |
# Course |
if ($content{'courseid'}) { |
if ($content{'courseid'} ne '') { |
$r->print(&Apache::lonhtmlcommon::row_title(&mt($crstype)) |
if ($content{'courseid'} =~ m{^$match_domain\_$match_courseid$}) { |
.$courseinfo{'description'} |
my %courseinfo; |
); |
%courseinfo=&Apache::lonnet::coursedescription($content{'courseid'}, |
if ($content{'coursesec'}) { |
{'one_time' => 1}); |
$r->print(' ('.&mt('Section').': '.$content{'coursesec'}.')'); |
my $description = $courseinfo{'description'}; |
|
if ($description ne '') { |
|
$r->print(&Apache::lonhtmlcommon::row_title(&mt($crstype)) |
|
.$description |
|
); |
|
if ($content{'coursesec'}) { |
|
$r->print(' ('.&mt('Section').': '.$content{'coursesec'}.')'); |
|
} |
|
$r->print(&Apache::lonhtmlcommon::row_closure()); |
|
} |
} |
} |
$r->print(&Apache::lonhtmlcommon::row_closure()); |
|
} |
} |
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Time')) |
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Time')) |
.$content{'time'} |
.$content{'time'} |