--- loncom/interface/lonfeedback.pm	2004/11/15 22:48:51	1.137
+++ loncom/interface/lonfeedback.pm	2004/11/19 19:11:33	1.141
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.137 2004/11/15 22:48:51 albertel Exp $
+# $Id: lonfeedback.pm,v 1.141 2004/11/19 19:11:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -74,7 +74,7 @@ sub list_discussion {
 	if($ENV{'form.export'}) {
             $outputtarget = 'export';
         }
-    }    
+    }
     if (not &discussion_visible($status)) { return ''; }
     my @bgcols = ("#cccccc","#eeeeee");
     my $discussiononly=0;
@@ -106,7 +106,7 @@ sub list_discussion {
     my $userpickkey = $ressymb.'_userpick';
     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 %discinfo = ();
     my $showonlyunread = 0;
@@ -132,7 +132,6 @@ sub list_discussion {
             $prevread = $dischash{$lastkey};
         }
     }
-	  &Apache::lonnet::logthis("\n last read r symb ".$lastkey);
 
 # Get information about students and non-students in course for filtering display of posts
     my %roleshash = ();
@@ -639,38 +638,38 @@ to course faculty</font><br />
 <b>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>
 ENDDISCUSS
-        if ($ENV{'form.origpage'}) {
-            $discussion.='<input type="hidden" name="origpage" value="'.$ENV{'form.origpage'}.'" />'."\n";
-            foreach (@currnewattach) {
-                $discussion.='<input type="hidden" name="currnewattach" value="'.$_.'" />'."\n";
-            }
-        }
-        $discussion.="</form>\n";
-        if ($outputtarget ne 'tex') {
-            $discussion.=&generate_attachments_button('',$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,'',$mode);
-            if (@currnewattach > 0) {
-                $newattachmsg .= '<b>New attachments</b><br />';
-                if (@currnewattach > 1) {
-                    $newattachmsg .= '<ol>';
-                    foreach my $item (@currnewattach) {
-                        $item =~ m#.*/([^/]+)$#;
-                        $newattachmsg .= '<li><a href="'.$item.'">'.$1.'</a></li>'."\n";
+            if ($ENV{'form.origpage'}) {
+                $discussion.='<input type="hidden" name="origpage" value="'.$ENV{'form.origpage'}.'" />'."\n";
+                foreach (@currnewattach) {
+                    $discussion.='<input type="hidden" name="currnewattach" value="'.$_.'" />'."\n";
+                }
+            }
+            $discussion.="</form>\n";
+            if ($outputtarget ne 'tex') {
+                $discussion.=&generate_attachments_button('',$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,'',$mode);
+                if (@currnewattach > 0) {
+                    $newattachmsg .= '<b>New attachments</b><br />';
+                    if (@currnewattach > 1) {
+                        $newattachmsg .= '<ol>';
+                        foreach my $item (@currnewattach) {
+                            $item =~ m#.*/([^/]+)$#;
+                            $newattachmsg .= '<li><a href="'.$item.'">'.$1.'</a></li>'."\n";
+                        }
+                        $newattachmsg .= '</ol>'."\n";
+                    } else {
+                        $currnewattach[0] =~ m#.*/([^/]+)$#;
+                        $newattachmsg .= '<a href="'.$currnewattach[0].'">'.$1.'</a><br />'."\n";
                     }
-                    $newattachmsg .= '</ol>'."\n";
-                } else {
-                    $currnewattach[0] =~ m#.*/([^/]+)$#;
-                    $newattachmsg .= '<a href="'.$currnewattach[0].'">'.$1.'</a><br />'."\n";
                 }
-            }
-            $discussion.=$newattachmsg;
-	    $discussion.=&generate_preview_button();
-	}
+                $discussion.=$newattachmsg;
+	        $discussion.=&generate_preview_button();
+	    }
 	}
-        } else {
-	if (&discussion_open($status) &&
-	    &Apache::lonnet::allowed('pch',
-				   $ENV{'request.course.id'}.
-	($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
+    } else {
+        if (&discussion_open($status) &&
+            &Apache::lonnet::allowed('pch',
+    	        $ENV{'request.course.id'}.
+	        ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
 	    if ($outputtarget ne 'tex') {
 		$discussion.='<table bgcolor="#BBBBBB"><tr><td><a href="/adm/feedback?replydisc='.
 		    $ressymb.':::" '.$target.'>'.
@@ -966,7 +965,6 @@ sub build_posting_display {
                                     } else {
                                         $rolematch .= ':'.$sectionpick;
                                         $skiptest = 0;
-                                    }
                                 }
                                 if ($statusfilter) {
                                     if ($statusfilter eq 'all') {
@@ -980,7 +978,6 @@ sub build_posting_display {
                                     $$shown{$idx} = 1;
                                 } else {
                                     foreach my $role (@{$$roleinfo{$poster}}) {
-					&Apache::lonnet::logthis("\n rolematch $rolematch\nrole $role");
                                         if ($role =~ m/^$rolematch$/) {
                                             $$shown{$idx} = 1;
                                             last;
@@ -1679,6 +1676,7 @@ sub print_sortfilter_options {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
+    &Apache::lonenc::check_encrypt(\$symb);
     my @sections = ();
     my $section_sel = '';
     my $numsections = 0;
@@ -1815,15 +1813,14 @@ END
 sub print_showposters {
     my ($r,$symb,$previous,$feedurl,$sortposts) = @_;
 
-# backward compatibility (bulletin boards used to be 'wrapped')
-    my $ressymb=&wrap_symb($symb);
+    &Apache::lonenc::check_encrypt(\$symb);
     my $crs='/'.$ENV{'request.course.id'};
     if ($ENV{'request.course.sec'}) {
         $crs.='_'.$ENV{'request.course.sec'};
     }
     $crs=~s/\_/\//g;
     my $seeid=&Apache::lonnet::allowed('rin',$crs);
-    my %contrib=&Apache::lonnet::restore($ressymb,$ENV{'request.course.id'},
+    my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
                           $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
                           $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
     my %namesort = ();
@@ -2091,7 +2088,7 @@ ENDNOREDIRTWO
 }
 
 sub screen_header {
-    my ($feedurl) = @_;
+    my ($feedurl,$symb) = @_;
     my $msgoptions='';
     my $discussoptions='';
     unless (($ENV{'form.replydisc'}) || ($ENV{'form.editdisc'})) {
@@ -2117,7 +2114,7 @@ sub screen_header {
 	}
     }
     if ($ENV{'request.course.id'}) {
-	if (&discussion_open() &&
+	if (&discussion_open(undef,$symb) &&
 	    &Apache::lonnet::allowed('pch',
 				     $ENV{'request.course.id'}.
 				     ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
@@ -2127,7 +2124,7 @@ sub screen_header {
 	    $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><img src="/adm/lonMisc/feedback.gif" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
     if ($discussoptions) { 
@@ -2445,6 +2442,7 @@ sub modify_attachments {
     if ($idx) {
         &extract_attachments($attachmenturls,$idx,$numoldver,\$msg,\%attachments,\%currattach,$currdelold);
     }
+    &Apache::lonenc::check_encrypt(\$symb);
     $r->print(<<END);
 <html>
 <head>
@@ -2901,8 +2899,8 @@ ENDREDIR
       my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.symb'});
       my %discinfo;
 # ------------------------ Modify setting for read/unread toggle for each post 
-      if ($ENV{'form.toggoff'}) { $discinfo{$symb.'_readtoggle'}=1; }
-      if ($ENV{'form.toggon'})  { $discinfo{$symb.'_readtoggle'}=0;  }
+      if ($ENV{'form.toggoff'}) { $discinfo{$symb.'_readtoggle'}=0; }
+      if ($ENV{'form.toggon'})  { $discinfo{$symb.'_readtoggle'}=1; }
 # --------- Modify setting for identification of 'NEW' posts in this discussion
       if ($ENV{'form.markondisp'}) {
 	  $discinfo{$symb.'_lastread'} = time;
@@ -3011,7 +3009,7 @@ ENDREDIR
           unless (length($ENV{'form.addnewattach'})>131072) {
               my $subdir = 'feedback/'.$ENV{'form.timestamp'};
               my $newattachment=&Apache::lonnet::userfileupload('addnewattach',undef,$subdir);
-              push @currnewattach, $newattachment;
+	      push @currnewattach, $newattachment;
           }
       }
       my $attachmenturls;
@@ -3103,7 +3101,7 @@ ENDREDIR
       unless ($ENV{'form.sendit'}) {
 	  &Apache::loncommon::content_type($r,'text/html');
 	  $r->send_http_header;
-	  my $options=&screen_header($feedurl);
+	  my $options=&screen_header($feedurl,$symb);
 	  if ($options) {
 	      &mail_screen($r,$feedurl,$options);
 	  } else {