--- loncom/interface/lonfeedback.pm	2010/08/07 19:23:50	1.297
+++ 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.297 2010/08/07 19:23:50 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.300 2010/08/25 00:46:37 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -722,7 +722,7 @@ END
                 $attachnum += @{$currnewattach};
             }
         }
-	if (&discussion_open($status)) {
+	if ((&discussion_open($status)) && ($outputtarget ne 'tex')) {
             if (($group ne '') && ($mode eq 'board')) {  
                 if (&check_group_priv($group,'pgd') eq 'ok') {
                     $discussion .=
@@ -738,24 +738,24 @@ END
 					 $currnewattach,$currdelold,'',$crstype);
             }
 	}
-    } else {
+    } 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'}:''))) {
-	    if ($outputtarget ne 'tex') {
-		$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) {
+                    $discussion .= '&nbsp;'.&mt('(Closed for [_1] roles)',
+                                                &Apache::lonnet::plaintext('st',$crstype));
+                }
             }
 	} else {
-            if ($outputtarget ne 'tex') {
-                $discussion.= &mt('This discussion is closed.');
-            }
-        }
-        if ($outputtarget ne 'tex') {
-	    $discussion.= &send_message_link($ressymb);
+            $discussion.= '<span class="LC_feedback_link">'.&mt('This discussion is closed.').'</span>';
         }
-        $discussion.='</div>';
+	$discussion.= &send_message_link($ressymb).'</div>';
     }
     return $discussion;
 }
