--- loncom/interface/lonfeedback.pm	2010/08/14 18:14:29	1.290.2.2
+++ loncom/interface/lonfeedback.pm	2010/08/25 00:46:37	1.300
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.290.2.2 2010/08/14 18:14:29 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.300 2010/08/25 00:46:37 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
@@ -727,7 +722,7 @@ END
                 $attachnum += @{$currnewattach};
             }
         }
-	if (&discussion_open($status) && ($outputtarget ne 'tex')) {
+	if ((&discussion_open($status)) && ($outputtarget ne 'tex')) {
             if (($group ne '') && ($mode eq 'board')) {  
                 if (&check_group_priv($group,'pgd') eq 'ok') {
                     $discussion .=
@@ -749,7 +744,7 @@ END
             &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) {
@@ -757,11 +752,10 @@ 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>';
+	$discussion.= &send_message_link($ressymb).'</div>';
     }
     return $discussion;
 }
@@ -793,7 +787,7 @@ sub action_links_bar {
                      '<table width="100%" class="LC_disc_action_table"><tr>'.
                      '<td class="LC_disc_action_left">';
     my $escsymb=&escape($ressymb);
-    if ($visible>2) {
+    if ($visible) {
         $discussion .= '<a href="/adm/feedback?cmd=threadedon&amp;symb='.$escsymb;
         if ($newpostsflag) {
             $discussion .= '&amp;previous='.$prevread;
@@ -865,7 +859,7 @@ sub postingform_display {
 <br /><a name="newpost"></a>
 <font size="1">$lt{'note'}</font><br />
 <b>$lt{'title'}:</b>&nbsp;<input type="text" name="subject" value="$subject" size="30" /><br /><br />
-<textarea name="comment" cols="80" rows="14"id="comment" $textareaclass>$comment</textarea>
+<textarea name="comment" cols="80" rows="14" id="comment" $textareaclass>$comment</textarea>
 ENDDISCUSS
     if ($env{'form.origpage'}) {
         $postingform .= '<input type="hidden" name="origpage" value="'.
@@ -888,22 +882,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();
@@ -927,6 +921,19 @@ sub build_posting_display {
     if ((@{$grouppick} == 0) || (grep(/^all$/,@{$grouppick}))) {
         $skip_group_check = 1;
     }
+    my (%deletions,%hiddens);
+    if ($contrib{'deleted'}) {
+       my $deleted = $contrib{'deleted'};
+       $deleted =~ s/^\.//;
+       $deleted =~ s/\.$//;
+       %deletions = map { $_ => 1 } (split(/\.\./,$deleted));
+    }
+    if ($contrib{'hidden'}) {
+       my $hidden = $contrib{'hidden'};
+       $hidden =~ s/^\.//;
+       $hidden =~ s/\.$//;
+       %hiddens = map { $_ => 1 } (split(/\.\./,$hidden));
+    }
     if ($contrib{'version'}) {
         my $oldest = $contrib{'1:timestamp'};
         if ($prevread eq '0') {
@@ -940,13 +947,13 @@ sub build_posting_display {
         } 
 	for (my $id=1;$id<=$contrib{'version'};$id++) {
 	    my $idx=$id;
+            next if ($contrib{$idx.':deleted'});
+            next if ($contrib{$idx.':hidden'});
             my $posttime = $contrib{$idx.':timestamp'};
             if ($prevread <= $posttime) {
                 $$newpostsflag = 1;
             }
-	    my $hidden=($contrib{'hidden'}=~/\.$idx\./);
             my $studenthidden=($contrib{'studenthidden'}=~/\.$idx\./);
-	    my $deleted=($contrib{'deleted'}=~/\.$idx\./);
 	    my $origindex='0.';
             my $numoldver=0;
 	    if ($contrib{$idx.':replyto'}) {
@@ -970,7 +977,7 @@ sub build_posting_display {
 	    } else {
 		$$replies[$$depth[$idx]]=1;
 	    }
-	    unless ((($hidden) && (!$seeid)) || ($deleted)) {
+            unless ((($hiddens{$idx}) && (!$seeid)) || ($deletions{$idx})) {
 		$$visible++;
                 if ($contrib{$idx.':history'}) {
                     if ($contrib{$idx.':history'} =~ /:/) {
@@ -1004,7 +1011,7 @@ sub build_posting_display {
                     $message.=$attachtxt{$numoldver};
                     $subject=$subjects{$numoldver};
                     if ($message) {
-	  	        if ($hidden) {
+	  	        if ($hiddens{$idx}) {
 			    $message='<font color="#888888">'.$message.'</font>';
                             if ($studenthidden) {
                                 $message .='<br /><br />Deleted by poster (student).';
@@ -1086,11 +1093,11 @@ sub build_posting_display {
                                         }
                                     }
                                 }
-                                if ($seeid) {
-			            if ($hidden) {
+			        if ($seeid) {
+			            if ($hiddens{$idx}) {
                                         unless ($studenthidden) {
 			                    $sender.=' <a href="/adm/feedback?unhide='.
-				                    $escsymb.':::'.$idx;
+				                     $escsymb.':::'.$idx;
                                             if ($$newpostsflag) {
                                                 $sender .= '&amp;previous='.$prevread;
                                             }
@@ -1098,7 +1105,7 @@ sub build_posting_display {
                                         }
 			            } else {
 				        $sender.=' <a href="/adm/feedback?hide='.
-				            $escsymb.':::'.$idx;
+				                 $escsymb.':::'.$idx;
                                         if ($$newpostsflag) {
                                             $sender .= '&amp;previous='.$prevread;
                                         }
@@ -1111,7 +1118,7 @@ sub build_posting_display {
                                     $sender .= &mt('Delete').'</a>';
                                 }
                             }
-		        } else {
+                        } else {
 			    if ($screenname) {
 			        $sender='<i>'.$screenname.'</i>';
 			    } else {
@@ -1138,7 +1145,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='.
@@ -1160,11 +1167,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>';
@@ -1185,7 +1192,7 @@ sub build_posting_display {
                 if ($outputtarget eq 'export') {
                     %{$$imsitems{$idx}} = ();
                     $$imsitems{$idx}{'isvisible'}='true';
-                    if ($hidden) {
+                    if ($hiddens{$idx}) {
                         $$imsitems{$idx}{'isvisible'}='false';
                     }
                     $$imsitems{$idx}{'title'}=$subjects{$numoldver};
@@ -1267,7 +1274,7 @@ sub build_posting_display {
                                 $$newitem{$idx} = 1;
                                 $$discussionitems[$idx] .= '
                                   <table border="0" width="100%">
-                                  <tr><td align="left"><font color="#FF0000"><b>'.&mt('NEW').'</b></font></td>';
+                                  <tr><td align="left"><font color="#FF0000"><b>'.&mt('NEW').'&nbsp;</b></font></td>';
                             } else {
                                 $$newitem{$idx} = 0;
                                 $$discussionitems[$idx] .= '
@@ -1742,7 +1749,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'}) ) {
@@ -2542,10 +2549,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],
@@ -2579,10 +2582,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',
@@ -2712,8 +2711,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);
   }
@@ -3589,10 +3588,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,