--- loncom/interface/lonfeedback.pm	2003/10/21 00:22:23	1.64
+++ loncom/interface/lonfeedback.pm	2003/11/07 16:37:23	1.68
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.64 2003/10/21 00:22:23 www Exp $
+# $Id: lonfeedback.pm,v 1.68 2003/11/07 16:37:23 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,16 +69,42 @@ sub list_discussion {
     unless ($symb) { return ''; }
     my $seeid=&Apache::lonnet::allowed('rin',$crs);
     my $viewgrades=&Apache::lonnet::allowed('vgr',$crs);
-    my %discussionitems=();
+    my @discussionitems=();
     my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
 			  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
 			  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+    my $visible=0;
+    my @depth=();
+    my @original=();
+    my @index=();
+    my @replies=();
+    my %alldiscussion=();
+    my $maxdepth=0;
+
     if ($contrib{'version'}) {
 	for (my $id=1;$id<=$contrib{'version'};$id++) {
 	    my $idx=$id;
 	    my $hidden=($contrib{'hidden'}=~/\.$idx\./);
 	    my $deleted=($contrib{'deleted'}=~/\.$idx\./);
+	    my $origindex='0.';
+	    if ($contrib{$idx.':replyto'}) {
+# this is a follow-up message
+		$original[$idx]=$original[$contrib{$idx.':replyto'}];
+		$depth[$idx]=$depth[$contrib{$idx.':replyto'}]+1;
+		$origindex=$index[$contrib{$idx.':replyto'}];
+		if ($depth[$idx]>$maxdepth) { $maxdepth=$depth[$idx]; }
+	    } else {
+# this is an original message
+		$original[$idx]=0;
+		$depth[$idx]=0;
+	    }
+	    if ($replies[$depth[$idx]]) {
+		$replies[$depth[$idx]]++;
+	    } else {
+		$replies[$depth[$idx]]=1;
+	    }
 	    unless ((($hidden) && (!$seeid)) || ($deleted)) {
+		$visible++;
 		my $message=$contrib{$idx.':message'};
 		$message=~s/\n/\<br \/\>/g;
 		$message=&Apache::lontexconvert::msgtexconverted($message);
@@ -140,7 +166,15 @@ sub list_discussion {
 			$vgrlink=&Apache::loncommon::submlink('Submissions',
             $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$symb);
 		    }
-		    $discussionitems{$idx}='<p><b>'.$sender.'</b> '.$vgrlink.' ('.
+#figure out at what position this needs to print
+		    my $thisindex=$idx;
+#		    if ($ENV{'request.discussions.threaded'}) {
+		    if (1) {
+			$thisindex=$origindex.substr('00'.$replies[$depth[$idx]],-2,2);	
+		    }
+		    $alldiscussion{$thisindex}=$idx;
+		    $index[$idx]=$thisindex;
+		    $discussionitems[$idx]='<p><b>'.$sender.'</b> '.$vgrlink.' ('.
 			localtime($contrib{$idx.':timestamp'}).
 			'):<blockquote>'.$message.
 			'</blockquote></p>';
@@ -148,9 +182,14 @@ sub list_discussion {
 	    } 
 	}
     }
-    my $discussion='<hr />';
-    foreach (sort { $a <=> $b } keys %discussionitems) {
-	$discussion.=$discussionitems{$_};
+    my $discussion='';
+    if ($visible) {
+	$discussion.='<table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
+	foreach (sort { $a <=> $b } keys %alldiscussion) {
+	    $discussion.="\n<tr bgcolor='#CCCCCC'><td>".$discussionitems[$alldiscussion{$_}].
+		"</td></tr>";
+	}
+        $discussion.='</table>';
     }
     if ($discussiononly) {
 	$discussion.=(<<ENDDISCUSS);
@@ -234,6 +273,7 @@ $bodytag
 <form action="/adm/feedback" method="post" name="mailform"
 enctype="multipart/form-data">
 <input type="hidden" name="postdata" value="$feedurl" />
+<input type="hidden" name="replydisc" value="$ENV{'form.replydisc'}" />
 Please check at least one of the following feedback types:
 $options<hr />
 <p>My question/comment/feedback:</p>
@@ -313,45 +353,46 @@ ENDNOREDIRTWO
 }
 
 sub screen_header {
-  my ($feedurl) = @_;
-  my $msgoptions='';
-  my $discussoptions='';
-  if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {
-    $msgoptions= 
-      '<p><input type="checkbox" name="author" /> '.
-      &mt('Feedback to resource author').'</p>';
-  }
-  if (&feedback_available(1)) {
-    $msgoptions.=
-    '<br /><input type="checkbox" name="question" /> '.
-    &mt('Question about resource content');
-  }
-  if (&feedback_available(0,1)) {
-    $msgoptions.=
-      '<br /><input type="checkbox" name="course" /> '.
-	&mt('Question/Comment/Feedback about course content');
-  }
-  if (&feedback_available(0,0,1)) {
-    $msgoptions.=
-      '<br /><input type="checkbox" name="policy" /> '.
-	&mt('Question/Comment/Feedback about course policy');
-  }
-
-  if ($ENV{'request.course.id'}) {
-      if (&Apache::lonnet::allowed('pch',
-        $ENV{'request.course.id'}.
-        ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
-    $discussoptions='<input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;" /> '.
-	&mt('Contribution to course discussion of resource');
-    $discussoptions.='<br /><input type="checkbox" name="anondiscuss" onClick="this.form.discuss.checked=false;" /> '.
-	&mt('Anonymous contribution to course discussion of resource').
-        ' <i>('.&mt('name only visible to course faculty').')</i>';
+    my ($feedurl) = @_;
+    my $msgoptions='';
+    my $discussoptions='';
+    unless ($ENV{'form.replydisc'}) {
+	if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {
+	    $msgoptions= 
+		'<p><input type="checkbox" name="author" /> '.
+		&mt('Feedback to resource author').'</p>';
+	}
+	if (&feedback_available(1)) {
+	    $msgoptions.=
+		'<br /><input type="checkbox" name="question" /> '.
+		&mt('Question about resource content');
+	}
+	if (&feedback_available(0,1)) {
+	    $msgoptions.=
+		'<br /><input type="checkbox" name="course" /> '.
+		&mt('Question/Comment/Feedback about course content');
+	}
+	if (&feedback_available(0,0,1)) {
+	    $msgoptions.=
+		'<br /><input type="checkbox" name="policy" /> '.
+		&mt('Question/Comment/Feedback about course policy');
+	}
+    }
+    if ($ENV{'request.course.id'}) {
+	if (&Apache::lonnet::allowed('pch',
+				     $ENV{'request.course.id'}.
+				     ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
+	    $discussoptions='<input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;" /> '.
+		&mt('Contribution to course discussion of resource');
+	    $discussoptions.='<br /><input type="checkbox" name="anondiscuss" onClick="this.form.discuss.checked=false;" /> '.
+		&mt('Anonymous contribution to course discussion of resource').
+		' <i>('.&mt('name only visible to course faculty').')</i>';
       }
-  }
-  if ($msgoptions) { $msgoptions='<h2>'.&mt('Sending Messages').'</h2>'.$msgoptions; }
-  if ($discussoptions) { 
-     $discussoptions='<h2>'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
-  return $msgoptions.$discussoptions;
+    }
+    if ($msgoptions) { $msgoptions='<h2>'.&mt('Sending Messages').'</h2>'.$msgoptions; }
+    if ($discussoptions) { 
+	$discussoptions='<h2>'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
+    return $msgoptions.$discussoptions;
 }
 
 sub resource_output {
@@ -522,6 +563,9 @@ sub adddiscuss {
                                    $ENV{'environment.lastname'}.' '.
                                    $ENV{'enrironment.generation'},
                  'attachmenturl'=> $attachmenturl);
+    if ($ENV{'form.replydisc'}) {
+	$contrib{'replyto'}=(split(/\:\:\:/,$ENV{'form.replydisc'}))[1];
+    }
     if ($anon) {
 	$contrib{'anonymous'}='true';
     }
@@ -563,10 +607,11 @@ sub show_preview {
 }
 
 sub generate_preview_button {
+    my $pre=&mt("Show Preview");
     return(<<ENDPREVIEW);
 <form name="preview" action="/adm/feedback?preview=1" method="post" target="preview">
 <input type="hidden" name="comment" />
-<input type="button" value="Show Preview"
+<input type="button" value="$pre"
 onClick="this.form.comment.value=document.mailform.comment.value;this.form.submit();" />
 </form>
 ENDPREVIEW
@@ -582,7 +627,7 @@ sub handler {
 # --------------------------- Get query string for limited number of parameters
 
    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                             ['hide','unhide','deldisc','postdata','preview']);
+         ['hide','unhide','deldisc','postdata','preview','replydisc']);
 
   if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {
 # ----------------------------------------------------------------- Hide/unhide
@@ -652,7 +697,14 @@ sub handler {
   $feedurl=~s/^$ENV{'HTTP_HOST'}//;
   $feedurl=~s/\?.+$//;
 
-  my $symb=&Apache::lonnet::symbread($feedurl);
+  my $symb;
+  if ($ENV{'form.replydisc'}) {
+      $symb=(split(/\:\:\:/,$ENV{'form.replydisc'}))[0];
+      my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
+      $feedurl=&Apache::lonnet::clutter($url);
+  } else {
+      $symb=&Apache::lonnet::symbread($feedurl);
+  }
   unless ($symb) {
       $symb=$ENV{'form.symb'};
       if ($symb) {