--- loncom/interface/lonfeedback.pm	2009/11/26 05:21:43	1.280
+++ loncom/interface/lonfeedback.pm	2010/06/19 19:06:42	1.282.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.280 2009/11/26 05:21:43 faziophi Exp $
+# $Id: lonfeedback.pm,v 1.282.2.1 2010/06/19 19:06:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,15 +48,24 @@ use LONCAPA;
 
 sub discussion_open {
     my ($status,$symb)=@_;
+# Advanced roles can always discuss
     if ($env{'request.role.adv'}) { return 1; }
+# Get discussion closing date
+    my $close=&Apache::lonnet::EXT('resource.0.discussend',$symb);
+# If it is defined and in the future, the instructor wants this discussion to be open
+    if (defined($close) && $close ne '' && $close > time) {
+        return 1;
+    }
+# It was not explicitly open, check if the problem is available.
+# If the problem is not available, close the discussion
     if (defined($status) &&
-	!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER'
-	  || $status eq 'OPEN')) {
-	return 0;
+        !($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER'
+          || $status eq 'OPEN')) {
+        return 0;
     }
-    my $close=&Apache::lonnet::EXT('resource.0.discussend',$symb);
+# The problem is available, but check if the instructor explictly closed discussion
     if (defined($close) && $close ne '' && $close < time) {
-	return 0;
+        return 0;
     }
     return 1;
 }
@@ -356,10 +365,10 @@ sub list_discussion {
         $togglink = 'toggoff';
     } 
    
-    $chglink .= '&changes='.$displinkA.'_'.$displinkB.'_'.$marklink.'_'.$togglink;
+    $chglink .= '&amp;changes='.$displinkA.'_'.$displinkB.'_'.$marklink.'_'.$togglink;
 
     if ($newpostsflag) {
-        $chglink .= '&previous='.$prevread;
+        $chglink .= '&amp;previous='.$prevread;
     }
     $chglink.=&group_args($group);
 
@@ -416,13 +425,13 @@ imscp_v1p1.xsd http://www.imsglobal.org/
             }
 	} else {
             my $colspan=$maxdepth+1;
-            $discussion.= qq|
-<script>
+#JW
+            $discussion.= &Apache::lonhtmlcommon::scripttag(qq|
    function verifydelete (caller,symb,idx,newflag,previous,groupparm) {
        var symbparm = symb+':::'+idx
        var prevparm = ""
        if (newflag == 1) {
-           prevparm = "&previous="+previous
+           prevparm = "&amp;previous="+previous
        }
        if (caller == 'studentdelete') {
            if (confirm("$lt{'aysu'}\\n$lt{'dpwn'},\\n$lt{'bwco'}")) {
@@ -436,8 +445,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
            }
        }
    }
-</script>
-            |;
+            |);
 	    $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$ressymb.'" >'.
                          "\n".'<table class="LC_discussion">';
             $discussion .= &action_links_bar($colspan,$ressymb,$visible,
@@ -450,7 +458,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').' '.
@@ -569,7 +577,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
                  <table border="0" cellpadding="0" cellspacing="4">
                   <tr>
                    <td>
-                    <font size="-1"><b>$lt{'cuse'}</b>:</td>
+                    <font size="-1"><b>$lt{'cuse'}</b>:</font></td>
                    <td>&nbsp;</td>
                    <td><font size="-1">
 END
@@ -591,7 +599,7 @@ END
                    </font></td>
                    <td>&nbsp;</td>
                    <td align="left">
-                    <font size="-1"><b><a href="$chglink">$lt{'chgt'}</a>?</font></b>
+                    <font size="-1"><b><a href="$chglink">$lt{'chgt'}</a>?</b></font>
                    </td>
                   </tr>
                  </table>
@@ -646,7 +654,7 @@ END
                 $discussion.='<td align="right">'.
               '<input type="hidden" name="discsymb" value="'.$ressymb.'" />'."\n".
               '<input type="button" name="readoptions" value="'.$storebutton.'"'.
-              ' onClick="this.form.submit();" />'."\n".
+              ' onclick="this.form.submit();" />'."\n".
               '</td>';
             }
             $discussion .= (<<END);
@@ -784,26 +792,26 @@ 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;'.
                       '<a href="/adm/feedback?cmd=threadedoff&amp;symb='.$escsymb;
         if ($newpostsflag) {
-            $discussion .= '&previous='.$prevread;
+            $discussion .= '&amp;previous='.$prevread;
         }
         $discussion .= &group_args($group);
         $discussion .='">'.&mt('Chronological View').'</a>&nbsp;&nbsp;
                        <a href="/adm/feedback?cmd=sortfilter&amp;symb='.$escsymb;
         if ($newpostsflag) {
-            $discussion .= '&previous='.$prevread;
+            $discussion .= '&amp;previous='.$prevread;
         }
         $discussion .= &group_args($group);
         $discussion .='">'.&mt('Sorting/Filtering options').'</a>'.('&nbsp;' x2);
     }
     $discussion .='<a href="/adm/feedback?export='.$escsymb;
     if ($newpostsflag) {
-        $discussion .= '&previous='.$prevread;
+        $discussion .= '&amp;previous='.$prevread;
     }
     $discussion .= &group_args($group);
     $discussion .= '">'.&mt('Export').'?</a>&nbsp;&nbsp;</td>';
