--- loncom/interface/lonfeedback.pm	2002/07/24 19:57:38	1.28
+++ loncom/interface/lonfeedback.pm	2002/09/16 19:54:01	1.32
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.28 2002/07/24 19:57:38 www Exp $
+# $Id: lonfeedback.pm,v 1.32 2002/09/16 19:54:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,6 +53,8 @@ use Apache::loncommon();
 
 sub mail_screen {
   my ($r,$feedurl,$options) = @_;
+  my $bodytag=&Apache::loncommon::bodytag('Resource Feedback and Discussion',
+                                          '','onLoad="window.focus();"');
   $r->print(<<ENDDOCUMENT);
 <html>
 <head>
@@ -100,9 +102,7 @@ sub mail_screen {
     }
 </script>
 </head>
-<body bgcolor="#FFFFFF" onLoad="window.focus();">
-<img align=right src=/adm/lonIcons/lonlogos.gif>
-<h1>Resource Feedback and Discussion</h1>
+$bodytag
 <h2><tt>$feedurl</tt></h2>
 <form action="/adm/feedback" method=post name=mailform>
 <input type=hidden name=postdata value="$feedurl">
@@ -136,7 +136,7 @@ ENDFAILREDIR
 }
 
 sub redirect_back {
-  my ($r,$feedurl,$typestyle,$sendsomething,$status) = @_;
+  my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status) = @_;
   $r->print (<<ENDREDIR);
 <head>
 <title>Feedback sent</title>
@@ -147,7 +147,7 @@ sub redirect_back {
 <body bgcolor="#FFFFFF">
 <img align=right src=/adm/lonIcons/lonlogos.gif>
 $typestyle
-<b>Sent $sendsomething message(s).</b>
+<b>Sent $sendsomething message(s), and $sendposts post(s).</b>
 <font color=red>$status</font>
 </body>
 </html>
@@ -399,9 +399,8 @@ sub handler {
                      $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
 		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
 
-    &redirect_back($r,'/res/'.$url,'Changed discussion status<p>','0');
-
-      
+    &redirect_back($r,&Apache::lonnet::clutter($url),
+       'Changed discussion status<p>','0','0');
   } else {
 # ------------------------------------------------------------- Normal feedback
   my $feedurl=$ENV{'form.postdata'};
@@ -410,6 +409,13 @@ sub handler {
   $feedurl=~s/^$ENV{'HTTP_HOST'}//;
 
   my $symb=&Apache::lonnet::symbread($feedurl);
+  unless ($symb) {
+      $symb=$ENV{'form.symb'};
+      if ($symb) {
+	  my ($map,$id,$url)=split(/\_\_\_/,$symb);
+          $feedurl=&Apache::lonnet::clutter($url);
+      }
+  }
   my $goahead=1;
   if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) {
       unless ($symb) { $goahead=0; }
@@ -426,6 +432,8 @@ sub handler {
       ) 
       || 
       ($ENV{'request.course.id'} && ($feedurl!~m:^/adm:))
+      ||
+      ($ENV{'request.course.id'} && ($symb=~/^bulletin\_\_\_/))
      ) {
 # --------------------------------------------------- Print login screen header
     unless ($ENV{'form.sendit'}) {
@@ -460,17 +468,20 @@ sub handler {
 
 # Discussion? Store that.
 
+      my $numpost=0;
       if ($ENV{'form.discuss'}) {
 	  $typestyle.=&adddiscuss($symb,$message);
+	  $numpost++;
       }
 
       if ($ENV{'form.anondiscuss'}) {
 	  $typestyle.=&adddiscuss($symb,$message,1);
+	  $numpost++;
       }
 
 
 # Receipt screen and redirect back to where came from
-      &redirect_back($r,$feedurl,$typestyle,$numsent,$status);
+      &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$status);
 
     }
    } else {
@@ -487,7 +498,3 @@ sub handler {
 
 1;
 __END__
-
-
-
-
