--- loncom/interface/lonfeedback.pm	2006/05/10 22:29:57	1.202
+++ loncom/interface/lonfeedback.pm	2006/06/29 21:22:09	1.205
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.202 2006/05/10 22:29:57 albertel Exp $
+# $Id: lonfeedback.pm,v 1.205 2006/06/29 21:22:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,6 +43,8 @@ use Apache::lonrss();
 use HTML::LCParser();
 use Apache::lonspeller();
 use Cwd;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 sub discussion_open {
     my ($status,$symb)=@_;
@@ -394,7 +396,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
 	    $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$ressymb.'" ><table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
 	    $discussion .='<tr><td bgcolor="#DDDDBB" colspan="'.$colspan.'">'.
 		'<table border="0" width="100%" bgcolor="#DDDDBB"><tr>';
-	    my $escsymb=&Apache::lonnet::escape($ressymb);
+	    my $escsymb=&escape($ressymb);
 	    if ($visible>2) {
 		$discussion.='<td align="left">'.
 		    '<a href="/adm/feedback?cmd=threadedon&amp;symb='.$escsymb;
@@ -694,8 +696,8 @@ END
         my $subject = '';
         if ($env{'form.origpage'}) {
             &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['addnewattach','deloldattach','delnewattach','timestamp','idx','subject','comment']);
-            $subject = &Apache::lonnet::unescape($env{'form.subject'});
-            $comment = &Apache::lonnet::unescape($env{'form.comment'});
+            $subject = &unescape($env{'form.subject'});
+            $comment = &unescape($env{'form.comment'});
             my @keepold = ();
             &process_attachments(\@currnewattach,\@currdelold,\@keepold);
             if (@currnewattach > 0) {
@@ -751,13 +753,13 @@ ENDDISCUSS
 	        ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
 	    if ($outputtarget ne 'tex') {
 		$discussion.='<a href="/adm/feedback?replydisc='.
-		    &Apache::lonnet::escape($ressymb).':::" '.$target.'>'.
+		    &escape($ressymb).':::" '.$target.'>'.
 		    '<img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" border="0" />'.
 		    &mt('Post Discussion').'</a><br />';
             }
 	}
 	$discussion.='<a href="/adm/feedback?sendmessageonly=1&symb='.
-	    &Apache::lonnet::escape($ressymb).
+	    &escape($ressymb).
 	    '"><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" border="0" />'.
 		    &mt('Send Message').'</td></tr></table>';
     }
@@ -769,7 +771,7 @@ sub build_posting_display {
     my @original=();
     my @index=();
     my $symb=&Apache::lonenc::check_decrypt($ressymb);
-    my $escsymb=&Apache::lonnet::escape($ressymb);
+    my $escsymb=&escape($ressymb);
     my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
 			  $env{'course.'.$env{'request.course.id'}.'.domain'},
 			  $env{'course.'.$env{'request.course.id'}.'.num'});
@@ -1419,18 +1421,17 @@ END
                   $parentmsg = $contrib{$idx.':replyto'};
               }
               unless (exists($env{'form.origpage'})) {
-                  my $anonflag = 0;
+                  my $anonflag = 'nonanon';
                   if ($contrib{$idx.':anonymous'}) {
-                      $anonflag = 1;
+                      $anonflag = 'anon';
                   }
                   $anonscript = (<<END);
   function setposttype () {
-      var currtype = $anonflag
-      if (currtype == 1) {
-          document.mailform.elements.discuss.value = 'anon'
-      }
-      if (currtype == 0) {
-          document.mailform.elements.discuss.value = 'nonanon'
+      var currtype = "$anonflag";
+      for (var i=0; i<document.mailform.discuss.length; i++) {
+	  if (document.mailform.elements.discuss[i].value == currtype ) {
+	      document.mailform.elements.discuss[i].checked=1;
+	  } 
       }
       return
   }
@@ -1444,8 +1445,8 @@ END
   }
 
   if ($env{'form.origpage'}) {
-      $subject = &Apache::lonnet::unescape($env{'form.subject'});
-      $comment = &Apache::lonnet::unescape($env{'form.comment'});
+      $subject = &unescape($env{'form.subject'});
+      $comment = &unescape($env{'form.comment'});
       &process_attachments(\@currnewattach,\@currdelold,\@keepold);
   }
   my $latexHelp=&Apache::loncommon::helpLatexCheatsheet();
@@ -1456,20 +1457,20 @@ END
     function gosubmit() {
         var rec=0;
         if (typeof(document.mailform.elements.discuss)!="undefined") {
-	    if (typeof(document.mailform.discuss.length) == "undefined") {
-		if (document.mailform.discuss.checked ) {
+	    if (typeof(document.mailform.elements.discuss.length) == "undefined") {
+		if (document.mailform.elements.discuss.checked ) {
 		    rec=1;
 		}
 	    } else {
-		for (var i=0; i<document.mailform.discuss.length; i++) {
-		    if (document.mailform.discuss[i].checked ) {
+		for (var i=0; i<document.mailform.elements.discuss.length; i++) {
+		    if (document.mailform.elements.discuss[i].checked ) {
 			rec=1;
 		    } 
 		}
 	    }
 	}
         if (typeof(document.mailform.elements.blog)!="undefined") {
-          if (document.mailform.blog.checked) {
+          if (document.mailform.elements.blog.checked) {
              rec=1;
           } 
         }
@@ -2649,6 +2650,7 @@ sub generate_preview_button {
     unless ($fieldname) { $fieldname='comment'; }
     my $pre=&mt("Show Preview and Check Spelling");
     return(<<ENDPREVIEW);
+<br />
 <form name="preview" action="/adm/feedback?preview=1" method="post" target="preview">
 <input type="hidden" name="subject">
 <input type="hidden" name="comment" />
@@ -2660,7 +2662,7 @@ ENDPREVIEW
 
 sub modify_attachments {
     my ($r,$currnewattach,$currdelold,$symb,$idx,$attachmenturls)=@_;
-    my $orig_subject = &Apache::lonnet::unescape($env{'form.subject'});
+    my $orig_subject = &unescape($env{'form.subject'});
     my $subject=&clear_out_html($orig_subject,undef,1);
     $subject=~s/\n/\<br \/\>/g;
     $subject=&Apache::lontexconvert::msgtexconverted($subject);
@@ -2779,6 +2781,7 @@ sub generate_attachments_button {
     my $origpage = $ENV{'REQUEST_URI'};
     my $att=$attachnum.' '.&mt("attachments");
     my $response = (<<END);
+<br />
 <form name="attachment" action="/adm/feedback?attach=$ressymb" method="post">
 Click to add/remove attachments:&nbsp;<input type="button" value="$att"
 onClick="if (typeof(document.mailform.onsubmit)=='function') {document.mailform.onsubmit();};this.form.comment.value=escape(document.mailform.comment.value);this.form.subject.value=escape(document.mailform.subject.value);