--- loncom/interface/lonfeedback.pm	2010/01/25 03:30:23	1.273.4.5
+++ loncom/interface/lonfeedback.pm	2010/01/25 03:56:00	1.273.4.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.273.4.5 2010/01/25 03:30:23 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.273.4.6 2010/01/25 03:56:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -354,10 +354,10 @@ sub list_discussion {
         $togglink = 'toggoff';
     } 
    
-    $chglink .= '&changes='.$displinkA.'_'.$displinkB.'_'.$marklink.'_'.$togglink;
+    $chglink .= '&changes='.$displinkA.'_'.$displinkB.'_'.$marklink.'_'.$togglink;
 
     if ($newpostsflag) {
-        $chglink .= '&previous='.$prevread;
+        $chglink .= '&previous='.$prevread;
     }
     $chglink.=&group_args($group);
 
@@ -420,7 +420,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
        var symbparm = symb+':::'+idx
        var prevparm = ""
        if (newflag == 1) {
-           prevparm = "&previous="+previous
+           prevparm = "&previous="+previous
        }
        if (caller == 'studentdelete') {
            if (confirm("$lt{'aysu'}\\n$lt{'dpwn'},\\n$lt{'bwco'}")) {
@@ -448,7 +448,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
                 $discussion.="\n".'<tr><td bgcolor="#CCCCCC" colspan="'.$colspan.'">'.
                          '<a href="/adm/feedback?allposts=1&amp;symb='.$escsymb;
                 if ($newpostsflag) {
-                    $discussion .= '&previous='.$prevread;
+                    $discussion .= '&amp;previous='.$prevread;
                 }
 		$discussion .= &group_args($group);
                 $discussion .= '">'.&mt('Show all posts').'</a> '.&mt('to display').' '.
@@ -782,7 +782,7 @@ sub action_links_bar {
     if ($visible>2) {
         $discussion .= '<a href="/adm/feedback?cmd=threadedon&amp;symb='.$escsymb;
         if ($newpostsflag) {
-            $discussion .= '&previous='.$prevread;
+            $discussion .= '&amp;previous='.$prevread;
         }
         $discussion .= &group_args($group);
         $discussion .='">'.&mt('Threaded View').'</a>&nbsp;&nbsp;'.
@@ -846,7 +846,7 @@ sub postingform_display {
 <br /><a name="newpost"></a>
 <font size="1">$lt{'note'}</font><br />
 <b>$lt{'title'}:</b>&nbsp;<input type="text" name="subject" value="$subject" size="30" /><br /><br />
-<textarea name="comment" cols="80" rows="14" wrap="hard">$comment</textarea>
+<textarea name="comment" cols="80" rows="14">$comment</textarea>
 ENDDISCUSS
     if ($env{'form.origpage'}) {
         $postingform .= '<input type="hidden" name="origpage" value="'.
@@ -1057,7 +1057,7 @@ sub build_posting_display {
                                     $sender.=' <a href="/adm/feedback?editdisc='.
                                          $escsymb.':::'.$idx;
                                     if ($$newpostsflag) {
-                                        $sender .= '&previous='.$prevread;
+                                        $sender .= '&amp;previous='.$prevread;
                                     }
 				    $sender .= &group_args($group);
                                     $sender .= '" '.$target.'>'.&mt('Edit').'</a>';
@@ -1083,7 +1083,7 @@ sub build_posting_display {
 				    $sender.=' <a href="/adm/feedback?hide='.
 				        $escsymb.':::'.$idx;
                                     if ($$newpostsflag) {
-                                        $sender .= '&previous='.$prevread;
+                                        $sender .= '&amp;previous='.$prevread;
                                     }
 				    $sender .= &group_args($group);
                                     $sender .= '">'.&mt('Hide').'</a>';
@@ -1124,7 +1124,7 @@ sub build_posting_display {
                                  $sender.=' <a href="/adm/feedback?replydisc='.
                                           $escsymb.':::'.$idx;
                                 if ($$newpostsflag) {
-                                    $sender .= '&previous='.$prevread;
+                                    $sender .= '&amp;previous='.$prevread;
                                 }
                                 $sender .= &group_args($group);
                                 $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
@@ -1245,12 +1245,12 @@ sub build_posting_display {
                             if ($prevread > 0 && $prevread <= $posttime) {
                                 $$newitem{$idx} = 1;
                                 $$discussionitems[$idx] .= '
-                                 <p><table border="0" width="100%">
+                                 <table border="0" width="100%">
                                   <tr><td align="left"><font color="#FF0000"><b>'.&mt('NEW').'</b></font></td>';
                             } else {
                                 $$newitem{$idx} = 0;
                                 $$discussionitems[$idx] .= '
-                                 <p><table border="0" width="100%">
+                                 <table border="0" width="100%">
                                   <tr><td align="left">&nbsp;</td>';
                             }
                             $$discussionitems[$idx] .= '<td align="left">&nbsp;&nbsp;'.
@@ -1262,7 +1262,7 @@ sub build_posting_display {
                                   $ctlink.'</td>';
                             }
                             $$discussionitems[$idx].= '</tr></table><blockquote>'.
-                                    $message.'</blockquote></p>';
+                                    $message.'</blockquote>';
                             if ($contrib{$idx.':history'}) {
                                 my @postversions = ();
                                 $$discussionitems[$idx] .= &mt('This post has been edited by the author.');
@@ -1703,7 +1703,7 @@ $latexHelp
 <p>
 $lt{'title'}: <input type="text" name="subject" size="30" value="$subject" /></p>
 <p>
-<textarea name="comment" id="comment" cols="60" rows="10" wrap="hard">$comment
+<textarea name="comment" id="comment" cols="60" rows="10">$comment
 </textarea></p>
 <p>
 END
@@ -1740,7 +1740,7 @@ END
     $r->print(<<END);
 <p>
 <input type="hidden" name="sendit" value="1" />
-<input type="button" value="$send" onClick='gosubmit();' />
+<input type="button" value="$send" onclick='gosubmit();' />
 </p>
 </form>
 END
@@ -1947,9 +1947,9 @@ END
     $r->print(<<END);
        <td>$lt{'disa'}</td>
        <td>$lt{$discdisp}</td>
-       <td><label><input type="checkbox" name="discdisp" onClick="discdispChk('0')" />&nbsp;$lt{'chgt'} "$dispchangeA"</label>
+       <td><label><input type="checkbox" name="discdisp" onclick="discdispChk('0')" />&nbsp;$lt{'chgt'} "$dispchangeA"</label>
            <br />
-           <label><input type="checkbox" name="discdisp" onClick="discdispChk('1')" />&nbsp;$lt{'chgt'} "$dispchangeB"</label>
+           <label><input type="checkbox" name="discdisp" onclick="discdispChk('1')" />&nbsp;$lt{'chgt'} "$dispchangeB"</label>
        </td>
 END
     $r->print(&Apache::loncommon::end_data_table_row());
@@ -1964,7 +1964,7 @@ END
     $r->print(<<END);
        <td>$lt{'dotm'}</td>
        <td>$lt{$disctogg}</td>
-       <td><label><input type="checkbox" name="disctogg" onClick="discdispChk('2')" />$lt{'chgt'} "$toggchange"</label></td>
+       <td><label><input type="checkbox" name="disctogg" onclick="discdispChk('2')" />$lt{'chgt'} "$toggchange"</label></td>
 END
     my $save = &mt('Save');
     $r->print(&Apache::loncommon::end_data_table_row());
@@ -1978,7 +1978,7 @@ END
 <input type="hidden" name="$dispchgB" value="" />
 <input type="hidden" name="$markchg" value="" />
 <input type="hidden" name="$toggchg" value="" />
-<input type="button" name="sub" value="$save" onClick="javascript:setDisp()" />
+<input type="button" name="sub" value="$save" onclick="javascript:setDisp()" />
 END
     if (exists($env{'form.group'})) {
         $r->print('<input type="hidden" name="group" value="'.$env{'form.group'}.'" />');
@@ -2196,7 +2196,7 @@ $start_page
 <br />
 <input type="hidden" name="previous" value="$previous" />
 <input type="hidden" name="applysort" value="$symb" />
-<input type="button" name="sub" value="$lt{'stor'}" onClick="verifyFilter()" />
+<input type="button" name="sub" value="$lt{'stor'}" onclick="verifyFilter()" />
 END
     if (exists($env{'form.group'})) {
         $r->print('<input type="hidden" name="group" value="'.$env{'form.group'}.'" />');
@@ -2319,7 +2319,7 @@ END
 <br />
 <input type="hidden" name="sortposts" value="$sortposts" />
 <input type="hidden" name="userpick" value="$symb" />
-<input type="button" name="store" value="Display posts" onClick="javascript:document.pickpostersform.submit()" />
+<input type="button" name="store" value="Display posts" onclick="javascript:document.pickpostersform.submit()" />
 </form>
 $end_page
 END
@@ -2422,7 +2422,7 @@ sub redirect_back {
   if ($previous > 0) {
       $qrystr = 'previous='.$previous;
       if ($feedurl =~ /\?register=1/) {
-          $feedurl .= '&'.$qrystr;
+          $feedurl .= '&amp;'.$qrystr;
       } else {
           $feedurl .= '?'.$qrystr;
       }
@@ -2431,14 +2431,14 @@ sub redirect_back {
   if (defined($sort)) {
       my $sortqry = 'sortposts='.$sort;
       if (($feedurl =~ /\?register=1/) || ($feedurl =~ /\?previous=/)) {
-          $feedurl .= '&'.$sortqry;
+          $feedurl .= '&amp;'.$sortqry;
       } else {
           $feedurl .= '?'.$sortqry;
       }
       $sorttag = '<input type="hidden" name="sortposts" value="'.$sort.'" />';
       if (defined($numpicks)) {
           my $userpickqry = 'totposters='.$numpicks;
-          $feedurl .= '&'.$userpickqry;
+          $feedurl .= '&amp;'.$userpickqry;
           $userpicktag = '<input type="hidden" name="totposters" value="'.$numpicks.'" />';
       } else {
           if (ref($sectionpick) eq 'ARRAY') {
@@ -2452,7 +2452,7 @@ sub redirect_back {
               $sectag =~ s/,$//;
               $sectag .= '" />';
           } else {
-              $feedurl .= '&sectionpick='.$sectionpick;
+              $feedurl .= '&amp;sectionpick='.$sectionpick;
               $sectag = '<input type="hidden" name="sectionpick" value="'.$sectionpick.'" />';
           }
           if (ref($grouppick) eq 'ARRAY') {
@@ -2466,7 +2466,7 @@ sub redirect_back {
               $grptag =~ s/,$//;
               $grptag .= '" />';
           } else {
-              $feedurl .= '&grouppick='.$grouppick;
+              $feedurl .= '&amp;grouppick='.$grouppick;
               $grptag = '<input type="hidden" name="grouppick" value="'.$grouppick.'" />';
           }
           if (ref($rolefilter) eq 'ARRAY') {
@@ -2483,7 +2483,7 @@ sub redirect_back {
               $feedurl .= '&rolefilter='.$rolefilter;
               $roletag = '<input type="hidden" name="rolefilter" value="'.$rolefilter.'" />';
           }
-          $feedurl .= '&statusfilter='.$statusfilter;
+          $feedurl .= '&amp;statusfilter='.$statusfilter;
           $statustag ='<input type="hidden" name="statusfilter" value="'.$statusfilter.'" />';
       }
   }
@@ -2988,7 +2988,7 @@ sub generate_preview_button {
 <input type="hidden" name="subject" />
 <input type="hidden" name="comment" />
 <input type="button" value="$pre"
-onClick="if (typeof(document.$formname.onsubmit)=='function') {document.$formname.onsubmit();};this.form.comment.value=document.$formname.$fieldname.value;this.form.subject.value=document.$formname.subject.value;this.form.submit();" />
+onclick="if (typeof(document.$formname.onsubmit)=='function') {document.$formname.onsubmit();};this.form.comment.value=document.$formname.$fieldname.value;this.form.subject.value=document.$formname.subject.value;this.form.submit();" />
 </form>
 ENDPREVIEW
 }
@@ -3071,7 +3071,7 @@ END
    </td></tr>
    <tr>
     <td>
-   $lt{'adda'}</td><td><input type="file" name="addnewattach" /><input type="button" name="upload" value="Upload" onClick="this.form.submit()" />    
+   $lt{'adda'}</td><td><input type="file" name="addnewattach" /><input type="button" name="upload" value="Upload" onclick="this.form.submit()" />    
    </td>
   </tr>
   <tr>
@@ -3094,7 +3094,7 @@ END
         $r->print('<input type="hidden" name="deloldattach" value="'.$item.'" />'."\n");
     }
     $r->print(<<END);
- <input type="button" name="rtntoedit" value="$lt{'stch'}" onClick="setAction()" />
+ <input type="button" name="rtntoedit" value="$lt{'stch'}" onclick="setAction()" />
 </form>
 $end_page
 END