--- loncom/interface/lonfeedback.pm	2003/09/03 18:09:50	1.51
+++ loncom/interface/lonfeedback.pm	2003/09/15 18:43:54	1.56
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.51 2003/09/03 18:09:50 albertel Exp $
+# $Id: lonfeedback.pm,v 1.56 2003/09/15 18:43:54 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,6 +52,121 @@ use Apache::lonmsg();
 use Apache::loncommon();
 use Apache::lontexconvert();
 
+sub list_discussion {
+    my ($discussiononly,$symb)=@_;
+    unless ($ENV{'request.course.id'}) { return ''; }
+    my $crs='/'.$ENV{'request.course.id'};
+    if ($ENV{'request.course.sec'}) {
+	$crs.='_'.$ENV{'request.course.sec'};
+    }                 
+    $crs=~s/\_/\//g;
+    unless ($symb) {
+	$symb=&Apache::lonnet::symbread();
+    }
+    unless ($symb) { return ''; }
+    my $seeid=&Apache::lonnet::allowed('rin',$crs);
+    my $viewgrades=&Apache::lonnet::allowed('vgr',$crs);
+    my $discussion='';
+    my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
+			  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+			  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+    if ($contrib{'version'}) {
+	unless ($discussiononly) {
+	    $discussion.=
+		'<address><hr />';
+	}
+	my $idx;
+	for ($idx=1;$idx<=$contrib{'version'};$idx++) {
+	    my $hidden=($contrib{'hidden'}=~/\.$idx\./);
+	    my $deleted=($contrib{'deleted'}=~/\.$idx\./);
+	    unless ((($hidden) && (!$seeid)) || ($deleted)) {
+		my $message=$contrib{$idx.':message'};
+		$message=~s/\n/\<br \/\>/g;
+		$message=&Apache::lontexconvert::msgtexconverted($message);
+		if ($contrib{$idx.':attachmenturl'}) {
+		    my ($fname,$ft)
+                        =($contrib{$idx.':attachmenturl'}=~/\/(\w+)\.(\w+)$/);
+		    $message.='<p>Attachment: <a href="'.
+			&Apache::lonnet::tokenwrapper(
+                                             $contrib{$idx.':attachmenturl'}).
+			'"><tt>'.$fname.'.'.$ft.'</tt></a>';
+		}
+		if ($message) {
+		    if ($hidden) {
+			$message='<font color="#888888">'.$message.'</font>';
+		    }
+		    my $screenname=&Apache::loncommon::screenname(
+					    $contrib{$idx.':sendername'},
+					    $contrib{$idx.':senderdomain'});
+		    my $plainname=&Apache::loncommon::nickname(
+					    $contrib{$idx.':sendername'},
+					    $contrib{$idx.':senderdomain'});
+		    
+		    my $sender='Anonymous';
+		    if ((!$contrib{$idx.':anonymous'}) || ($seeid)) {
+			$sender=&Apache::loncommon::aboutmewrapper(
+					 $plainname,
+					 $contrib{$idx.':sendername'},
+					 $contrib{$idx.':senderdomain'}).' ('.
+					 $contrib{$idx.':sendername'}.' at '.
+					 $contrib{$idx.':senderdomain'}.')';
+			if ($contrib{$idx.':anonymous'}) {
+			    $sender.=' [anonymous] '.
+				$screenname;
+			}
+			if ($seeid) {
+			    if ($hidden) {
+				$sender.=' <a href="/adm/feedback?unhide='.
+				    $symb.':::'.$idx.'">Make Visible</a>';
+			    } else {
+				$sender.=' <a href="/adm/feedback?hide='.
+				    $symb.':::'.$idx.'">Hide</a>';
+			    }                     
+			    $sender.=' <a href="/adm/feedback?deldisc='.
+				$symb.':::'.$idx.'">Delete</a>';
+			}
+		    } else {
+			if ($screenname) {
+			    $sender='<i>'.$screenname.'</i>';
+			}
+		    }
+		    my $vgrlink;
+		    if ($viewgrades) {
+			$vgrlink=&Apache::loncommon::submlink('Submissions',
+            $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$symb);
+		    }
+		    $discussion.='<p><b>'.$sender.'</b> '.$vgrlink.' ('.
+			localtime($contrib{$idx.':timestamp'}).
+			'):<blockquote>'.$message.
+			'</blockquote></p>';
+	        }
+	    } 
+	}
+	unless ($discussiononly) {
+	    $discussion.='</address>';
+	}
+    }
+    if ($discussiononly) {
+	$discussion.=(<<ENDDISCUSS);
+<form action="/adm/feedback" method="post" name="mailform" enctype="multipart/form-data">
+<input type="submit" name="discuss" value="Post Discussion" />
+<input type="submit" name="anondiscuss" value="Post Anonymous Discussion" />
+<input type="hidden" name="symb" value="$symb" />
+<input type="hidden" name="sendit" value="true" />
+<br />
+<font size="1">Note: in anonymous discussion, your name is visible only to
+course faculty</font><br />
+<textarea name=comment cols=60 rows=10 wrap=hard></textarea>
+<p>
+Attachment (128 KB max size): <input type="file" name="attachment" />
+</p>
+</form>
+ENDDISCUSS
+      $discussion.=&generate_preview_button();
+   }
+   return $discussion;
+}
+
 sub mail_screen {
   my ($r,$feedurl,$options) = @_;
   my $bodytag=&Apache::loncommon::bodytag('Resource Feedback and Discussion',
@@ -465,7 +580,7 @@ sub handler {
     my $entry=$ENV{'form.hide'}?$ENV{'form.hide'}:$ENV{'form.unhide'};
 
     my ($symb,$idx)=split(/\:\:\:/,$entry);
-    my ($map,$ind,$url)=split(/\_\_\_/,$symb);
+    my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
 
     my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
                      $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
@@ -495,7 +610,7 @@ sub handler {
     my $entry=$ENV{'form.deldisc'};
 
     my ($symb,$idx)=split(/\:\:\:/,$entry);
-    my ($map,$ind,$url)=split(/\_\_\_/,$symb);
+    my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
 
     my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
                      $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
@@ -528,7 +643,7 @@ sub handler {
   unless ($symb) {
       $symb=$ENV{'form.symb'};
       if ($symb) {
-	  my ($map,$id,$url)=split(/\_\_\_/,$symb);
+	  my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
           $feedurl=&Apache::lonnet::clutter($url);
       }
   }
@@ -620,7 +735,10 @@ sub handler {
    }
   } else {
 # Ambiguous Problem Resource
-    $r->internal_redirect('/adm/ambiguous');
+
+	  &Apache::lonnet::cleanenv();
+
+      $r->internal_redirect('/adm/ambiguous');
   }
 }
   return OK;