--- loncom/interface/lonfeedback.pm	2004/05/05 21:04:14	1.80
+++ loncom/interface/lonfeedback.pm	2004/05/11 10:42:41	1.83
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.80 2004/05/05 21:04:14 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.83 2004/05/11 10:42:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,7 +37,7 @@ use Apache::lontexconvert();
 use Apache::lonlocal;
 
 sub list_discussion {
-    my ($mode,$status,$symb,$previous)=@_;
+    my ($mode,$status,$symb)=@_;
 #    &Apache::lonnet::logthis("status is $status");
     if (!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER'
 	  || $status eq 'OPEN')) {
@@ -71,15 +71,27 @@ sub list_discussion {
     my %dischash = &Apache::lonnet::get('nohist_'.$ENV{'request.course.id'}.'_discuss',[$lastkey,$showkey,$visitkey],$ENV{'user.domain'},$ENV{'user.name'});
     my $showonlyunread = 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.
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['previous']);
+    $previous = $ENV{'form.previous'};
     if ($previous > 0) {
         $prevread = $previous;
     } elsif (defined($dischash{$lastkey})) {
         $prevread = $dischash{$lastkey};
     }
 
+# Get discussion display default setting for user
+    my %userenv = &Apache::lonnet::get('environment',['discdisplay'],$ENV{'user.domain'},$ENV{'user.name'});
+    my $discdisplay=$userenv{'discdisplay'};
+    if ($discdisplay eq 'unread') {
+        $showonlyunread = 1;
+    }
+
+# Override user's default if user specified display setting for this discussion 
     if (defined($dischash{$showkey})) {
         $showonlyunread = $dischash{$showkey};
     }
@@ -155,12 +167,13 @@ sub list_discussion {
                     $subject=&Apache::lontexconvert::msgtexconverted($subject);
                 }
 		if ($contrib{$idx.':attachmenturl'}) {
-		    my ($fname,$ft)
-                        =($contrib{$idx.':attachmenturl'}=~/\/(\w+)\.(\w+)$/);
-		    $message.='<p>'.&mt('Attachment').': <a href="'.
-			&Apache::lonnet::tokenwrapper(
-                                             $contrib{$idx.':attachmenturl'}).
-			'"><tt>'.$fname.'.'.$ft.'</tt></a></p>';
+		    my ($fname)
+                        =($contrib{$idx.':attachmenturl'}=~m|/([^/]+)$|);
+		    &Apache::lonnet::allowuploaded('/adm/feedback',
+					   $contrib{$idx.':attachmenturl'});
+		    $message.='<p>'.&mt('Attachment').
+			': <a href="'.$contrib{$idx.':attachmenturl'}.'"><tt>'.
+			$fname.'</tt></a></p>';
 		}
 		if ($message) {
 		    if ($hidden) {
@@ -972,7 +985,7 @@ sub handler {
       my $attachmenturl='';
       if ($ENV{'form.attachment.filename'}) {
 	  unless (length($ENV{'form.attachment'})>131072) {
-	      $attachmenturl=&Apache::lonnet::userfileupload('attachment');
+	      $attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,'feedback');
 	  }
       }
 # Filter HTML out of message (could be nasty)