--- loncom/interface/lonfeedback.pm	2003/09/15 13:38:19	1.55
+++ loncom/interface/lonfeedback.pm	2003/10/21 00:22:23	1.64
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.55 2003/09/15 13:38:19 www Exp $
+# $Id: lonfeedback.pm,v 1.64 2003/10/21 00:22:23 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,9 +51,12 @@ use Apache::Constants qw(:common);
 use Apache::lonmsg();
 use Apache::loncommon();
 use Apache::lontexconvert();
+use Apache::lonlocal;
 
 sub list_discussion {
-    my ($discussiononly,$symb)=@_;
+    my ($mode,$status,$symb)=@_;
+    my $discussiononly=0;
+    if ($mode eq 'board') { $discussiononly=1; }
     unless ($ENV{'request.course.id'}) { return ''; }
     my $crs='/'.$ENV{'request.course.id'};
     if ($ENV{'request.course.sec'}) {
@@ -66,17 +69,13 @@ 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'});
     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\./);
 	    unless ((($hidden) && (!$seeid)) || ($deleted)) {
@@ -86,10 +85,10 @@ sub list_discussion {
 		if ($contrib{$idx.':attachmenturl'}) {
 		    my ($fname,$ft)
                         =($contrib{$idx.':attachmenturl'}=~/\/(\w+)\.(\w+)$/);
-		    $message.='<p>Attachment: <a href="'.
+		    $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) {
@@ -102,7 +101,7 @@ sub list_discussion {
 					    $contrib{$idx.':sendername'},
 					    $contrib{$idx.':senderdomain'});
 		    
-		    my $sender='Anonymous';
+		    my $sender=&mt('Anonymous');
 		    if ((!$contrib{$idx.':anonymous'}) || ($seeid)) {
 			$sender=&Apache::loncommon::aboutmewrapper(
 					 $plainname,
@@ -111,19 +110,25 @@ sub list_discussion {
 					 $contrib{$idx.':sendername'}.' at '.
 					 $contrib{$idx.':senderdomain'}.')';
 			if ($contrib{$idx.':anonymous'}) {
-			    $sender.=' [anonymous] '.
+			    $sender.=' ['.&mt('anonymous').'] '.
 				$screenname;
 			}
 			if ($seeid) {
 			    if ($hidden) {
 				$sender.=' <a href="/adm/feedback?unhide='.
-				    $symb.':::'.$idx.'">Make Visible</a>';
+				    $symb.':::'.$idx.'">'.&mt('Make Visible').'</a>';
 			    } else {
 				$sender.=' <a href="/adm/feedback?hide='.
-				    $symb.':::'.$idx.'">Hide</a>';
+				    $symb.':::'.$idx.'">'.&mt('Hide').'</a>';
 			    }                     
 			    $sender.=' <a href="/adm/feedback?deldisc='.
-				$symb.':::'.$idx.'">Delete</a>';
+				$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) {
@@ -135,16 +140,17 @@ sub list_discussion {
 			$vgrlink=&Apache::loncommon::submlink('Submissions',
             $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$symb);
 		    }
-		    $discussion.='<p><b>'.$sender.'</b> '.$vgrlink.' ('.
+		    $discussionitems{$idx}='<p><b>'.$sender.'</b> '.$vgrlink.' ('.
 			localtime($contrib{$idx.':timestamp'}).
 			'):<blockquote>'.$message.
 			'</blockquote></p>';
 	        }
 	    } 
 	}
-	unless ($discussiononly) {
-	    $discussion.='</address>';
-	}
+    }
+    my $discussion='<hr />';
+    foreach (sort { $a <=> $b } keys %discussionitems) {
+	$discussion.=$discussionitems{$_};
     }
     if ($discussiononly) {
 	$discussion.=(<<ENDDISCUSS);
@@ -156,7 +162,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>
@@ -179,7 +185,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") {
@@ -219,24 +226,27 @@ 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" />
 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
@@ -247,12 +257,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>
@@ -264,15 +274,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>
@@ -284,7 +294,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/) { 
@@ -295,7 +305,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>
@@ -308,37 +318,39 @@ sub screen_header {
   my $discussoptions='';
   if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {
     $msgoptions= 
-      '<p><input type=checkbox name=author> Feedback to resource author';
+      '<p><input type="checkbox" name="author" /> '.
+      &mt('Feedback to resource author').'</p>';
   }
   if (&feedback_available(1)) {
     $msgoptions.=
-    '<br><input type=checkbox name=question> Question about resource content';
+    '<br /><input type="checkbox" name="question" /> '.
+    &mt('Question about resource content');
   }
   if (&feedback_available(0,1)) {
     $msgoptions.=
-      '<br><input type=checkbox name=course> '.
-	'Question/Comment/Feedback about course content';
+      '<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> '.
-	'Question/Comment/Feedback about course policy';
+      '<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;"> '.
-	'Contribution to course discussion of resource';
-    $discussoptions.='<br><input type="checkbox" name="anondiscuss" onClick="this.form.discuss.checked=false;"> '.
-	'Anonymous contribution to course discussion of resource'.
-        ' <i>(name only visible to course faculty)</i>';
+    $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>Sending Messages</h2>'.$msgoptions; }
+  if ($msgoptions) { $msgoptions='<h2>'.&mt('Sending Messages').'</h2>'.$msgoptions; }
   if ($discussoptions) { 
-     $discussoptions='<h2>Discussion Contributions</h2>'.$discussoptions; }
+     $discussoptions='<h2>'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
   return $msgoptions.$discussoptions;
 }
 
@@ -363,14 +375,14 @@ sub clear_out_html {
       # allows <B> <I> <P> <A> <LI> <OL> <UL> <EM> <BR> <TT> <STRONG> 
       # <BLOCKQUOTE> <DIV .*> <DIV> <IMG>
       my %html=(B=>1, I=>1, P=>1, A=>1, LI=>1, OL=>1, UL=>1, EM=>1,
-		BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, DIV=>1, IMG=>1);
+		BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, DIV=>1, IMG=>1,
+                M=>1);
 
       $message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/
 	  {($html{uc($2)}&&(length($1)<1000))?"\<$1":"\&lt;$1"}/ge;
       $message =~ s/(\<?\s*(\w+)[^\<\>]*)\>/
 	  {($html{uc($2)}&&(length($1)<1000))?"$1\>":"$1\&gt;"}/ge;
   } else {
-      $message=~s/\<\/*m\s*\>//g;
       $message=~s/\</\&lt\;/g;
       $message=~s/\>/\&gt\;/g;
   }
@@ -387,7 +399,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>
@@ -434,7 +446,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'})
 	     ) {
@@ -443,7 +455,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'})
 	     ) {
@@ -474,7 +486,7 @@ sub send_msg {
       unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_),
                'Feedback ['.$declutter.']',$email,$citations,$feedurl,
                 $attachmenturl)=~/ok/) {
-	$status.='<br>Error sending message to '.$_.'<br>';
+	$status.='<br />'.&mt('Error sending message to').' '.$_.'<br />';
       } else {
 	$sendsomething++;
       }
@@ -488,7 +500,7 @@ sub send_msg {
        $newrecord{'resource'}=$feedurl;
        $newrecord{'subnumber'}=$record{'subnumber'}+1;
        unless (&Apache::lonnet::cstore(\%newrecord,'_feedback') eq 'ok') {
-	   $status.='<br>Not registered<br>';
+	   $status.='<br />'.&mt('Not registered').'<br />';
        }
     }
        
@@ -519,7 +531,7 @@ sub adddiscuss {
                      $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
 		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
         my %storenewentry=($symb => time);
-        $status.='<br>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'});
@@ -530,13 +542,13 @@ sub adddiscuss {
        my %newrecord=();
        $newrecord{'resource'}=$symb;
        $newrecord{'subnumber'}=$record{'subnumber'}+1;
-       $status.='<br>Registering: '.
+       $status.='<br />'.&mt('Registering').': '.
                &Apache::lonnet::cstore(\%newrecord,'_discussion');
     }
     } else {
 	$status.='Failed.';
     }
-    return $status.'<br>';   
+    return $status.'<br />';   
 }
 
 # ----------------------------------------------------------- Preview function
@@ -601,7 +613,7 @@ sub handler {
 		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
 
     &redirect_back($r,&Apache::lonnet::clutter($url),
-       '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');
@@ -628,7 +640,7 @@ sub handler {
 		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
 
     &redirect_back($r,&Apache::lonnet::clutter($url),
-       'Changed discussion status<p>','0','0');
+       &mt('Changed discussion status').'<br />','0','0');
   } elsif ($ENV{'form.preview'}) {
 # -------------------------------------------------------- User wants a preview
       &show_preview($r);
@@ -638,6 +650,7 @@ sub handler {
   $feedurl=~s/^http\:\/\///;
   $feedurl=~s/^$ENV{'SERVER_NAME'}//;
   $feedurl=~s/^$ENV{'HTTP_HOST'}//;
+  $feedurl=~s/\?.+$//;
 
   my $symb=&Apache::lonnet::symbread($feedurl);
   unless ($symb) {
@@ -735,7 +748,7 @@ sub handler {
    }
   } else {
 # Ambiguous Problem Resource
-      if ( Apache::exists_config_define("MODPERL2") ) {
+      if ( &Apache::lonnet::mod_perl_version() == 2 ) {
 	  &Apache::lonnet::cleanenv();
       }
       $r->internal_redirect('/adm/ambiguous');