--- loncom/interface/lonfeedback.pm	2012/03/06 21:24:01	1.290.2.7.2.1
+++ loncom/interface/lonfeedback.pm	2010/08/26 03:59:16	1.301
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.290.2.7.2.1 2012/03/06 21:24:01 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.301 2010/08/26 03:59:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -58,15 +58,15 @@ sub discussion_open {
         return 1;
     }
 # It was not explicitly open, check if the problem is available.
-# If the problem is not available, close the discussion
+# If the problem is not available, close the discussion 
     if (defined($status) &&
-        !($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER'
-          || $status eq 'OPEN')) {
-        return 0;
+	!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER'
+	  || $status eq 'OPEN')) {
+	return 0;
     }
 # The problem is available, but check if the instructor explictly closed discussion
     if (defined($close) && $close ne '' && $close < time) {
-        return 0;
+	return 0;
     }
     return 1;
 }
@@ -282,10 +282,6 @@ sub list_discussion {
     my %anonhash=();
     my $anoncnt=0;
     my $target='';
-    unless ($env{'browser.interface'} eq 'textual' ||
-	    $env{'environment.remote'} eq 'off' ) {
-	$target='target="LONcom"';
-    }
 
     my $now = time;
     $discinfo{$visitkey} = $visit;
@@ -425,7 +421,6 @@ imscp_v1p1.xsd http://www.imsglobal.org/
             }
 	} else {
             my $colspan=$maxdepth+1;
-#JW
             $discussion.= &Apache::lonhtmlcommon::scripttag(qq|
    function verifydelete (caller,symb,idx,newflag,previous,groupparm) {
        var symbparm = symb+':::'+idx
@@ -728,9 +723,8 @@ END
             }
         }
 	if ((&discussion_open($status)) && ($outputtarget ne 'tex')) {
-            if (($group ne '') && ($mode eq 'board')) {
-                if ((&check_group_priv($group,'pgd') eq 'ok') &&
-                   ($ressymb =~ m{^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$})) {
+            if (($group ne '') && ($mode eq 'board')) {  
+                if (&check_group_priv($group,'pgd') eq 'ok') {
                     $discussion .=
 			&postingform_display($mode,$ressymb,$now,$subject,
 					     $comment,$outputtarget,$attachnum,
@@ -738,30 +732,19 @@ END
 					     $group,$crstype);
                 }
             } else {
-                if (&Apache::lonnet::allowed('pch',$env{'request.course.id'}.
-                    ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
-
-                    $discussion.=
-                        &postingform_display($mode,$ressymb,$now,$subject,
-                                             $comment,$outputtarget,$attachnum,
-                                             $currnewattach,$currdelold,'',$crstype);
-                } else {
-                    $discussion.= '<span class="LC_feedback_link">'.
-                                  &mt('This discussion is closed.').'</span>';
-                }
+	        $discussion.= 
+		    &postingform_display($mode,$ressymb,$now,$subject,
+					 $comment,$outputtarget,$attachnum,
+					 $currnewattach,$currdelold,'',$crstype);
             }
 	}
-        if (!(&discussion_open($status)) && ($outputtarget ne 'tex')) {
-            $discussion.= '<span class="LC_feedback_link">'.
-                          &mt('This discussion is closed.').'</span>';
-        }
     } elsif ($outputtarget ne 'tex') {
         $discussion.='<div class="LC_feedback_link">';
         if (&discussion_open($status) &&
             &Apache::lonnet::allowed('pch',
     	        $env{'request.course.id'}.
 	        ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
-	    $discussion.= &send_feedback_link($ressymb,$target);
+            $discussion.= &send_feedback_link($ressymb,$target);
             if ($env{'request.role.adv'}) {
                 my $close = &Apache::lonnet::EXT('resource.0.discussend',$ressymb);
                 if (defined($close) && $close ne '' && $close < time) {
@@ -769,7 +752,7 @@ END
                                                 &Apache::lonnet::plaintext('st',$crstype));
                 }
             }
-        } else {
+	} else {
             $discussion.= '<span class="LC_feedback_link">'.&mt('This discussion is closed.').'</span>';
         }
 	$discussion.= &send_message_link($ressymb).'</div>';
@@ -904,22 +887,22 @@ ENDDISCUSS
     }
     $postingform .= "</form>\n";
     $postingform .= &generate_attachments_button('',$attachnum,$ressymb,
-                                                 $now,$currnewattach,
-                                                 $currdelold,'',$mode,
-                                                 $blockblog);
+                                                     $now,$currnewattach,
+                                                     $currdelold,'',$mode,
+                                                     $blockblog);
     if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) {
         $newattachmsg = '<br /><b>'.$lt{'newa'}.'</b><br />';
         if (@{$currnewattach} > 1) {
-            $newattachmsg .= '<ol>';
-            foreach my $item (@{$currnewattach}) {
+             $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";
+         }
     }
     $postingform .= $newattachmsg;
     $postingform .= &generate_preview_button();
@@ -999,7 +982,7 @@ sub build_posting_display {
 	    } else {
 		$$replies[$$depth[$idx]]=1;
 	    }
-	    unless ((($hiddens{$idx}) && (!$seeid)) || ($deletions{$idx})) {
+            unless ((($hiddens{$idx}) && (!$seeid)) || ($deletions{$idx})) {
 		$$visible++;
                 if ($contrib{$idx.':history'}) {
                     if ($contrib{$idx.':history'} =~ /:/) {
@@ -1014,7 +997,7 @@ sub build_posting_display {
                 my %subjects = ();
                 my %attachtxt = ();
                 my %allattachments = ();
-                my ($screenname,$plainname,$showaboutme);
+                my ($screenname,$plainname);
                 my $sender = &mt('Anonymous');
 # Anonymous users getting number within a discussion
 # Since idx is in static order, this should give the same sequence every time. 
@@ -1024,7 +1007,7 @@ sub build_posting_display {
 		    $$anonhash{$key}=&mt('Anonymous').' '.$anoncnt;
 		}
                 my ($message,$subject,$vgrlink,$ctlink);
-                &get_post_contents(\%contrib,$idx,$seeid,$outputtarget,\%messages,\%subjects,\%allattachments,\%attachtxt,$imsfiles,\$screenname,\$plainname,\$showaboutme,$numoldver);
+                &get_post_contents(\%contrib,$idx,$seeid,$outputtarget,\%messages,\%subjects,\%allattachments,\%attachtxt,$imsfiles,\$screenname,\$plainname,$numoldver);
 
 
 # Set up for sorting by subject
@@ -1054,18 +1037,12 @@ sub build_posting_display {
                             }
                         }
 		        if (!$contrib{$idx.':anonymous'} || $see_anonymous) {
-                            if ($showaboutme) {
-                                $sender = &Apache::loncommon::aboutmewrapper(
-                                              $plainname,
-                                              $contrib{$idx.':sendername'},
-                                              $contrib{$idx.':senderdomain'});
-                            } else {
-                                $sender = $plainname;
-                            }
-                            if ($see_anonymous) {
-                                $sender .= ' ('.$contrib{$idx.':sendername'}.':'.
-                                           $contrib{$idx.':senderdomain'}.')';
-                            }
+			    $sender=&Apache::loncommon::aboutmewrapper(
+					 $plainname,
+					 $contrib{$idx.':sendername'},
+					 $contrib{$idx.':senderdomain'}).' ('.
+					 $contrib{$idx.':sendername'}.':'.
+					 $contrib{$idx.':senderdomain'}.')';
                             $sender = '<b>'.$sender.'</b>';
 			    if ($contrib{$idx.':anonymous'}) {
 			        $sender.=' <font color="red"><b>['.$$anonhash{$key}.']</b></font> '.
@@ -1121,11 +1098,11 @@ sub build_posting_display {
                                         }
                                     }
                                 }
-                                if ($seeid) {
+			        if ($seeid) {
 			            if ($hiddens{$idx}) {
                                         unless ($studenthidden) {
 			                    $sender.=' <a href="/adm/feedback?unhide='.
-				                    $escsymb.':::'.$idx;
+				                     $escsymb.':::'.$idx;
                                             if ($$newpostsflag) {
                                                 $sender .= '&amp;previous='.$prevread;
                                             }
@@ -1133,7 +1110,7 @@ sub build_posting_display {
                                         }
 			            } else {
 				        $sender.=' <a href="/adm/feedback?hide='.
-				            $escsymb.':::'.$idx;
+				                 $escsymb.':::'.$idx;
                                         if ($$newpostsflag) {
                                             $sender .= '&amp;previous='.$prevread;
                                         }
@@ -1146,7 +1123,7 @@ sub build_posting_display {
                                     $sender .= &mt('Delete').'</a>';
                                 }
                             }
-		        } else {
+                        } else {
 			    if ($screenname) {
 			        $sender='<i>'.$screenname.'</i>';
 			    } else {
@@ -1173,7 +1150,7 @@ sub build_posting_display {
                             }
 		        }
                         if ($outputtarget ne 'tex') {
-                            if (&discussion_open($status)) {
+		            if (&discussion_open($status)) {
                                 if (($group ne '') && 
                                     (&check_group_priv($group,'pgd') eq 'ok')) {
                                      $sender.=' <a href="/adm/feedback?replydisc='.
@@ -1195,11 +1172,11 @@ sub build_posting_display {
                                     $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
                                 }
                             }
-                            if ($viewgrades) {
+		            if ($viewgrades) {
 			        $vgrlink=&Apache::loncommon::submlink(&mt('Submissions'),
                                 $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$ressymb);
 		            }
-                            if ($$dischash{$readkey}=~/\.$idx\./) {
+                            if ($$dischash{$readkey}=~/\.$idx\./) { 
                                 $ctlink = '<label><b>'.&mt('Mark unread').'?</b>&nbsp;<input type="checkbox" name="postunread_'.$idx.'" /></label>';
                             } else {
                                 $ctlink = '<label><b>'.&mt('Mark read').'?</b>&nbsp;<input type="checkbox" name="postread_'.$idx.'" /></label>';
@@ -1402,7 +1379,7 @@ sub filter_regexp {
 
 
 sub get_post_contents {
-    my ($contrib,$idx,$seeid,$type,$messages,$subjects,$allattachments,$attachtxt,$imsfiles,$screenname,$plainname,$showaboutme,$numver) = @_;
+    my ($contrib,$idx,$seeid,$type,$messages,$subjects,$allattachments,$attachtxt,$imsfiles,$screenname,$plainname,$numver) = @_;
     my $discussion = '';
     my $start=$numver;
     my $end=$numver + 1;
@@ -1420,20 +1397,13 @@ sub get_post_contents {
                                         $$contrib{$idx.':sendername'},
                                         $$contrib{$idx.':senderdomain'});
     $$screenname=$$contrib{$idx.':screenname'};
-    $$showaboutme = &Apache::lonnet::usertools_access($$contrib{$idx.':sendername'},
-                                                      $$contrib{$idx.':senderdomain'},
-                                                      'aboutme');
-    my $sender = $$plainname;
-    if ($$showaboutme) {
-        $sender = &Apache::loncommon::aboutmewrapper(
-                                                     $$plainname,
-                                                     $$contrib{$idx.':sendername'},
-                                                     $$contrib{$idx.':senderdomain'});
-    }
-    if ($seeid) {
-        $sender .= ' ('. $$contrib{$idx.':sendername'}.':'.
-                   $$contrib{$idx.':senderdomain'}.')';
-    }
+
+    my $sender=&Apache::loncommon::aboutmewrapper(
+                                 $$plainname,
+                                 $$contrib{$idx.':sendername'},
+                                 $$contrib{$idx.':senderdomain'}).' ('.
+                                 $$contrib{$idx.':sendername'}.':'.
+                                 $$contrib{$idx.':senderdomain'}.')';
     my $attachmenturls = $$contrib{$idx.':attachmenturl'};
     my @postversions = ();
     if ($type eq 'allversions' || $type eq 'export') {
@@ -1789,7 +1759,7 @@ $latexHelp
 <p>
 $lt{'title'}: <input type="text" name="subject" size="30" value="$subject" /></p>
 <p>
-<textarea name="comment" id="comment" cols="60" rows="10"  $textareaclass>$comment
+<textarea name="comment" id="comment" cols="60" rows="10" $textareaclass>$comment
 </textarea></p>
 END
     if ( ($env{'form.editdisc'}) || ($env{'form.replydisc'}) ) {
@@ -2315,7 +2285,7 @@ sub print_showposters {
     my $group = $env{'form.group'};
     my $ressymb = &wrap_symb($symb);
     if (($group ne '') &&
-        ($ressymb =~ m|^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$|)) {
+        ($ressymb =~ m|^bulletin___ \d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$|)) {
         if (&check_group_priv($group,'dgp') eq 'ok') {
             $seeid = 1;
         }
@@ -2589,10 +2559,6 @@ sub redirect_back {
   &Apache::lonenc::check_encrypt(\$feedurl);
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   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('Feedback sent',undef,
 				     {'redirect'    => [0,$feedurl],
@@ -2626,10 +2592,6 @@ sub no_redirect_back {
   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',
@@ -2656,7 +2618,7 @@ ENDNOREDIRTWO
 }
 
 sub screen_header {
-    my ($feedurl,$symb,$group) = @_;
+    my ($feedurl,$symb) = @_;
     my $crscontent = &mt('Question/Comment/Feedback about course content');
     my $crspolicy = &mt('Question/Comment/Feedback about course policy');
     my $contribdisc = &mt('Contribution to course discussion of resource');
@@ -2705,19 +2667,10 @@ sub screen_header {
     }
     if (($env{'request.course.id'}) && (!$env{'form.sendmessageonly'})) {
         my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('boards');
-        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-        my $realsymb = $symb;
-        if ($symb=~/^bulletin___/) {
-            my $filename=(&Apache::lonnet::decode_symb($symb))[2];
-            $filename=~s|^adm/wrapper/||;
-            $realsymb=&Apache::lonnet::symbread($filename);
-        }
-        if (!$blocked && &discussion_open(undef,$realsymb) && 
-	    (&Apache::lonnet::allowed('pch',
+        if (!$blocked && &discussion_open(undef,$symb) && 
+	    &Apache::lonnet::allowed('pch',
 				     $env{'request.course.id'}.
-				     ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')) ||
-            (($group ne '') && ($symb =~ m{^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$}) && (&check_group_priv($group,'pgd') eq 'ok')))) {
+				     ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
 	    $discussoptions='<label><input type="radio" name="discuss" value="nonanon" checked="checked" /> '.
 		$contribdisc.
 	        '</label><br /><label><input type="radio" name="discuss" value="anon" /> '.
@@ -2768,8 +2721,8 @@ sub clear_out_html {
       # <BLOCKQUOTE> <DIV .*> <DIV> <IMG> <M> <SPAN> <H1> <H2> <H3> <H4> <SUB>
       # <SUP> <TABLE> <TR> <TD> <TH> <TBODY>
       %html=(B=>1, I=>1, P=>1, A=>1, LI=>1, OL=>1, UL=>1, EM=>1,
-             BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, PRE=>1, DIV=>1, IMG=>1,
-             M=>1, CHEM=>1, ALGEBRA=>1, SUB=>1, SUP=>1, SPAN=>1,
+	     BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, PRE=>1, DIV=>1, IMG=>1,
+	     M=>1, CHEM=>1, ALGEBRA=>1, SUB=>1, SUP=>1, SPAN=>1,  
 	     H1=>1, H2=>1, H3=>1, H4=>1, H5=>1, H6=>1, 
 	     TABLE=>1, TR=>1, TD=>1, TH=>1, TBODY=>1);
   }
@@ -2856,7 +2809,7 @@ sub send_msg {
 }
 
 sub adddiscuss {
-    my ($symb,$email,$anon,$attachmenturl,$subject,$group)=@_;
+    my ($symb,$email,$anon,$attachmenturl,$subject)=@_;
     my $status='';
     my $realsymb;
     if ($symb=~/^bulletin___/) {
@@ -2864,16 +2817,9 @@ sub adddiscuss {
 	$filename=~s|^adm/wrapper/||;
 	$realsymb=&Apache::lonnet::symbread($filename);
     }
-    my ($cnum,$cdom);
-    if ($env{'request.course.id'}) {
-        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-    }
     if (&discussion_open(undef,$realsymb) &&
-        (&Apache::lonnet::allowed('pch',$env{'request.course.id'}.
-         ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')) ||
-         (($group ne '') && (&check_group_priv($group,'pgd') eq 'ok') &&
-         ($symb =~ m{^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$})))) {
+	&Apache::lonnet::allowed('pch',$env{'request.course.id'}.
+        ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
 
     my %contrib=('message'      => $email,
                  'sendername'   => $env{'user.name'},
@@ -3575,11 +3521,11 @@ sub handler {
           my %attachmsgs = ();
           my %allattachments = ();
           my %imsfiles = ();
-          my ($screenname,$plainname,$showaboutme);
+          my ($screenname,$plainname);
           my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
                            $env{'course.'.$env{'request.course.id'}.'.domain'},
                            $env{'course.'.$env{'request.course.id'}.'.num'});
-          $r->print(&get_post_contents(\%contrib,$idx,$seeid,'allversions',\%messages,\%subjects,\%allattachments,\%attachmsgs,\%imsfiles,\$screenname,\$plainname,\$showaboutme));
+          $r->print(&get_post_contents(\%contrib,$idx,$seeid,'allversions',\%messages,\%subjects,\%allattachments,\%attachmsgs,\%imsfiles,\$screenname,\$plainname));
       }
       $r->print(&Apache::loncommon::end_page());
       return OK;
@@ -3652,10 +3598,6 @@ sub handler {
       $r->send_http_header;
       my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
       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,
@@ -3922,7 +3864,7 @@ ENDREDIR
                   return OK;
               }
           }
-	  my $options=&screen_header($feedurl,$symb,$group);
+	  my $options=&screen_header($feedurl,$symb);
 	  if ($options) {
 	      &mail_screen($r,$feedurl,$options,$symb,$attachmax{'text'});
 	  } else {
@@ -4004,7 +3946,7 @@ ENDREDIR
 	  my $subject = &clear_out_html($env{'form.subject'});
 	  my $anonmode=($env{'form.discuss'} eq 'anon' || $env{'form.anondiscuss'} );
 	  $typestyle.=&adddiscuss($symb,$message,$anonmode,$attachmenturl,
-				  $subject,$group);
+				  $subject);
 	  $numpost++;
       }