--- loncom/interface/lonfeedback.pm	2003/10/15 20:01:48	1.62
+++ 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.62 2003/10/15 20:01:48 www Exp $
+# $Id: lonfeedback.pm,v 1.68 2003/11/07 16:37:23 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,20 +69,42 @@ sub list_discussion {
     unless ($symb) { return ''; }
     my $seeid=&Apache::lonnet::allowed('rin',$crs);
     my $viewgrades=&Apache::lonnet::allowed('vgr',$crs);
-    my $discussion='';
+    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'}) {
-	unless ($discussiononly) {
-	    $discussion.=
-		'<address><hr />';
-	}
-	my $idx;
-	for ($idx=1;$idx<=$contrib{'version'};$idx++) {
+	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);
@@ -92,7 +114,7 @@ sub list_discussion {
 		    $message.='<p>'.&mt('Attachment').': <a href="'.
 			&Apache::lonnet::tokenwrapper(
                                              $contrib{$idx.':attachmenturl'}).
-			'"><tt>'.$fname.'.'.$ft.'</tt></a>';
+			'"><tt>'.$fname.'.'.$ft.'</tt></a></p>';
 		}
 		if ($message) {
 		    if ($hidden) {
@@ -128,6 +150,12 @@ sub list_discussion {
 			    $sender.=' <a href="/adm/feedback?deldisc='.
 				$symb.':::'.$idx.'">'.&mt('Delete').'</a>';
 			}
+			if (&Apache::lonnet::allowed('pch',
+				   $ENV{'request.course.id'}.
+	($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
+			    $sender.=' <a href="/adm/feedback?replydisc='.
+				$symb.':::'.$idx.'">'.&mt('Reply').'</a>';
+			}
 		    } else {
 			if ($screenname) {
 			    $sender='<i>'.$screenname.'</i>';
@@ -138,16 +166,30 @@ sub list_discussion {
 			$vgrlink=&Apache::loncommon::submlink('Submissions',
             $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$symb);
 		    }
-		    $discussion.='<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>';
 	        }
 	    } 
 	}
-	unless ($discussiononly) {
-	    $discussion.='</address>';
+    }
+    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);
@@ -159,7 +201,7 @@ sub list_discussion {
 <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>
+<textarea name="comment" cols="60" rows="10" wrap="hard"></textarea>
 <p>
 Attachment (128 KB max size): <input type="file" name="attachment" />
 </p>
@@ -182,7 +224,8 @@ sub mail_screen {
 <head>
 <title>The LearningOnline Network with CAPA</title>
 <meta http-equiv="pragma" content="no-cache"></meta>
-<script>
+<script type="text/javascript">
+//<!--
     function gosubmit() {
         var rec=0;
         if (typeof(document.mailform.elements.author)!="undefined") {
@@ -222,24 +265,28 @@ sub mail_screen {
             alert('Please check a feedback type.');
 	}
     }
+//-->
 </script>
 </head>
 $bodytag
 <h2><tt>$title</tt></h2>
 <form action="/adm/feedback" method="post" name="mailform"
 enctype="multipart/form-data">
-<input type=hidden name=postdata value="$feedurl">
+<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>
-My question/comment/feedback:<p>
+$options<hr />
+<p>My question/comment/feedback:</p>
+<p>
 $latexHelp
-<textarea name=comment cols=60 rows=10 wrap=hard>
-</textarea><p>
+<textarea name="comment" cols="60" rows="10" wrap="hard">
+</textarea></p>
+<p>
 Attachment (128 KB max size): <input type="file" name="attachment" />
 </p>
 <p>
 <input type="hidden" name="sendit" value="1" />
-<input type=button value="Send Feedback" onClick='gosubmit();' />
+<input type="button" value="Send Feedback" onClick='gosubmit();' />
 </p>
 </form>
 ENDDOCUMENT
@@ -250,12 +297,12 @@ sub fail_redirect {
   my ($r,$feedurl) = @_;
   $r->print (<<ENDFAILREDIR);
 <head><title>Feedback not sent</title>
-<meta http-equiv="pragma" content="no-cache"></meta>
-<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">
+<meta http-equiv="pragma" content="no-cache" />
+<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
 </head>
 <html>
 <body bgcolor="#FFFFFF">
-<img align=right src=/adm/lonIcons/lonlogos.gif>
+<img align="right" src="/adm/lonIcons/lonlogos.gif" />
 <b>Sorry, no recipients  ...</b>
 </body>
 </html>
@@ -267,15 +314,15 @@ sub redirect_back {
   $r->print (<<ENDREDIR);
 <head>
 <title>Feedback sent</title>
-<meta http-equiv="pragma" content="no-cache"></meta>
+<meta http-equiv="pragma" content="no-cache" />
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">
 </head>
 <html>
 <body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { this.document.reldt.submit(); self.close(); }'>
-<img align=right src=/adm/lonIcons/lonlogos.gif>
+<img align="right" src="/adm/lonIcons/lonlogos.gif" />
 $typestyle
 <b>Sent $sendsomething message(s), and $sendposts post(s).</b>
-<font color=red>$status</font>
+<font color="red">$status</font>
 <form name="reldt" action="$feedurl" target="loncapaclient">
 </form>
 </body>
@@ -287,7 +334,7 @@ sub no_redirect_back {
   my ($r,$feedurl) = @_;
   $r->print (<<ENDNOREDIR);
 <head><title>Feedback not sent</title>
-<meta http-equiv="pragma" content="no-cache"></meta>
+<meta http-equiv="pragma" content="no-cache" />
 ENDNOREDIR
 
   if ($feedurl!~/^\/adm\/feedback/) { 
@@ -298,7 +345,7 @@ ENDNOREDIR
 </head>
 <html>
 <body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { self.close(); }'>
-<img align=right src=/adm/lonIcons/lonlogos.gif>
+<img align="right" src="/adm/lonIcons/lonlogos.gif" />
 <b>Sorry, no feedback possible on this resource  ...</b>
 </body>
 </html>
@@ -306,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');
-  }
-  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 {
@@ -392,7 +440,7 @@ ENDEMAIL
     my $citations=<<"ENDCITE";
 <h2>Previous attempts of student (if applicable)</h2>
 $prevattempts
-<p><hr>
+<br /><hr />
 <h2>Original screen output (if applicable)</h2>
 $usersaw
 <h2>Correct Answer(s) (if applicable)</h2>
@@ -439,7 +487,7 @@ sub decide_receiver {
     } 
   }
   if ($ENV{'form.course'}||$course) {
-    $typestyle.='Submitting as Comment<br>';
+    $typestyle.='Submitting as Comment<br />';
     foreach (split(/\,/,
 		   $ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'})
 	     ) {
@@ -448,7 +496,7 @@ sub decide_receiver {
     } 
   }
   if ($ENV{'form.policy'}||$policy) {
-    $typestyle.='Submitting as Policy Feedback<br>';
+    $typestyle.='Submitting as Policy Feedback<br />';
     foreach (split(/\,/,
 		   $ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'})
 	     ) {
@@ -479,7 +527,7 @@ sub send_msg {
       unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_),
                'Feedback ['.$declutter.']',$email,$citations,$feedurl,
                 $attachmenturl)=~/ok/) {
-	$status.='<br>'.&mt('Error sending message to').' '.$_.'<br>';
+	$status.='<br />'.&mt('Error sending message to').' '.$_.'<br />';
       } else {
 	$sendsomething++;
       }
@@ -493,7 +541,7 @@ sub send_msg {
        $newrecord{'resource'}=$feedurl;
        $newrecord{'subnumber'}=$record{'subnumber'}+1;
        unless (&Apache::lonnet::cstore(\%newrecord,'_feedback') eq 'ok') {
-	   $status.='<br>'.&mt('Not registered').'<br>';
+	   $status.='<br />'.&mt('Not registered').'<br />';
        }
     }
        
@@ -515,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';
     }
@@ -524,7 +575,7 @@ sub adddiscuss {
                      $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
 		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
         my %storenewentry=($symb => time);
-        $status.='<br>'.&mt('Updating discussion time').': '.
+        $status.='<br />'.&mt('Updating discussion time').': '.
         &Apache::lonnet::put('discussiontimes',\%storenewentry,
                      $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
 		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
@@ -535,13 +586,13 @@ sub adddiscuss {
        my %newrecord=();
        $newrecord{'resource'}=$symb;
        $newrecord{'subnumber'}=$record{'subnumber'}+1;
-       $status.='<br>'.&mt('Registering').': '.
+       $status.='<br />'.&mt('Registering').': '.
                &Apache::lonnet::cstore(\%newrecord,'_discussion');
     }
     } else {
 	$status.='Failed.';
     }
-    return $status.'<br>';   
+    return $status.'<br />';   
 }
 
 # ----------------------------------------------------------- Preview function
@@ -556,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
@@ -575,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
@@ -606,7 +658,7 @@ sub handler {
 		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
 
     &redirect_back($r,&Apache::lonnet::clutter($url),
-       &mt('Changed discussion status').'<p>','0','0');
+       &mt('Changed discussion status').'<br />','0','0');
   } elsif ($ENV{'form.deldisc'}) {
 # --------------------------------------------------------------- Hide for good
     $r->content_type('text/html');
@@ -633,7 +685,7 @@ sub handler {
 		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
 
     &redirect_back($r,&Apache::lonnet::clutter($url),
-       &mt('Changed discussion status').'<p>','0','0');
+       &mt('Changed discussion status').'<br />','0','0');
   } elsif ($ENV{'form.preview'}) {
 # -------------------------------------------------------- User wants a preview
       &show_preview($r);
@@ -645,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) {