--- loncom/interface/lonfeedback.pm 2004/08/31 15:54:48 1.99.2.4
+++ loncom/interface/lonfeedback.pm 2004/09/15 20:35:16 1.99.2.8
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.99.2.4 2004/08/31 15:54:48 albertel Exp $
+# $Id: lonfeedback.pm,v 1.99.2.8 2004/09/15 20:35:16 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -92,15 +92,13 @@ sub list_discussion {
# Get discussion display settings for this discussion
my $lastkey = $ressymb.'_lastread';
my $showkey = $ressymb.'_showonlyunread';
- my $visitkey = $ressymb.'_visit';
my $ondispkey = $ressymb.'_markondisp';
- my %dischash = &Apache::lonnet::get('nohist_'.$ENV{'request.course.id'}.'_discuss',[$lastkey,$showkey,$visitkey,$ondispkey],$ENV{'user.domain'},$ENV{'user.name'});
+ my %dischash = &Apache::lonnet::get('nohist_'.$ENV{'request.course.id'}.'_discuss',[$lastkey,$showkey,$ondispkey],$ENV{'user.domain'},$ENV{'user.name'});
my %discinfo = ();
my $showonlyunread = 0;
my $markondisp = 0;
my $prevread = 0;
my $previous = 0;
- my $visit = 0;
my $newpostsflag = 0;
# Retain identification of "NEW" posts identified in last display, if continuing 'previous' browsing of posts.
@@ -115,32 +113,28 @@ sub list_discussion {
}
# Get discussion display default settings for user
- my %userenv = &Apache::lonnet::get('environment',['discdisplay','discmarkread'],$ENV{'user.domain'},$ENV{'user.name'});
- my $discdisplay=$userenv{'discdisplay'};
- if ($discdisplay eq 'unread') {
+ if ($ENV{'environment.discdisplay'} eq 'unread') {
$showonlyunread = 1;
}
- my $discmarkread=$userenv{'discmarkread'};
- if ($discmarkread eq 'ondisp') {
+ if ($ENV{'environment.discmarkread'} eq 'ondisp') {
$markondisp = 1;
}
# Override user's default if user specified display setting for this discussion
if (defined($dischash{$ondispkey})) {
- $markondisp = $dischash{$ondispkey};
+ unless ($dischash{$showkey} eq '') {
+ $markondisp = $dischash{$ondispkey};
+ }
}
if ($markondisp) {
$discinfo{$lastkey} = time;
}
if (defined($dischash{$showkey})) {
- $showonlyunread = $dischash{$showkey};
- }
-
- if (defined($dischash{$visitkey})) {
- $visit = $dischash{$visitkey};
+ unless ($dischash{$showkey} eq '') {
+ $showonlyunread = $dischash{$showkey};
+ }
}
- $visit ++;
my $seeid=&Apache::lonnet::allowed('rin',$crs);
my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)
@@ -166,9 +160,9 @@ sub list_discussion {
}
my $now = time;
- $discinfo{$visitkey} = $visit;
-
- &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
+ if (%discinfo) {
+ &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
+ }
if ($contrib{'version'}) {
my $oldest = $contrib{'1:timestamp'};
@@ -223,13 +217,14 @@ sub list_discussion {
if ($hidden) {
$message=''.$message.'';
}
- my $screenname=&Apache::loncommon::screenname(
- $contrib{$idx.':sendername'},
- $contrib{$idx.':senderdomain'});
- my $plainname=&Apache::loncommon::nickname(
- $contrib{$idx.':sendername'},
- $contrib{$idx.':senderdomain'});
-
+# my $screenname=&Apache::loncommon::screenname(
+# $contrib{$idx.':sendername'},
+# $contrib{$idx.':senderdomain'});
+# my $plainname=&Apache::loncommon::nickname(
+# $contrib{$idx.':sendername'},
+# $contrib{$idx.':senderdomain'});
+ ($$screenname,$$plainname)=($$contrib{$idx.':screenname'},
+ $$contrib{$idx.':plainname'});
my $sender=&mt('Anonymous');
if ((!$contrib{$idx.':anonymous'}) || ($seeid)) {
$sender=&Apache::loncommon::aboutmewrapper(
@@ -779,6 +774,7 @@ sub fail_redirect {
Sorry, no recipients ...
+
Continue