');
@@ -830,7 +776,7 @@ sub compout {
$dismsg=&mt('Forwarded message from').' '.
$content{'sendername'}.' '.&mt('at').' '.$content{'senderdomain'};
if ($content{'baseurl'}) {
- $disbase='';
+ $disbase='';
}
}
if ($replying) {
@@ -846,18 +792,20 @@ sub compout {
$dismsg=~s/\f/\n/g;
$dismsg=~s/\n+/\n\> /g;
if ($content{'baseurl'}) {
- $disbase='';
+ $disbase='';
if ($env{'user.adv'}) {
$disbase.=' '.
+ &escape($content{'baseurl'}).'" target="comments">'.
&mt('Show re-usable messages').' ';
}
}
}
my $citation=&displayresource(%content);
if ($env{'form.recdom'}) { $defdom=$env{'form.recdom'}; }
- $r->print(
+ if ($env{'form.text'}) { $dismsg=$env{'form.text'}; }
+ if ($env{'form.subject'}) { $dissub=$env{'form.subject'}; }
+ $r->print(
''.
&Apache::lonfeedback::generate_preview_button('compemail','message').
@@ -992,7 +942,7 @@ sub disfacetoface {
$result .='
'.&mt('Broadcast Message').'
';
if ($content{'subject'}=~/^Broadcast\./) {
if (defined($content{'coursemsgid'})) {
- my $crsmsgid = &Apache::lonnet::escape($content{'coursemsgid'});
+ my $crsmsgid = &escape($content{'coursemsgid'});
my $broadcast_message = &general_message($crsmsgid);
$content{'message'} = ''.&mt('Subject').': '.$content{'message'}.' '.$broadcast_message;
} else {
@@ -1005,7 +955,7 @@ sub disfacetoface {
} else {
$result.='
'.&mt('Critical Message').'
';
if (defined($content{'coursemsgid'})) {
- my $crsmsgid=&Apache::lonnet::escape($content{'coursemsgid'});
+ my $crsmsgid=&escape($content{'coursemsgid'});
my $critical_message = &general_message($crsmsgid);
$content{'message'} = ''.&mt('Subject').': '.$content{'message'}.' '.$critical_message;
} else {
@@ -1310,7 +1260,7 @@ END
my ($setuname,$setudom,$title) =
&parse_block_record($$records{$record});
- $title = &HTML::Entities::encode($title,'"<>');
+ $title = &HTML::Entities::encode($title,'"<>&');
my $settername = &Apache::loncommon::plainname($setuname,$setudom);
$r->print(&Apache::loncommon::start_data_table_row());
$r->print(<<"END");
@@ -1393,12 +1343,9 @@ sub blockcheck {
# for students.
return if (!%live_courses);
- &Apache::lonnet::logthis("hmm");
- &Apache::lonnet::logthis(join(" ",%live_courses));
- &Apache::lonnet::logthis(join(" ",%staff_of));
-
foreach my $course (keys(%live_courses)) {
- my ($cdom,$cnum) = split(/_/,$course);
+ my $cdom = $env{'course.'.$course.'.domain'};
+ my $cnum = $env{'course.'.$course.'.num'};
# if they are a staff member and are currently not playing student
next if ( $staff_of{$course}
@@ -1489,7 +1436,7 @@ sub displaymessage {
my $counter=0;
$r->print('
');
- my $escmsgid=&Apache::lonnet::escape($msgid);
+ my $escmsgid=&escape($msgid);
foreach (@messages) {
if ($_->[5] eq $escmsgid){
last;
@@ -1499,17 +1446,17 @@ sub displaymessage {
$r->print('
');
my $number_of_messages = scalar(@messages); #subtract 1 for last index
# start output
- &printheader($r,'/adm/email?display='.&Apache::lonnet::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'});
# Functions
$r->print('