--- loncom/interface/lonfeedback.pm	2005/06/06 20:40:01	1.167
+++ loncom/interface/lonfeedback.pm	2005/11/01 15:59:18	1.171
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.167 2005/06/06 20:40:01 www Exp $
+# $Id: lonfeedback.pm,v 1.171 2005/11/01 15:59:18 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,6 +45,7 @@ use Cwd;
 
 sub discussion_open {
     my ($status,$symb)=@_;
+    if ($env{'request.role.adv'}) { return 1; }
     if (defined($status) &&
 	!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER'
 	  || $status eq 'OPEN')) {
@@ -97,7 +98,7 @@ sub list_discussion {
     $ressymb=&wrap_symb($ressymb);
     my $encsymb=&Apache::lonenc::check_encrypt($ressymb);
     my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)
-		  && ($ressymb=~/\.(problem|exam|quiz|assess|survey|form)$/));
+		  && ($ressymb=~/\.(problem|exam|quiz|assess|survey|form|task)$/));
     
     my %usernamesort = ();
     my %namesort =();
@@ -113,7 +114,7 @@ sub list_discussion {
     my $toggkey = $ressymb.'_readtoggle';
     my $readkey = $ressymb.'_read';
     $ressymb=$encsymb;
-    my %dischash = &Apache::lonnet::get('nohist_'.$env{'request.course.id'}.'_discuss',[$lastkey,$showkey,$markkey,$visitkey,$ondispkey,$userpickkey,$toggkey,$readkey],$env{'user.domain'},$env{'user.name'});
+    my %dischash = &Apache::lonnet::get('nohist_'.$cid.'_discuss',[$lastkey,$showkey,$markkey,$visitkey,$ondispkey,$userpickkey,$toggkey,$readkey],$env{'user.domain'},$env{'user.name'});
     my %discinfo = ();
     my $showonlyunread = 0;
     my $showunmark = 0; 
@@ -154,7 +155,9 @@ sub list_discussion {
     my %roleshash = ();
     my %roleinfo = ();
     if ($env{'form.rolefilter'}) {
-        %roleshash = &Apache::lonnet::dump('nohist_userroles',$env{'course.'.$env{'request.course.id'}.'.domain'},$env{'course.'.$env{'request.course.id'}.'.num'});
+        %roleshash = &Apache::lonnet::dump('nohist_userroles',
+					   $env{'course.'.$cid.'.domain'},
+					   $env{'course.'.$cid.'.num'});
         foreach (keys %roleshash) {
             my ($role,$uname,$udom,$sec) = split/:/,$_;
             if ($role =~ /^cr/) {
@@ -171,9 +174,8 @@ sub list_discussion {
             }
         }
         my ($classlist) = &Apache::loncoursedata::get_classlist(
-                              $env{'request.course.id'},
-                              $env{'course.'.$env{'request.course.id'}.'.domain'},
-                              $env{'course.'.$env{'request.course.id'}.'.num'});
+                              $env{'course.'.$cid.'.domain'},
+                              $env{'course.'.$cid.'.num'});
         my $sec_index = &Apache::loncoursedata::CL_SECTION();
         my $status_index = &Apache::loncoursedata::CL_STATUS();
         while (my ($student,$data) = each %$classlist) {
@@ -245,7 +247,7 @@ sub list_discussion {
     my $now = time;
     $discinfo{$visitkey} = $visit;
 
-    &Apache::lonnet::put('nohist_'.$env{'request.course.id'}.'_discuss',\%discinfo,$env{'user.domain'},$env{'user.name'});
+    &Apache::lonnet::put('nohist_'.$cid.'_discuss',\%discinfo,$env{'user.domain'},$env{'user.name'});
     &build_posting_display(\%usernamesort,\%subjectsort,\%namesort,\%notshown,\%newitem,\%dischash,\%shown,\%alldiscussion,\%imsitems,\%imsfiles,\%roleinfo,\@discussionitems,\@replies,\@depth,\@posters,\$maxdepth,\$visible,\$newpostsflag,\$current,$status,$viewgrades,$seeid,$prevread,$sortposts,$encsymb,$target,$readkey,$showunmark,$showonlyunread,$totposters,\@rolefilter,\@sectionpick,$statusfilter,$toggkey,$outputtarget);
 
     my $discussion='';
@@ -2639,13 +2641,16 @@ sub newline_to_br {
 }
 
 sub generate_preview_button {
+    my ($formname,$fieldname)=@_;
+    unless ($formname) { $formname='mailform'; }
+    unless ($fieldname) { $fieldname='comment'; }
     my $pre=&mt("Show Preview and Check Spelling");
     return(<<ENDPREVIEW);
 <form name="preview" action="/adm/feedback?preview=1" method="post" target="preview">
 <input type="hidden" name="subject">
 <input type="hidden" name="comment" />
 <input type="button" value="$pre"
-onClick="if (typeof(document.mailform.onsubmit)=='function') {document.mailform.onsubmit();};this.form.comment.value=document.mailform.comment.value;this.form.subject.value=document.mailform.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
 }
@@ -3257,7 +3262,7 @@ ENDREDIR
       my $mode='board';
       my $status='OPEN';
       my $previous=$env{'form.previous'};
-      if ($feedurl =~ /\.(problem|exam|quiz|assess|survey|form|library)$/) {
+      if ($feedurl =~ /\.(problem|exam|quiz|assess|survey|form|library|task)$/) {
           $mode='problem';
           $status=$Apache::inputtags::status[-1];
       }
@@ -3296,7 +3301,7 @@ ENDREDIR
       }
       &Apache::lonenc::check_decrypt(\$symb);
       my $goahead=1;
-      if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+      if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form|task)$/) {
 	  unless ($symb) { $goahead=0; }
       }
       # backward compatibility (bulletin boards used to be 'wrapped')