@@ -815,7 +823,7 @@ sub action_links_bar {
                            &mt('Preferences on what is marked as NEW').
                            '</a><br /><a href="/adm/feedback?markread=1&amp;symb='.$escsymb;
             $discussion .= &group_args($group);
-            $discussion .= '">'.&mt('Mark NEW posts no longer new').'</a>';
+            $discussion .= '">'.&mt('Mark NEW posts no longer new').'</a></td>';
         } else {
             $discussion .= '<td>&nbsp;</td>';
         }
@@ -848,7 +856,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 +1065,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>';
@@ -1075,7 +1083,7 @@ sub build_posting_display {
 			                $sender.=' <a href="/adm/feedback?unhide='.
 				                $escsymb.':::'.$idx;
                                         if ($$newpostsflag) {
-                                            $sender .= '&previous='.$prevread;
+                                            $sender .= '&amp;previous='.$prevread;
                                         }
                                         $sender .= '">'.&mt('Make Visible').'</a>';
                                     }
@@ -1083,7 +1091,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 +1132,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>';
@@ -1135,7 +1143,7 @@ sub build_posting_display {
 			         $sender.=' <a href="/adm/feedback?replydisc='.
 			                  $escsymb.':::'.$idx;
                                 if ($$newpostsflag) {
-                                    $sender .= '&previous='.$prevread;
+                                    $sender .= '&amp;previous='.$prevread;
                                 }
                                 $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
                             }
@@ -1245,24 +1253,24 @@ 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;'.
                                 '<b>'.$subject.'</b>&nbsp;&nbsp;'.
-                                $sender.'</b> '.$vgrlink.' ('.
+                                '<b>'.$sender.'</b> '.$vgrlink.' ('.
                                 &Apache::lonlocal::locallocaltime($posttime).')</td>';
                             if ($$dischash{$toggkey}) {
                                 $$discussionitems[$idx].='<td align="right">&nbsp;&nbsp;'.
                                   $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.');
@@ -1708,7 +1716,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
@@ -1745,7 +1753,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
@@ -1952,9 +1960,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());
@@ -1969,7 +1977,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());
@@ -1983,7 +1991,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'}.'" />');
@@ -2136,17 +2144,17 @@ $start_page
 <br /><br />
 <table border="0">
  <tr>
-  <td><b>$lt{'soor'}</b></td>
-  <td>&nbsp;</td>
-  <td><b>$lt{'sprs'}</b></td>
-  <td>&nbsp;</td>
-  <td><b>$lt{'spur'}</b></td>
-  <td>&nbsp;</td>
-  <td><b>$lt{'spse'}</b></td>
-  <td>&nbsp;</td>
-  <td><b>$lt{'spgr'}</b></td>
-  <td>&nbsp;</td>
-  <td><b>$lt{'psub'}</b></td>
+  <th>$lt{'soor'}</th>
+  <th>&nbsp;</th>
+  <th>$lt{'sprs'}</th>
+  <th>&nbsp;</th>
+  <th>$lt{'spur'}</th>
+  <th>&nbsp;</th>
+  <th>$lt{'spse'}</th>
+  <th>&nbsp;</th>
+  <th>$lt{'spgr'}</th>
+  <th>&nbsp;</th>
+  <th>$lt{'psub'}</th>
  </tr>
  <tr>
   <td align="center" valign="top">
@@ -2201,7 +2209,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'}.'" />');
@@ -2324,7 +2332,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
@@ -2427,7 +2435,7 @@ sub redirect_back {
   if ($previous > 0) {
       $qrystr = 'previous='.$previous;
       if ($feedurl =~ /\?register=1/) {
-          $feedurl .= '&'.$qrystr;
+          $feedurl .= '&amp;'.$qrystr;
       } else {
           $feedurl .= '?'.$qrystr;
       }
@@ -2436,18 +2444,18 @@ 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') {
-              $feedurl .= '&sectionpick=';
+              $feedurl .= '&amp;sectionpick=';
               $sectag .=  '<input type="hidden" name="sectionpick" value="';
               foreach my $sec (@{$sectionpick}) {
                   $feedurl .= $sec.',';
@@ -2457,11 +2465,11 @@ 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') {
-              $feedurl .= '&grouppick=';
+              $feedurl .= '&amp;grouppick=';
               $sectag .=  '<input type="hidden" name="grouppick" value="';
               foreach my $grp (@{$grouppick}) {
                   $feedurl .= $grp.',';
@@ -2471,11 +2479,11 @@ 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') {
-              $feedurl .= '&rolefilter=';
+              $feedurl .= '&amp;rolefilter=';
               $roletag .=  '<input type="hidden" name="rolefilter" value="';
               foreach my $role (@{$rolefilter}) {
                   $feedurl .= $role.',';
@@ -2485,10 +2493,10 @@ sub redirect_back {
               $roletag =~ s/,$//;
               $roletag .= '" />';
           } else {
-              $feedurl .= '&rolefilter='.$rolefilter;
+              $feedurl .= '&amp;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.'" />';
       }
   }
@@ -2994,7 +3002,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
 }
@@ -3053,7 +3061,7 @@ $toolarge
  <table class="LC_data_table">
   <tr>
    <td colspan="2">
-    <b>Subject:</b> $subject</b><br /><br />
+    <b>Subject:</b> <b>$subject</b><br /><br />
 END
     if ($idx) {
         if ($attachmenturls) {
@@ -3081,7 +3089,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>
@@ -3104,7 +3112,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
@@ -3151,7 +3159,7 @@ sub generate_attachments_button {
 <br />
 <form name="attachment" action="/adm/feedback?attach=$ressymb" method="post">
 $lt{'clic'}:&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);
+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);
 END
     if (!$blockblog) {
         $response .= 'setblogvalue();';