--- loncom/interface/lonfeedback.pm	2010/03/08 17:47:45	1.290
+++ loncom/interface/lonfeedback.pm	2010/06/08 16:56:57	1.296
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.290 2010/03/08 17:47:45 bisitz Exp $
+# $Id: lonfeedback.pm,v 1.296 2010/06/08 16:56:57 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -49,13 +49,22 @@ use LONCAPA;
 
 sub discussion_open {
     my ($status,$symb)=@_;
+# Advanced roles can always discuss
     if ($env{'request.role.adv'}) { return 1; }
+# Get discussion closing date
+    my $close=&Apache::lonnet::EXT('resource.0.discussend',$symb);
+# If it is defined and in the future, the instructor wants this discussion to be open
+    if (defined($close) && $close ne '' && $close > time) {
+        return 1;
+    }
+# It was not explicitly open, check if the problem is available.
+# 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;
     }
-    my $close=&Apache::lonnet::EXT('resource.0.discussend',$symb);
+# The problem is available, but check if the instructor explictly closed discussion
     if (defined($close) && $close ne '' && $close < time) {
 	return 0;
     }
@@ -273,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;
@@ -317,6 +322,7 @@ sub list_discussion {
         'dpwn' => 'Deleted posts will no longer be visible to you and other students',
         'bwco' => 'but will continue to be visible to your instructor',
         'depo' => 'Deleted posts will no longer be visible to you or anyone else.',
+        'discussions' => 'DISCUSSIONS'
     );
 
     my $currdisp = $lt{'allposts'};
@@ -368,8 +374,7 @@ sub list_discussion {
 # Print the discusssion
         if ($outputtarget eq 'tex') {
             $discussion.='<tex>{\tiny \vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}'.
-                         '\textbf{DISCUSSIONS}\makebox[2 cm][b]{\hrulefill}'.
-                         '\vskip 0 mm\noindent\textbf{'.$lt{'cuse'}.'}:\vskip 0 mm'.
+                         '\textbf{'.$lt{'discussions'}.'}\makebox[2 cm][b]{\hrulefill}\vskip 0 mm'.
                          '\noindent\textbf{'.$lt{'disa'}.'}: \textit{'.$currdisp.'}\vskip 0 mm'.
                          '\noindent\textbf{'.$lt{'npce'}.'}: \textit{'.$currmark.'}}</tex>';
         } elsif ($outputtarget eq 'export') {
@@ -416,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
@@ -514,7 +518,6 @@ imscp_v1p1.xsd http://www.imsglobal.org/
 			$threadinsert='<br /><strong>Reply: '.$thisdepth.'</strong>';
 		    }
 		    $discussionitems[$alldiscussion{$post}]=~s/<\/td><td([^>]*)>/$threadinsert<\/td><td TeXwidth="65 mm" align="left">/;
-		    $discussionitems[$alldiscussion{$post}]=~s/<a([^>]+)>(Edit|Hide|Delete|Reply|Submissions)<\/a>//g;
                     $discussionitems[$alldiscussion{$post}]=~s/(<b>|<\/b>|<\/a>|<a([^>]+)>)//g;
 
 		    $discussionitems[$alldiscussion{$post}]='<tex>\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}</tex>'.$discussionitems[$alldiscussion{$post}];
@@ -744,7 +747,11 @@ END
 	    if ($outputtarget ne 'tex') {
 		$discussion.= &send_feedback_link($ressymb,$target);
             }
-	}
+	} else {
+            if ($outputtarget ne 'tex') {
+                $discussion.= &mt('This discussion is closed.');
+            }
+        }
         if ($outputtarget ne 'tex') {
 	    $discussion.= &send_message_link($ressymb);
         }
@@ -769,7 +776,7 @@ sub send_message_link {
     my $output = '<span class="LC_message_link">'.
                  '  <a href="/adm/feedback?sendmessageonly=1&amp;symb='.
                  &escape($ressymb).'"><img alt="" class="LC_noBorder" src="'.
-                 &Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').
+                 &Apache::loncommon::lonhttpdurl('/res/adm/pages/feedback.png').
                  '" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Send Feedback').'</span></a></span>';
     return $output;
 }
@@ -828,6 +835,7 @@ 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',
@@ -869,28 +877,26 @@ ENDDISCUSS
         $postingform .= &add_blog_checkbox($crstype);
     }
     $postingform .= "</form>\n";
-    if ($outputtarget ne 'tex') {
-        $postingform .= &generate_attachments_button('',$attachnum,$ressymb,
+    $postingform .= &generate_attachments_button('',$attachnum,$ressymb,
                                                      $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}) {
-                    $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";
-            }
-        }
-        $postingform .= $newattachmsg;
-        $postingform .= &generate_preview_button();
+    if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) {
+        $newattachmsg = '<br /><b>'.$lt{'newa'}.'</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";
+         }
     }
+    $postingform .= $newattachmsg;
+    $postingform .= &generate_preview_button();
     return $postingform;
 }
 
@@ -1052,7 +1058,7 @@ sub build_posting_display {
                             } else {
                                 @{$$namesort{$lastname}{$firstname}} = ("$idx");
                             }
-                            if (&editing_allowed($escsymb.':::'.$idx,$group)) {
+                            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;
@@ -1069,7 +1075,7 @@ sub build_posting_display {
                                     }
                                 }
                             } 
-			    if ($seeid) {
+			    if (($seeid) && ($outputtarget ne 'tex')) {
 			        if ($hidden) {
                                     unless ($studenthidden) {
 			                $sender.=' <a href="/adm/feedback?unhide='.
@@ -1119,7 +1125,7 @@ sub build_posting_display {
                                 @{$$namesort{'__anon'}{'__anon'}} = ("$idx");
                             }
 		        }
-		        if (&discussion_open($status)) {
+		        if ((&discussion_open($status)) && ($outputtarget ne 'tex')) {
                             if (($group ne '') && 
                                 (&check_group_priv($group,'pgd') eq 'ok')) {
                                  $sender.=' <a href="/adm/feedback?replydisc='.
@@ -1141,11 +1147,11 @@ sub build_posting_display {
                                 $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
                             }
                         }
-		        if ($viewgrades) {
+		        if (($viewgrades) && ($outputtarget ne 'tex')) {
 			        $vgrlink=&Apache::loncommon::submlink(&mt('Submissions'),
                             $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$ressymb);
 		        }
-                        if ($$dischash{$readkey}=~/\.$idx\./) { 
+                        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>';
@@ -1247,7 +1253,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] .= '
@@ -2515,10 +2521,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],
@@ -2552,10 +2554,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',
@@ -2648,7 +2646,7 @@ sub screen_header {
         }
     }
     if ($msgoptions) {
-        $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').'" />'
+        $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/feedback.png').'" />'
                    .' '.&mt('Send Feedback').'</h2><p>'.&Apache::lonhtmlcommon::coursepreflink(&mt('Feedback Settings'),'feedback').'</p>'
                    .$msgoptions;
     }
@@ -3564,10 +3562,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,