--- loncom/interface/lonfeedback.pm	2006/05/09 20:00:44	1.198
+++ loncom/interface/lonfeedback.pm	2006/05/09 20:54:55	1.201
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.198 2006/05/09 20:00:44 albertel Exp $
+# $Id: lonfeedback.pm,v 1.201 2006/05/09 20:54:55 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1328,11 +1328,11 @@ sub mail_screen {
   my $attachnum = 0;
   my $anonchk = (<<END);
   function anonchk() {
-      if (document.mailform.discuss[0].checked) {
-	  document.attachment.discuss.value = 'nonanon';
-      }
-      if (document.mailform.discuss[1].checked) {
-	  document.attachment.discuss.value = 'anon';
+      for (var i=0; i < document.mailform.discuss.length; i++) {
+	  if (document.mailform.discuss[i].checked) {
+	      document.attachment.discuss.value = 
+		  document.mailform.discuss[i].value;
+	  }
       }
       if (document.mailform.blog.checked) {
 	  document.attachment.blog.value = 1;
@@ -1345,11 +1345,10 @@ END
       $anonscript = (<<END);
   function setposttype() {
       var disc = "$env{'form.discuss'}";
-      if (disc == 'nonanon') {
-          document.mailform.discuss[0].checked=1;
-      }
-      if (disc == 'anon') {
-          document.mailform.discuss[1].checked=1;
+      for (var i=0; i < document.mailform.discuss.length; i++) {
+	  if (disc == document.mailform.discuss[i].value) {
+	      document.mailform.discuss[i].checked = 1;
+	  }
       }
       var blog = "$env{'form.blog'}";
       if (blog == 1) {
@@ -2205,7 +2204,11 @@ sub redirect_back {
   }
   $feedurl=&Apache::lonenc::check_encrypt($feedurl);
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
-  my %onload = ('onload' => "if (window.name!='loncapaclient') { this.document.reldt.submit(); self.window.close(); }");
+  my %onload;
+  if ($env{'environment.remote'} ne 'off') {
+      $onload{'onload'} =
+	  "if (window.name!='loncapaclient') { this.document.reldt.submit(); self.window.close(); }";
+  }
   my $start_page=
       &Apache::loncommon::start_page('New posts marked as read',undef,
 				     {'redirect'    => [2,$feedurl],
@@ -2236,9 +2239,15 @@ sub no_redirect_back {
   my ($r,$feedurl) = @_;
   my $nofeed=&mt('Sorry, no feedback possible on this resource  ...');
  
+  my %onload;
+  if ($env{'environment.remote'} ne 'off') {
+      $onload{'onload'} = 
+	  "if (window.name!='loncapaclient') { self.window.close(); }";
+  }
+
   my %body_options = ('only_body'   => 1,
 		      'bgcolor'     => '#FFFFFF',
-		      'add_entries' => {'onload' => "if (window.name!='loncapaclient') { self.window.close(); }"});
+		      'add_entries' => \%onload,);
 
   if ($feedurl !~ m{^/adm/feedback}) { 
       $body_options{'rediect'} = [2,$feedurl];
@@ -3110,7 +3119,12 @@ sub handler {
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
       my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
-      my %onload = ('onload' => "if (window.name!='loncapaclient') { this.document.reldt.submit(); self.window.close(); }");
+      my %onload;
+      if ($env{'environment.remote'} ne 'off') {
+	  $onload{'onload'} =
+	      "if (window.name!='loncapaclient') { this.document.reldt.submit(); self.window.close(); }";
+      }
+
       my $start_page=
 	  &Apache::loncommon::start_page('New posts marked as read',undef,
 					 {'redirect'    => [2,$feedurl],
@@ -3416,9 +3430,9 @@ ENDREDIR
 # Discussion? Store that.
 
       my $numpost=0;
-      if ($env{'form.discuss'}) {
+      if ($env{'form.discuss'} || $env{'form.anondiscuss'}) {
 	  my $subject = &clear_out_html($env{'form.subject'},undef,1);
-	  my $anonmode=($env{'form.discuss'} eq 'anon');
+	  my $anonmode=($env{'form.discuss'} eq 'anon' || $env{'form.anondiscuss'} );
 	  $typestyle.=&adddiscuss($symb,$message,$anonmode,$attachmenturl,
 				  $subject);
 	  $numpost++;