--- loncom/interface/lonfeedback.pm 2004/08/31 22:27:10 1.122
+++ loncom/interface/lonfeedback.pm 2004/09/13 12:19:14 1.124
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.122 2004/08/31 22:27:10 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.124 2004/09/13 12:19:14 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -177,22 +177,30 @@ sub list_discussion {
# Override user's default if user specified display setting for this discussion
if (defined($dischash{$ondispkey})) {
- $markondisp = $dischash{$ondispkey};
+ unless ($dischash{$ondispkey} eq '') {
+ $markondisp = $dischash{$ondispkey};
+ }
}
if ($markondisp) {
$discinfo{$lastkey} = time;
}
if (defined($dischash{$showkey})) {
- $showonlyunread = $dischash{$showkey};
+ unless ($dischash{$showkey} eq '') {
+ $showonlyunread = $dischash{$showkey};
+ }
}
if (defined($dischash{$markkey})) {
- $showunmark = $dischash{$markkey};
+ unless ($dischash{$markkey} eq '') {
+ $showunmark = $dischash{$markkey};
+ }
}
if (defined($dischash{$visitkey})) {
- $visit = $dischash{$visitkey};
+ unless ($dischash{$visitkey} eq '') {
+ $visit = $dischash{$visitkey};
+ }
}
$visit ++;
@@ -618,8 +626,8 @@ END
my $subject = '';
if ($ENV{'form.origpage'}) {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['addnewattach','deloldattach','delnewattach','timestamp','idx','subject','comment']);
- $subject = &HTML::Entities::encode($ENV{'form.subject'},'<>&"');
- $comment = &HTML::Entities::encode($ENV{'form.comment'},'<>&"');
+ $subject = &Apache::lonnet::unescape($ENV{'form.subject'});
+ $comment = &Apache::lonnet::unescape($ENV{'form.comment'});
my @keepold = ();
&process_attachments(\@currnewattach,\@currdelold,\@keepold);
if (@currnewattach > 0) {
@@ -1308,8 +1316,8 @@ END
}
if ($ENV{'form.origpage'}) {
- $subject = $ENV{'form.subject'};
- $comment = $ENV{'form.comment'};
+ $subject = &Apache::lonnet::unescape($ENV{'form.subject'});
+ $comment = &Apache::lonnet::unescape($ENV{'form.comment'});
&process_attachments(\@currnewattach,\@currdelold,\@keepold);
}
my $latexHelp=&Apache::loncommon::helpLatexCheatsheet();
@@ -2433,7 +2441,8 @@ ENDPREVIEW
sub modify_attachments {
my ($r,$currnewattach,$currdelold,$symb,$idx,$attachmenturls)=@_;
- my $subject=&clear_out_html($ENV{'form.subject'});
+ my $orig_subject = &Apache::lonnet::unescape($ENV{'form.subject'});
+ my $subject=&clear_out_html($orig_subject);
$subject=~s/\n/\
/g;
$subject=&Apache::lontexconvert::msgtexconverted($subject);
my $timestamp=$ENV{'form.timestamp'};
@@ -2462,7 +2471,7 @@ $bodytag
- Subject:$subject + Subject: $subject END if ($idx) { if ($attachmenturls) { @@ -2569,7 +2578,7 @@ sub generate_attachments_button { my $response = (< |