--- loncom/interface/lonfeedback.pm	2003/11/24 16:00:45	1.70
+++ loncom/interface/lonfeedback.pm	2004/02/13 15:03:39	1.77
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.70 2003/11/24 16:00:45 www Exp $
+# $Id: lonfeedback.pm,v 1.77 2004/02/13 15:03:39 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,24 +25,7 @@
 #
 # http://www.lon-capa.org/
 #
-# (Internal Server Error Handler
-#
-# (Login Screen
-# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14,
-# 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9 Gerd Kortemeyer)
-#
-# 3/1/1 Gerd Kortemeyer)
-#
-# 3/1,2/3,2/5,2/6,2/8 Gerd Kortemeyer
-# 2/9 Guy Albertelli
-# 2/10 Gerd Kortemeyer
-# 2/13 Guy Albertelli
-# 7/25 Gerd Kortemeyer
-# 7/26 Guy Albertelli
-# 7/26,8/10,10/1,11/5,11/6,12/27,12/29 Gerd Kortemeyer
-# YEAR=2002
-# 1/1,1/16 Gerd Kortemeyer
-#
+###
 
 package Apache::lonfeedback;
 
@@ -55,6 +38,11 @@ use Apache::lonlocal;
 
 sub list_discussion {
     my ($mode,$status,$symb)=@_;
+#    &Apache::lonnet::logthis("status is $status");
+    if (!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER'
+	  || $status eq 'OPEN')) {
+	return '';
+    }
     my $discussiononly=0;
     if ($mode eq 'board') { $discussiononly=1; }
     unless ($ENV{'request.course.id'}) { return ''; }
@@ -68,9 +56,15 @@ sub list_discussion {
     }
     unless ($symb) { return ''; }
     my $seeid=&Apache::lonnet::allowed('rin',$crs);
-    my $viewgrades=&Apache::lonnet::allowed('vgr',$crs);
+    my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)
+	&& ($symb=~/\.(problem|exam|quiz|assess|survey|form)$/));
     my @discussionitems=();
