--- loncom/interface/lonfeedback.pm 2006/12/08 20:09:29 1.232
+++ loncom/interface/lonfeedback.pm 2006/12/09 16:07:34 1.234
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.232 2006/12/08 20:09:29 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.234 2006/12/09 16:07:34 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -90,8 +90,8 @@ sub list_discussion {
}
if (not &discussion_visible($status)) {
if ($mode ne 'board') {
- my $encsymb=&Apache::lonenc::check_encrypt($ressymb);
- return &send_message_link($encsymb);
+ &Apache::lonenc::check_encrypt(\$ressymb);
+ return &send_message_link($ressymb);
}
}
if ($group ne '' && $mode eq 'board') {
@@ -102,10 +102,11 @@ sub list_discussion {
my ($blocked,$blocktext) = &blocking_posts('boards',1);
if ($blocked) {
+ &Apache::lonenc::check_encrypt(\$ressymb);
if ($mode ne 'board') {
- my $encsymb=&Apache::lonenc::check_encrypt($ressymb);
- return $blocktext.'
'.&send_message_link($encsymb);
+ $blocktext.='
'.&send_message_link($ressymb);
}
+ return $blocktext;
}
my @bgcols = ("#cccccc","#eeeeee");
@@ -833,7 +834,7 @@ sub blocking_posts {
if ($showstatus) {
my $showstart = &Apache::lonlocal::locallocaltime($startblock);
my $showend = &Apache::lonlocal::locallocaltime($endblock);
- $output = &mt('Discussion postings will not be viewable for resources in this course between [_1] and [_2] because communication is being blocked.',$showstart, $showend).'
'.
+ $output = '
'.&mt('Discussion postings will not be viewable for resources in this course between [_1] and [_2] because communication is being blocked.',$showstart, $showend).'
'.
&Apache::loncommon::build_block_table($startblock,$endblock,
\%setters);
}
@@ -1755,6 +1756,7 @@ END
if ($env{'form.editdisc'} || $env{'form.replydisc'}) {
my $now = time;
my $ressymb = $symb;
+ &Apache::lonenc::check_encrypt(\$ressymb);
my $postidx = '';
if ($env{'form.editdisc'}) {
$postidx = $idx;
@@ -2498,7 +2500,7 @@ sub redirect_back {
$feedurl .= '?group='.$group.$refarg;
}
}
- $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+ &Apache::lonenc::check_encrypt(\$feedurl);
my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
my %onload;
if ($env{'environment.remote'} ne 'off') {
@@ -2555,7 +2557,7 @@ sub no_redirect_back {
my $end_page = &Apache::loncommon::end_page();
- $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+ &Apache::lonenc::check_encrypt(\$feedurl);
my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
$r->print (< '.
- &mt('Contribution to course discussion of resource');
+ $discussoptions='
'.
- ''.&mt('Change Screenname').'';
- }
+ &mt('Anonymous contribution to course discussion of resource').
+ ' ('.&mt('name only visible to course faculty').') '.
+ ''.&mt('Change Screenname').'';
}
my ($blockblog) = &blocking_posts('blogs');
if (!$blockblog) {
@@ -3782,13 +3781,22 @@ ENDREDIR
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
# Unable to give feedback
+ &Apache::lonenc::check_encrypt(\$feedurl);
&no_redirect_back($r,$feedurl);
return OK;
}
# --------------------------------------------------- Print login screen header
unless ($env{'form.sendit'}) {
+ &Apache::lonenc::check_encrypt(\$feedurl);
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
+ if (($env{'form.replydisc'}) || ($env{'form.editdisc'})) {
+ my ($blocked,$blocktext) = &blocking_posts('boards',1);
+ if ($blocked) {
+ $r->print(&blocked_reply_or_edit($blocktext));
+ return OK;
+ }
+ }
my $options=&screen_header($feedurl,$symb);
if ($options) {
&mail_screen($r,$feedurl,$options);
@@ -3880,6 +3888,15 @@ ENDREDIR
&redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$blog,$status,$env{'form.previous'},undef,undef,undef,undef,undef,undef,$group);
}
return OK;
+}
+
+sub blocked_reply_or_edit {
+ my ($blocktext) = @_;
+ return
+ &Apache::loncommon::start_page('Resource Feedback and Discussion').
+ $blocktext.'
'.
+ &mt('Back to previous page').
+ &Apache::loncommon::end_page();
}
sub wrap_symb {