--- loncom/interface/lonfeedback.pm	2006/11/29 03:55:15	1.221
+++ loncom/interface/lonfeedback.pm	2006/12/06 19:03:37	1.229
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.221 2006/11/29 03:55:15 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.229 2006/12/06 19:03:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,7 +44,6 @@ use HTML::LCParser();
 use Apache::lonspeller();
 use Apache::longroup;
 use Cwd;
-use lib '/home/httpd/lib/perl/';
 use LONCAPA;
 
 sub discussion_open {
@@ -93,6 +92,11 @@ sub list_discussion {
         }
     }
 
+    my ($blocked,$blocktext) = &blocking_posts('boards',1);
+    if ($blocked) {
+        return $blocktext;
+    }
+
     my @bgcols = ("#cccccc","#eeeeee");
     my $discussiononly=0;
     if ($mode eq 'board') { $discussiononly=1; }
@@ -421,55 +425,10 @@ imscp_v1p1.xsd http://www.imsglobal.org/
 </script>
             |;
 	    $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$ressymb.'" ><table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
-	    $discussion .='<tr><td bgcolor="#DDDDBB" colspan="'.$colspan.'">'.
-		'<table border="0" width="100%" bgcolor="#DDDDBB"><tr>';
-	    my $escsymb=&escape($ressymb);
-	    if ($visible>2) {
-		$discussion.='<td align="left">'.
-		    '<a href="/adm/feedback?cmd=threadedon&amp;symb='.$escsymb;
-		if ($newpostsflag) {
-		    $discussion .= '&previous='.$prevread;
-		}
-		$discussion .= &group_args($group);
-		$discussion .='">'.&mt('Threaded View').'</a>&nbsp;&nbsp;'.
-		    '<a href="/adm/feedback?cmd=threadedoff&amp;symb='.$escsymb;
-		if ($newpostsflag) {
-		    $discussion .= '&previous='.$prevread;
-		}
-		$discussion .= &group_args($group);
-		$discussion .='">'.&mt('Chronological View').'</a>&nbsp;&nbsp;
-                              <a href= "/adm/feedback?cmd=sortfilter&amp;symb='.$escsymb;
-                if ($newpostsflag) {
-                    $discussion .= '&previous='.$prevread;
-                }
-		$discussion .= &group_args($group);
-                $discussion .='">'.&mt('Sorting/Filtering options').'</a>&nbsp;&nbsp';
-            } else {
-                $discussion .= '<td align="left">';
-            }
-            $discussion .='<a href= "/adm/feedback?export='.$escsymb;
-            if ($newpostsflag) {
-                $discussion .= '&previous='.$prevread;
-            }
-	    $discussion .= &group_args($group);
-            $discussion .= '">'.&mt('Export').'?</a>&nbsp;&nbsp;</td>';
-	    if ($newpostsflag) {
-		if (!$markondisp) {
-		    $discussion .='<td align="right"><a href="/adm/preferences?action=changediscussions';
-		    $discussion .= &group_args($group);
-		    $discussion .= '">'.
-                        &mt('Preferences on what is marked as NEW').
-			'</a><br /><a href="/adm/feedback?markread=1&amp;symb='.$escsymb;
-		    $discussion .= &group_args($group);
-                    $discussion .= '">'.&mt('Mark NEW posts no longer new').'</a>';
-		} else {
-		    $discussion .= '<td>&nbsp;</td>';
-		}
-	    } else {
-		$discussion .= '<td>&nbsp;</td>';
-	    }
-	    $discussion .= '</tr></table></td></tr>';
-
+            $discussion .= &action_links_bar($colspan,$ressymb,$visible,
+                                             $newpostsflag,$group,
+                                             $prevread,$markondisp);
+            my $escsymb=&escape($ressymb);
             my $numhidden = keys(%notshown);
             if ($numhidden > 0) {
                 my $colspan = $maxdepth+1;
@@ -680,9 +639,13 @@ END
               </table>
              </td>
             </tr>
-           </table>
-           <br /><br /></form>
 END
+            $discussion .= &action_links_bar($colspan,$ressymb,$visible,
+                                             $newpostsflag,$group,
+                                             $prevread,$markondisp);
+            $discussion .= "
+           </table>
+           <br /><br /></form>\n";
         } 
         if ($outputtarget eq 'export') {
             if ($manifestok) {
@@ -779,6 +742,78 @@ END
     return $discussion;
 }
 
+sub action_links_bar {
+    my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp) = @_;
+    my $discussion = '<tr><td bgcolor="#DDDDBB" colspan="'.$colspan.'">'.
+                     '<table border="0" width="100%" bgcolor="#DDDDBB"><tr>';
+    my $escsymb=&escape($ressymb);
+    if ($visible>2) {
+        $discussion .= '<td align="left">'.
+                       '<a href="/adm/feedback?cmd=threadedon&amp;symb='.$escsymb;
+        if ($newpostsflag) {
+            $discussion .= '&previous='.$prevread;
+        }
+        $discussion .= &group_args($group);
+        $discussion .='">'.&mt('Threaded View').'</a>&nbsp;&nbsp;'.
+                      '<a href="/adm/feedback?cmd=threadedoff&amp;symb='.$escsymb;
+        if ($newpostsflag) {
+            $discussion .= '&previous='.$prevread;
+        }
+        $discussion .= &group_args($group);
+        $discussion .='">'.&mt('Chronological View').'</a>&nbsp;&nbsp;
+                       <a href= "/adm/feedback?cmd=sortfilter&amp;symb='.$escsymb;
+        if ($newpostsflag) {
+            $discussion .= '&previous='.$prevread;
+        }
+        $discussion .= &group_args($group);
+        $discussion .='">'.&mt('Sorting/Filtering options').'</a>&nbsp;&nbsp';
+    } else {
+        $discussion .= '<td align="left">';
+    }
+    $discussion .='<a href= "/adm/feedback?export='.$escsymb;
+    if ($newpostsflag) {
+        $discussion .= '&previous='.$prevread;
+    }
+    $discussion .= &group_args($group);
+    $discussion .= '">'.&mt('Export').'?</a>&nbsp;&nbsp;</td>';
+    if ($newpostsflag) {
+        if (!$markondisp) {
+            $discussion .='<td align="right"><a href="/adm/preferences?action=changediscussions';
+            $discussion .= &group_args($group);
+            $discussion .= '">'.
+                           &mt('Preferences on what is marked as NEW').
+                           '</a><br /><a href="/adm/feedback?markread=1&amp;symb='.$escsymb;
+            $discussion .= &group_args($group);
+            $discussion .= '">'.&mt('Mark NEW posts no longer new').'</a>';
+        } else {
+            $discussion .= '<td>&nbsp;</td>';
+        }
+    } else {
+        $discussion .= '<td>&nbsp;</td>';
+    }
+    $discussion .= '</tr></table></td></tr>';
+    return $discussion;
+}
+
+sub blocking_posts {
+    my ($type,$showstatus) = @_;
+    my %setters;
+    my ($blocked,$output);
+    my ($startblock,$endblock) =
+          &Apache::loncommon::blockcheck(\%setters,$type);
+    if ($startblock && $endblock) {
+        $blocked = 1;
+        if ($showstatus) {
+            my $showstart = &Apache::lonlocal::locallocaltime($startblock);
+            my $showend = &Apache::lonlocal::locallocaltime($endblock);
+            $output = &mt('Discussion postings will not be viewable for resources in this course between [_1] and [_2] because communication is being blocked.',$showstart, $showend).'<br />'.
+                    &Apache::loncommon::build_block_table($startblock,$endblock,
+                                                         \%setters);
+        }
+    }
+    return ($blocked,$output);
+}
+
 sub postingform_display {
     my ($mode,$ressymb,$now,$subject,$comment,$outputtarget,$attachnum,
         $currnewattach,$currdelold,$group) = @_;
@@ -815,11 +850,16 @@ ENDDISCUSS
     if ($group ne '') {
         $postingform .='<input type="hidden" name="group" value="'.$group.'" />';
     }
+    my ($blockblog) = &blocking_posts('blogs');
+    if (!$blockblog) {
+        $postingform .= &add_blog_checkbox();
+    }
     $postingform .= "</form>\n";
     if ($outputtarget ne 'tex') {
         $postingform .= &generate_attachments_button('',$attachnum,$ressymb,
                                                      $now,$currnewattach,
-                                                     $currdelold,'',$mode);
+                                                     $currdelold,'',$mode,
+                                                     $blockblog);
         if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) {
             $newattachmsg = '<br /><b>'.$lt{'newa'}.'</b><br />';
             if (@{$currnewattach} > 1) {
@@ -1520,7 +1560,7 @@ END
               if ($idx > 0) {
                   my %subversions = ();
                   &get_post_versions(\%subversions,$contrib{$idx.':subject'},1,$numoldver);
-                  $subject = &mt('Re: ')..$subversions{$numoldver};
+                  $subject = &mt('Re: ').$subversions{$numoldver};
               }
               $subject = &HTML::Entities::encode($subject,'<>&"');
           } else {
@@ -1695,7 +1735,8 @@ END
         if (@currnewattach > 0) {
             $attachnum += @currnewattach;
         }
-        $r->print(&generate_attachments_button($postidx,$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,$numoldver));
+        my ($blockblog) = &blocking_posts('blogs');
+        $r->print(&generate_attachments_button($postidx,$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,$numoldver,'',$blockblog));
         if ($attachnum > 0) {
             if (@currnewattach > 0) {
                 $newattachmsg .= '<br /><b>'.&mt('New attachments').'</b><br />';
@@ -2531,15 +2572,20 @@ sub screen_header {
 	    &Apache::lonnet::allowed('pch',
 				     $env{'request.course.id'}.
 				     ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
-	    $discussoptions='<label><input type="radio" name="discuss" value="nonanon" checked="checked" /> '.
-		&mt('Contribution to course discussion of resource');
-	    $discussoptions.='</label><br /><label><input type="radio" name="discuss" value="anon" /> '.
-		&mt('Anonymous contribution to course discussion of resource').
-		' <i>('.&mt('name only visible to course faculty').')</i></label> '.
-		'<a href="/adm/preferences?action=changescreenname">'.&mt('Change Screenname').'</a>';
+            my ($blocked) = &blocking_posts('boards');
+            if (!$blocked) {
+	        $discussoptions='<label><input type="radio" name="discuss" value="nonanon" checked="checked" /> '.
+		    &mt('Contribution to course discussion of resource');
+	        $discussoptions.='</label><br /><label><input type="radio" name="discuss" value="anon" /> '.
+		    &mt('Anonymous contribution to course discussion of resource').
+		    ' <i>('.&mt('name only visible to course faculty').')</i></label> '.
+		    '<a href="/adm/preferences?action=changescreenname">'.&mt('Change Screenname').'</a>';
+            }
+        }
+        my ($blockblog) = &blocking_posts('blogs');
+        if (!$blockblog) {
+            $discussoptions.= &add_blog_checkbox();
         }
-        $discussoptions.='<br /><label><input type="checkbox" name="blog" /> '.
-	    &mt('Add to my public course blog').'</label>';
     }
     if ($msgoptions) { $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
     if ($discussoptions) { 
@@ -2664,7 +2710,7 @@ sub decide_receiver {
   my %to=();
   if ($env{'form.discuss'} eq 'author' ||$author) {
     $typestyle.='Submitting as Author Feedback<br />';
-    $feedurl=~/^\/res\/(\w+)\/(\w+)\//;
+    $feedurl=~ {^/res/($LONCAPA::domain_re)/($LONCAPA::username_re)/};
     $to{$2.':'.$1}=1;
   }
   if ($env{'form.discuss'} eq 'question' ||$question) {
@@ -3036,7 +3082,8 @@ sub process_attachments {
 }
 
 sub generate_attachments_button {
-    my ($idx,$attachnum,$ressymb,$now,$currnewattach,$deloldattach,$numoldver,$mode) = @_;
+    my ($idx,$attachnum,$ressymb,$now,$currnewattach,$deloldattach,
+        $numoldver,$mode,$blockblog) = @_;
     my $origpage = $ENV{'REQUEST_URI'};
     my $att=$attachnum.' '.&mt("attachments");
     my %lt = &Apache::lonlocal::texthash(
@@ -3048,6 +3095,9 @@ sub generate_attachments_button {
 $lt{'clic'}:&nbsp;<input type="button" value="$att"
 onClick="if (typeof(document.mailform.onsubmit)=='function') {document.mailform.onsubmit();};this.form.comment.value=escape(document.mailform.comment.value);this.form.subject.value=escape(document.mailform.subject.value);
 END
+    if (!$blockblog) {
+        $response .= 'setblogvalue();';
+    }
     unless ($mode eq 'board') {
         $response .= 'javascript:anonchk();';
     }
@@ -3187,6 +3237,26 @@ sub construct_attachmenturl {
     return $newattachmenturl; 
 }
 
+sub add_blog_checkbox {
+    my ($checkstatus);
+    if ($env{'form.blog'}) {
+        $checkstatus = 'checked="checked"';
+    }
+    my $output = '
+<script type="text/javascript">
+function setblogvalue() {
+    if (document.mailform.blog.checked) {
+        document.attachment.blog.value = 1;
+    } else {
+        document.attachment.blog.value = 0;
+    }
+}
+</script><br />
+<label><input type="checkbox" name="blog" '.$checkstatus.' /> '.
+&mt('Add to my public course blog').'</label><br />'."\n";
+    return $output;
+}
+
 sub has_discussion {
     my $resourcesref = shift;
     my $navmap = Apache::lonnavmaps::navmap->new();