-    my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
+    # backward compatibility (bulletin boards used to be 'wrapped')
+    my $ressymb=$symb;
+    if ($mode eq 'board') {
+	$ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+    }
+    my %contrib=&Apache::lonnet::restore($ressymb,$ENV{'request.course.id'},
 			  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
 			  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
     my $visible=0;
@@ -147,25 +141,25 @@ sub list_discussion {
 			if ($seeid) {
 			    if ($hidden) {
 				$sender.=' <a href="/adm/feedback?unhide='.
-				    $symb.':::'.$idx.'">'.&mt('Make Visible').'</a>';
+				    $ressymb.':::'.$idx.'">'.&mt('Make Visible').'</a>';
 			    } else {
 				$sender.=' <a href="/adm/feedback?hide='.
-				    $symb.':::'.$idx.'">'.&mt('Hide').'</a>';
+				    $ressymb.':::'.$idx.'">'.&mt('Hide').'</a>';
 			    }                     
 			    $sender.=' <a href="/adm/feedback?deldisc='.
-				$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.'" '.$target.'>'.&mt('Reply').'</a>';
+				$ressymb.':::'.$idx.'">'.&mt('Delete').'</a>';
 			}
 		    } else {
 			if ($screenname) {
 			    $sender='<i>'.$screenname.'</i>';
 			}
 		    }
+		    if (&Apache::lonnet::allowed('pch',
+						 $ENV{'request.course.id'}.
+						 ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
+			$sender.=' <a href="/adm/feedback?replydisc='.
+			    $ressymb.':::'.$idx.'" '.$target.'>'.&mt('Reply').'</a>';
+		    }
 		    my $vgrlink;
 		    if ($viewgrades) {
 			$vgrlink=&Apache::loncommon::submlink('Submissions',
@@ -215,7 +209,7 @@ sub list_discussion {
 <form action="/adm/feedback" method="post" name="mailform" enctype="multipart/form-data">
 <input type="submit" name="discuss" value="Post Discussion" />
 <input type="submit" name="anondiscuss" value="Post Anonymous Discussion" />
-<input type="hidden" name="symb" value="$symb" />
+<input type="hidden" name="symb" value="$ressymb" />
 <input type="hidden" name="sendit" value="true" />
 <br />
 <font size="1">Note: in anonymous discussion, your name is visible only to
@@ -227,7 +221,16 @@ Attachment (128 KB max size): <input typ
 </form>
 ENDDISCUSS
       $discussion.=&generate_preview_button();
-   }
+    } else {
+	if (&Apache::lonnet::allowed('pch',
+				   $ENV{'request.course.id'}.
+	($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
+			    $discussion.='<table bgcolor="#BBBBBB"><tr><td><a href="/adm/feedback?replydisc='.
+				$symb.':::" '.$target.'>'.
+				'<img src="/adm/lonMisc/chat.gif" border="0" />'.
+				&mt('Post Discussion').'</a></td></tr></table>';
+			}
+    }
    return $discussion;
 }
 
@@ -250,6 +253,7 @@ sub mail_screen {
       }
   }
   my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
+  my $send=&mt('Send');
   $r->print(<<ENDDOCUMENT);
 <html>
 <head>
@@ -318,7 +322,7 @@ Attachment (128 KB max size): <input typ
 </p>
 <p>
 <input type="hidden" name="sendit" value="1" />
-<input type="button" value="Send Feedback" onClick='gosubmit();' />
+<input type="button" value="$send" onClick='gosubmit();' />
 </p>
 </form>
 ENDDOCUMENT
@@ -329,11 +333,11 @@ sub fail_redirect {
   my ($r,$feedurl) = @_;
   if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
   $r->print (<<ENDFAILREDIR);
+<html>
 <head><title>Feedback not sent</title>
 <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" />
 <b>Sorry, no recipients  ...</b>
@@ -346,12 +350,12 @@ sub redirect_back {
   my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status) = @_;
   if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
   $r->print (<<ENDREDIR);
+<html>
 <head>
 <title>Feedback sent</title>
 <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" />
 $typestyle
@@ -367,6 +371,7 @@ ENDREDIR
 sub no_redirect_back {
   my ($r,$feedurl) = @_;
   $r->print (<<ENDNOREDIR);
+<html>
 <head><title>Feedback not sent</title>
 <meta http-equiv="pragma" content="no-cache" />
 ENDNOREDIR
@@ -377,7 +382,6 @@ ENDNOREDIR
   
   $r->print (<<ENDNOREDIRTWO);
 </head>
-<html>
 <body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { self.close(); }'>
 <img align="right" src="/adm/lonIcons/lonlogos.gif" />
 <b>Sorry, no feedback possible on this resource  ...</b>
@@ -416,16 +420,17 @@ sub screen_header {
 	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;" /> '.
+	    $discussoptions='<input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;" '.
+		($ENV{'form.replydisc'}?' checked="1"':'').' /> '.
 		&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>'.&mt('Sending Messages').'</h2>'.$msgoptions; }
+    if ($msgoptions) { $msgoptions='<h2><img src="/adm/lonMisc/feedback.gif" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
     if ($discussoptions) { 
-	$discussoptions='<h2>'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
+	$discussoptions='<h2><img src="/adm/lonMisc/chat.gif" />'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
     return $msgoptions.$discussoptions;
 }
 
@@ -650,10 +655,11 @@ onClick="this.form.comment.value=documen
 </form>
 ENDPREVIEW
 }
+
 sub handler {
   my $r = shift;
   if ($r->header_only) {
-     $r->content_type('text/html');
+     &Apache::loncommon::content_type($r,'text/html');
      $r->send_http_header;
      return OK;
   }
@@ -665,7 +671,7 @@ sub handler {
 
   if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {
 # ----------------------------------------------------------------- Hide/unhide
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
     my $entry=$ENV{'form.hide'}?$ENV{'form.hide'}:$ENV{'form.unhide'};
@@ -694,20 +700,22 @@ sub handler {
     &redirect_back($r,&Apache::lonnet::clutter($url),
        &mt('Changed discussion status').'<br />','0','0');
   } elsif (($ENV{'form.threadedon'}) || ($ENV{'form.threadedoff'})) {
+      &Apache::loncommon::content_type($r,'text/html');
+      $r->send_http_header;
       if ($ENV{'form.threadedon'}) {
 	  &Apache::lonnet::put('environment',{'threadeddiscussion' => 'on'});
 	  &Apache::lonnet::appenv('environment.threadeddiscussion' => 'on');
       } else {
  	  &Apache::lonnet::del('environment',['threadeddiscussion']);
 	  &Apache::lonnet::delenv('environment\.threadeddiscussion');
-     }
+      }
       my $symb=$ENV{'form.threadedon'}?$ENV{'form.threadedon'}:$ENV{'form.threadedoff'};
       my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
       &redirect_back($r,&Apache::lonnet::clutter($url),
 		     &mt('Changed discussion view mode').'<br />','0','0');
   } elsif ($ENV{'form.deldisc'}) {
 # --------------------------------------------------------------- Hide for good
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
     my $entry=$ENV{'form.deldisc'};
@@ -734,6 +742,8 @@ sub handler {
        &mt('Changed discussion status').'<br />','0','0');
   } elsif ($ENV{'form.preview'}) {
 # -------------------------------------------------------- User wants a preview
+      $r->content_type('text/html');
+      $r->send_http_header;
       &show_preview($r);
   } else {
 # ------------------------------------------------------------- Normal feedback
@@ -762,10 +772,13 @@ sub handler {
   if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) {
       unless ($symb) { $goahead=0; }
   }
-
+  # backward compatibility (bulltin boards used to be 'wrapped')
+  if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
+      $feedurl=~s|^/adm/wrapper||;
+  }
   if ($goahead) {
 # Go ahead with feedback, no ambiguous reference
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
   
     if (