@@ -787,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;
@@ -835,7 +835,6 @@ sub action_links_bar {
 sub postingform_display {
     my ($mode,$ressymb,$now,$subject,$comment,$outputtarget,$attachnum,
         $currnewattach,$currdelold,$group,$crstype) = @_;
-    if ($outputtarget eq 'tex') { return ''; }
     my $newattachmsg;
     my %lt = &Apache::lonlocal::texthash(
               'note' => 'Note: in anonymous discussion, your name is visible only to course faculty',
@@ -922,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') {
@@ -935,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'}) {
@@ -965,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'} =~ /:/) {
@@ -999,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).';
@@ -1063,48 +1075,50 @@ sub build_posting_display {
                             } else {
                                 @{$$namesort{$lastname}{$firstname}} = ("$idx");
                             }
-                            if ((&editing_allowed($escsymb.':::'.$idx,$group)) && ($outputtarget ne 'tex')) {
-                                if (($env{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($env{'user.name'} eq $contrib{$idx.':sendername'})) {
-                                    $sender.=' <a href="/adm/feedback?editdisc='.
-                                         $escsymb.':::'.$idx;
-                                    if ($$newpostsflag) {
-                                        $sender .= '&amp;previous='.$prevread;
-                                    }
-				    $sender .= &group_args($group);
-                                    $sender .= '" '.$target.'>'.&mt('Edit').'</a>';
+                            if ($outputtarget ne 'tex') {
+                                if (&editing_allowed($escsymb.':::'.$idx,$group)) {
+                                    if (($env{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($env{'user.name'} eq $contrib{$idx.':sendername'})) {
+                                        $sender.=' <a href="/adm/feedback?editdisc='.
+                                             $escsymb.':::'.$idx;
+                                        if ($$newpostsflag) {
+                                            $sender .= '&amp;previous='.$prevread;
+                                        }
+				        $sender .= &group_args($group);
+                                        $sender .= '" '.$target.'>'.&mt('Edit').'</a>';
                                     
-                                    unless ($seeid) {
-                                        my $grpargs = &group_args($group);
-                                        $sender.=" <a href=\"javascript:verifydelete('studentdelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')";
-                                        $sender .= '">'.&mt('Delete').'</a>';
+                                        unless ($seeid) {
+                                            my $grpargs = &group_args($group);
+                                            $sender.=" <a href=\"javascript:verifydelete('studentdelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')";
+                                            $sender .= '">'.&mt('Delete').'</a>';
+                                        }
                                     }
                                 }
-                            } 
-			    if (($seeid) && ($outputtarget ne 'tex')) {
-			        if ($hidden) {
-                                    unless ($studenthidden) {
-			                $sender.=' <a href="/adm/feedback?unhide='.
-				                $escsymb.':::'.$idx;
+			        if ($seeid) {
+			            if ($hiddens{$idx}) {
+                                        unless ($studenthidden) {
+			                    $sender.=' <a href="/adm/feedback?unhide='.
+				                     $escsymb.':::'.$idx;
+                                            if ($$newpostsflag) {
+                                                $sender .= '&amp;previous='.$prevread;
+                                            }
+                                            $sender .= '">'.&mt('Make Visible').'</a>';
+                                        }
+			            } else {
+				        $sender.=' <a href="/adm/feedback?hide='.
+				                 $escsymb.':::'.$idx;
                                         if ($$newpostsflag) {
                                             $sender .= '&amp;previous='.$prevread;
                                         }
-                                        $sender .= '">'.&mt('Make Visible').'</a>';
-                                    }
-			        } else {
-				    $sender.=' <a href="/adm/feedback?hide='.
-				        $escsymb.':::'.$idx;
-                                    if ($$newpostsflag) {
-                                        $sender .= '&amp;previous='.$prevread;
-                                    }
-				    $sender .= &group_args($group);
-                                    $sender .= '">'.&mt('Hide').'</a>';
-			        }
-                                my $grpargs = &group_args($group);
-			        $sender.= 
-                                    " <a href=\"javascript:verifydelete('seeiddelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')\">";
-                                $sender .= &mt('Delete').'</a>';
+				        $sender .= &group_args($group);
+                                        $sender .= '">'.&mt('Hide').'</a>';
+			            }
+                                    my $grpargs = &group_args($group);
+			            $sender.= 
+                                        " <a href=\"javascript:verifydelete('seeiddelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')\">";
+                                    $sender .= &mt('Delete').'</a>';
+                                }
                             }
-		        } else {
+                        } else {
 			    if ($screenname) {
 			        $sender='<i>'.$screenname.'</i>';
 			    } else {
@@ -1130,36 +1144,38 @@ sub build_posting_display {
                                 @{$$namesort{'__anon'}{'__anon'}} = ("$idx");
                             }
 		        }
-		        if ((&discussion_open($status)) && ($outputtarget ne 'tex')) {
-                            if (($group ne '') && 
-                                (&check_group_priv($group,'pgd') eq 'ok')) {
-                                 $sender.=' <a href="/adm/feedback?replydisc='.
-                                          $escsymb.':::'.$idx;
-                                if ($$newpostsflag) {
-                                    $sender .= '&amp;previous='.$prevread;
-                                }
-                                $sender .= &group_args($group);
-                                $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
-                            } elsif (&Apache::lonnet::allowed('pch', 
-				 $env{'request.course.id'}.
-				 ($env{'request.course.sec'}?'/'.
-                                  $env{'request.course.sec'}:''))) {
-			         $sender.=' <a href="/adm/feedback?replydisc='.
-			                  $escsymb.':::'.$idx;
-                                if ($$newpostsflag) {
-                                    $sender .= '&amp;previous='.$prevread;
+                        if ($outputtarget ne 'tex') {
+		            if (&discussion_open($status)) {
+                                if (($group ne '') && 
+                                    (&check_group_priv($group,'pgd') eq 'ok')) {
+                                     $sender.=' <a href="/adm/feedback?replydisc='.
+                                              $escsymb.':::'.$idx;
+                                    if ($$newpostsflag) {
+                                        $sender .= '&amp;previous='.$prevread;
+                                    }
+                                    $sender .= &group_args($group);
+                                    $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
+                                } elsif (&Apache::lonnet::allowed('pch', 
+				     $env{'request.course.id'}.
+				     ($env{'request.course.sec'}?'/'.
+                                      $env{'request.course.sec'}:''))) {
+			             $sender.=' <a href="/adm/feedback?replydisc='.
+			                      $escsymb.':::'.$idx;
+                                    if ($$newpostsflag) {
+                                        $sender .= '&amp;previous='.$prevread;
+                                    }
+                                    $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
                                 }
-                                $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
                             }
-                        }
-		        if (($viewgrades) && ($outputtarget ne 'tex')) {
+		            if ($viewgrades) {
 			        $vgrlink=&Apache::loncommon::submlink(&mt('Submissions'),
-                            $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$ressymb);
-		        }
-                        if (($$dischash{$readkey}=~/\.$idx\./) && ($outputtarget ne 'tex')) { 
-                            $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>';
+                                $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$ressymb);
+		            }
+                            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>';
+                            }
                         }
                     }
 #figure out at what position this needs to print
@@ -1176,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};