--- loncom/interface/lonfeedback.pm	2005/04/11 15:29:38	1.161
+++ loncom/interface/lonfeedback.pm	2012/05/10 11:56:06	1.354
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.161 2005/04/11 15:29:38 albertel Exp $
+# $Id: lonfeedback.pm,v 1.354 2012/05/10 11:56:06 goltermann Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,18 +39,32 @@ use Apache::lonnet;
 use Apache::lonhtmlcommon();
 use Apache::lonnavmaps;
 use Apache::lonenc();
+use Apache::lonrss();
 use HTML::LCParser();
+#use HTML::Tidy::libXML;
 use Apache::lonspeller();
+use Apache::longroup;
 use Cwd;
+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;
     }
@@ -68,8 +82,31 @@ sub discussion_visible {
     return 1;
 }
 
+sub discussion_vote_available {
+    my ($status,$symb)=@_;
+    my $canvote=&Apache::lonnet::EXT('resource.0.discussvote',$symb);
+    if ((lc($canvote) eq 'yes') || 
+        ((lc($canvote) eq 'notended') && (&discussion_open($status,$symb)))) {
+        return 1;
+    }
+}
+
+sub get_realsymb {
+    my ($symb) = @_;
+    my $realsymb = $symb;
+    if ($symb=~/^bulletin___/) {
+        my $filename=(&Apache::lonnet::decode_symb($symb))[2];
+        $filename=~s{^adm/wrapper/}{};
+        $realsymb=&Apache::lonnet::symbread($filename);
+    }
+    return $realsymb;
+}
+
 sub list_discussion {
-    my ($mode,$status,$ressymb,$imsextras)=@_;
+    my ($mode,$status,$ressymb,$imsextras,$group)=@_;
+    unless ($ressymb) { $ressymb=&Apache::lonnet::symbread(); }
+    unless ($ressymb) { return ''; }
+    $ressymb=&wrap_symb($ressymb);
     my $outputtarget=$env{'form.grade_target'};
     if (defined($env{'form.export'})) {
 	if($env{'form.export'}) {
@@ -81,8 +118,32 @@ sub list_discussion {
             $outputtarget = 'export';
         }
     }
-    if (not &discussion_visible($status)) { return ''; }
-    my @bgcols = ("#cccccc","#eeeeee");
+    if (not &discussion_visible($status)) {
+        if ($mode ne 'board') {
+            &Apache::lonenc::check_encrypt(\$ressymb); 
+            return '<br /><div class="LC_feedback_link">'.&send_message_link($ressymb)."</div>";
+        }
+    }
+    if ($group ne '' && $mode eq 'board') {
+        if (&check_group_priv($group,'vgb') ne 'ok') {
+            return '';
+        }
+    }
+
+    my ($blocked,$blocktext) = 
+        &Apache::loncommon::blocking_status('boards');
+    if ($blocked) {
+        $blocktext = '<br /><div class="LC_feedback_link"><span class="LC_feedback_link">'.$blocktext."</span>";
+        &Apache::lonenc::check_encrypt(\$ressymb);
+        if ($mode ne 'board') {
+            $blocktext.=&send_message_link($ressymb).'</div>';
+        }else{
+            $blocktext.="</div>";
+        }
+        return $blocktext; 
+    }
+
+    my @bgcols = ("LC_disc_old_item","LC_disc_new_item");
     my $discussiononly=0;
     if ($mode eq 'board') { $discussiononly=1; }
     unless ($env{'request.course.id'}) { return ''; }
@@ -92,12 +153,9 @@ sub list_discussion {
 	$crs.='_'.$env{'request.course.sec'};
     }
     $crs=~s/\_/\//g;
-    unless ($ressymb) {	$ressymb=&Apache::lonnet::symbread(); }
-    unless ($ressymb) { return ''; }
-    $ressymb=&wrap_symb($ressymb);
     my $encsymb=&Apache::lonenc::check_encrypt($ressymb);
     my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)
-		  && ($ressymb=~/\.(problem|exam|quiz|assess|survey|form)$/));
+		  && ($ressymb=~/$LONCAPA::assess_re/));
     
     my %usernamesort = ();
     my %namesort =();
@@ -113,7 +171,7 @@ sub list_discussion {
     my $toggkey = $ressymb.'_readtoggle';
     my $readkey = $ressymb.'_read';
     $ressymb=$encsymb;
-    my %dischash = &Apache::lonnet::get('nohist_'.$env{'request.course.id'}.'_discuss',[$lastkey,$showkey,$markkey,$visitkey,$ondispkey,$userpickkey,$toggkey,$readkey],$env{'user.domain'},$env{'user.name'});
+    my %dischash = &Apache::lonnet::get('nohist_'.$cid.'_discuss',[$lastkey,$showkey,$markkey,$visitkey,$ondispkey,$userpickkey,$toggkey,$readkey],$env{'user.domain'},$env{'user.name'});
     my %discinfo = ();
     my $showonlyunread = 0;
     my $showunmark = 0; 
@@ -122,24 +180,16 @@ sub list_discussion {
     my $previous = 0;
     my $visit = 0;
     my $newpostsflag = 0;
-    my @posters = split/\&/,$dischash{$userpickkey};
+    my @posters = split(/\&/,$dischash{$userpickkey});
 
 # Retain identification of "NEW" posts identified in last display, if continuing 'previous' browsing of posts.
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['previous','sortposts','rolefilter','statusfilter','sectionpick','totposters']);
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['previous','sortposts','rolefilter','statusfilter','sectionpick','grouppick','totposters']);
     my $sortposts = $env{'form.sortposts'};
     my $statusfilter = $env{'form.statusfilter'};
-    my @sectionpick = ();
-    if ($env{'form.sectionpick'} =~ /,/) {
-        @sectionpick = split/,/,$env{'form.sectionpick'};
-    } else {
-        $sectionpick[0] = $env{'form.sectionpick'};
-    }
-    my @rolefilter = ();
-    if ($env{'form.rolefilter'} =~ /,/) {
-        @rolefilter = split/,/,$env{'form.rolefilter'};
-    } else {
-        $rolefilter[0] = $env{'form.rolefilter'};
-    }
+    my @sectionpick = split(/,/,$env{'form.sectionpick'});
+    my @grouppick   = split(/,/,$env{'form.grouppick'});
+    my @rolefilter  = split(/,/,$env{'form.rolefilter'});
+
     my $totposters = $env{'form.totposters'};
     $previous = $env{'form.previous'};
     if ($previous > 0) {
@@ -150,37 +200,43 @@ sub list_discussion {
         }
     }
 
+    my $cdom = $env{'course.'.$cid.'.domain'};
+    my $cnum = $env{'course.'.$cid.'.num'};
+    my $crstype = &Apache::loncommon::course_type();
+
 # Get information about students and non-students in course for filtering display of posts
     my %roleshash = ();
     my %roleinfo = ();
+    my ($classgroups,$studentgroups);
     if ($env{'form.rolefilter'}) {
-        %roleshash = &Apache::lonnet::dump('nohist_userroles',$env{'course.'.$env{'request.course.id'}.'.domain'},$env{'course.'.$env{'request.course.id'}.'.num'});
-        foreach (keys %roleshash) {
-            my ($role,$uname,$udom,$sec) = split/:/,$_;
+        %roleshash = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
+        foreach my $rolekey (keys(%roleshash)) {
+            my ($role,$uname,$udom,$sec) = split(/:/,$rolekey);
             if ($role =~ /^cr/) {
                 $role = 'cr';
             }
-            my ($end,$start) = split/:/,$roleshash{$_};
+            my ($end,$start) = split(/:/,$roleshash{$rolekey});
             my $now = time;
             my $status = 'Active';
             if (($now < $start) || ($end > 0 && $now > $end)) {
                 $status = 'Expired';
             }
             if ($uname && $udom) { 
-                push @{$roleinfo{$uname.':'.$udom}}, $role.':'.$sec.':'.$status;
+                push(@{$roleinfo{$uname.':'.$udom}}, $role.':'.$sec.':'.$status);
             }
         }
-        my ($classlist) = &Apache::loncoursedata::get_classlist(
-                              $env{'request.course.id'},
-                              $env{'course.'.$env{'request.course.id'}.'.domain'},
-                              $env{'course.'.$env{'request.course.id'}.'.num'});
+        my ($classlist,$keylist) =
+                         &Apache::loncoursedata::get_classlist($cdom,$cnum);
         my $sec_index = &Apache::loncoursedata::CL_SECTION();
         my $status_index = &Apache::loncoursedata::CL_STATUS();
         while (my ($student,$data) = each %$classlist) {
             my ($section,$status) = ($data->[$sec_index],
                                  $data->[$status_index]);
-            push @{$roleinfo{$student}}, 'st:'.$section.':'.$status;
+            push(@{$roleinfo{$student}}, 'st:'.$section.':'.$status);
         }
+	($classgroups,$studentgroups) = 
+	    &Apache::loncoursedata::get_group_memberships($classlist,$keylist,
+							  $cdom,$cnum);
     }
 
 # Get discussion display default settings for user
@@ -220,7 +276,16 @@ sub list_discussion {
     }
     $visit ++;
 
-    my $seeid=&Apache::lonnet::allowed('rin',$crs);
+    my $seeid;
+    if (&Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
+        $seeid = 1;
+    }
+    my $seehidden = &can_see_hidden($mode,$ressymb,undef,$group,$cdom,$cnum,$crs);
+
+# Is voting on discussions available
+    my $realsymb = &get_realsymb($ressymb);
+    my $canvote = &discussion_vote_available($status,$realsymb);
+
     my @discussionitems=();
     my %shown = ();
     my @posteridentity=();
@@ -235,18 +300,14 @@ sub list_discussion {
     my %notshown = ();
     my %newitem = ();
     my $maxdepth=0;
-
-    my $target='';
-    unless ($env{'browser.interface'} eq 'textual' ||
-	    $env{'environment.remote'} eq 'off' ) {
-	$target='target="LONcom"';
-    }
+    my %anonhash=();
+    my $anoncnt=0;
 
     my $now = time;
     $discinfo{$visitkey} = $visit;
 
-    &Apache::lonnet::put('nohist_'.$env{'request.course.id'}.'_discuss',\%discinfo,$env{'user.domain'},$env{'user.name'});
-    &build_posting_display(\%usernamesort,\%subjectsort,\%namesort,\%notshown,\%newitem,\%dischash,\%shown,\%alldiscussion,\%imsitems,\%imsfiles,\%roleinfo,\@discussionitems,\@replies,\@depth,\@posters,\$maxdepth,\$visible,\$newpostsflag,\$current,$status,$viewgrades,$seeid,$prevread,$sortposts,$encsymb,$target,$readkey,$showunmark,$showonlyunread,$totposters,\@rolefilter,\@sectionpick,$statusfilter,$toggkey,$outputtarget);
+    &Apache::lonnet::put('nohist_'.$cid.'_discuss',\%discinfo,$env{'user.domain'},$env{'user.name'});
+    &build_posting_display(\%usernamesort,\%subjectsort,\%namesort,\%notshown,\%newitem,\%dischash,\%shown,\%alldiscussion,\%imsitems,\%imsfiles,\%roleinfo,\@discussionitems,\@replies,\@depth,\@posters,\$maxdepth,\$visible,\$newpostsflag,\$current,$status,$viewgrades,$seeid,$seehidden,$canvote,$prevread,$sortposts,$encsymb,$readkey,$showunmark,$showonlyunread,$totposters,\@rolefilter,\@sectionpick,\@grouppick,$classgroups,$statusfilter,$toggkey,$outputtarget,\%anonhash,$anoncnt,$group);
 
     my $discussion='';
     my $manifestfile;
@@ -256,10 +317,8 @@ sub list_discussion {
     my $copyresult;
 
     my $function = &Apache::loncommon::get_users_function();
-    my $color = &Apache::loncommon::designparm($function.'.tabbg',
-                                                    $env{'user.domain'});
     my %lt = &Apache::lonlocal::texthash(
-        'cuse' => 'Current discussion settings',
+        'cuse' => 'My settings for this discussion',
         'allposts' => 'All posts',
         'unread' => 'New posts only',
         'unmark' => 'Unread only',
@@ -274,6 +333,14 @@ sub list_discussion {
         'disp' => 'Display',
         'nolo' => 'Not new',
         'togg' => 'Toggle read/unread',
+        'aner' => 'An error occurred opening the manifest file.',
+        'difo' => 'Discussion for',
+        'aerr' => 'An error occurred opening the export file for posting',
+        'aysu' => 'Are you sure you want to delete this post?',
+        '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'};
@@ -314,18 +381,18 @@ sub list_discussion {
         $togglink = 'toggoff';
     } 
    
-    $chglink .= '&changes='.$displinkA.'_'.$displinkB.'_'.$marklink.'_'.$togglink;
+    $chglink .= '&amp;changes='.$displinkA.'_'.$displinkB.'_'.$marklink.'_'.$togglink;
 
     if ($newpostsflag) {
-        $chglink .= '&previous='.$prevread;
+        $chglink .= '&amp;previous='.$prevread;
     }
+    $chglink.=&group_args($group);
 
     if ($visible) {
 # 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') {
@@ -359,81 +426,54 @@ sub list_discussion {
             my $manifestfilename = $tempexport.$manifest;
             if ($manifestfile = Apache::File->new('>'.$manifestfilename)) {
                 $manifestok=1;
-                print $manifestfile qq|
-<?xml version="1.0" encoding="UTF-8"?>
+                print $manifestfile qq|<?xml version="1.0" encoding="UTF-8"?>
 <manifest xmlns="http://www.imsglobal.org/xsd/imscp_v1p1" xmlns:imsmd="http://www.imsglobal.org/xsd/imsmd_v1p2" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 identifier="MANIFEST-$ressymb" xsi:schemaLocation="http://www.imsglobal.org/xsd/imscp_v1p1 
 imscp_v1p1.xsd http://www.imsglobal.org/xsd/imsmd_v1p2 imsmd_v1p2p2.xsd">
   <organizations default="$ressymb">
     <organization identifier="$ressymb">
-      <title>Discussion for $ressymb</title>\n|;
+      <title>$lt{'difo'} $ressymb</title>\n|;
             } else {
-                $discussion .= 'An error occurred opening the manifest file.<br />';
+                $discussion .= $lt{'aner'}.'<br />';
             }
 	} else {
             my $colspan=$maxdepth+1;
-            $discussion.= qq|
-<script>
-   function studentdelete (symb,idx,newflag,previous) {
+            $discussion.= &Apache::lonhtmlcommon::scripttag(qq|
+   function verifydelete (caller,symb,idx,newflag,previous,groupparm) {
        var symbparm = symb+':::'+idx
        var prevparm = ""
        if (newflag == 1) {
-           prevparm = "&previous="+previous
+           prevparm = "&amp;previous="+previous
+       }
+       if (caller == 'studentdelete') {
+           if (confirm("$lt{'aysu'}\\n$lt{'dpwn'},\\n$lt{'bwco'}")) {
+               document.location.href = "/adm/feedback?hide="+symbparm+prevparm+groupparm
+           }
+       } else {
+           if (caller == 'seeiddelete') {
+               if (confirm("$lt{'aysu'}\\n$lt{'depo'}")) {
+                   document.location.href = "/adm/feedback?deldisc="+symbparm+prevparm+groupparm
+               }
+           }
        }
-       if (confirm("Are you sure you want to delete this post?\\nDeleted posts will no longer be visible to you and other students,\\nbut will continue to be visible to your instructor")) {
-           document.location.href = "/adm/feedback?hide="+symbparm+prevparm
-       }  
    }
-</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>';
-	    if ($visible>2) {
-		$discussion.='<td align="left">'.
-		    '<a href="/adm/feedback?cmd=threadedon&amp;symb='.$ressymb;
-		if ($newpostsflag) {
-		    $discussion .= '&previous='.$prevread;
-		}
-		$discussion .='">'.&mt('Threaded View').'</a>&nbsp;&nbsp;'.
-		    '<a href="/adm/feedback?cmd=threadedoff&amp;symb='.$ressymb;
-		if ($newpostsflag) {
-		    $discussion .= '&previous='.$prevread;
-		}
-		$discussion .='">'.&mt('Chronological View').'</a>&nbsp;&nbsp;
-                              <a href= "/adm/feedback?cmd=sortfilter&amp;symb='.$ressymb;
-                if ($newpostsflag) {
-                    $discussion .= '&previous='.$prevread;
-                }
-                $discussion .='">'.&mt('Sorting/Filtering options').'</a>&nbsp;&nbsp';
-            } else {
-                $discussion .= '<td align="left">';
-            }
-            $discussion .='<a href= "/adm/feedback?export='.$ressymb;
-            if ($newpostsflag) {
-                $discussion .= '&previous='.$prevread;
-            }
-            $discussion .= '">'.&mt('Export').'?</a>&nbsp;&nbsp;</td>';
-	    if ($newpostsflag) {
-		if (!$markondisp) {
-		    $discussion .='<td align="right"><a href="/adm/feedback?markread=1&amp;symb='.$ressymb.'">'.&mt('Mark NEW posts no longer new').'</a>&nbsp;&nbsp;';
-		} else {
-		    $discussion .= '<td>&nbsp;</td>';
-		}
-	    } else {
-		$discussion .= '<td>&nbsp;</td>';
-	    }
-	    $discussion .= '</tr></table></td></tr>';
-
-            my $numhidden = keys %notshown;
+            |);
+	    $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$ressymb.'" >'.
+                         "\n".'<table width="100%" class="LC_discussion">';
+            $discussion .= &action_links_bar($colspan,$ressymb,$visible,
+                                             $newpostsflag,$group,
+                                             $prevread,$markondisp,$seehidden);
+            my $escsymb=&escape($ressymb);
+            my $numhidden = keys(%notshown);
             if ($numhidden > 0) {
                 my $colspan = $maxdepth+1;
                 $discussion.="\n".'<tr><td bgcolor="#CCCCCC" colspan="'.$colspan.'">'.
-                         '<a href="/adm/feedback?allposts=1&amp;symb='.$ressymb;
+                         '<a href="/adm/feedback?allposts=1&amp;symb='.$escsymb;
                 if ($newpostsflag) {
-                    $discussion .= '&previous='.$prevread;
+                    $discussion .= '&amp;previous='.$prevread;
                 }
+		$discussion .= &group_args($group);
                 $discussion .= '">'.&mt('Show all posts').'</a> '.&mt('to display').' '.
                          $numhidden.' ';
                 if ($showunmark) {
@@ -448,93 +488,94 @@ imscp_v1p1.xsd http://www.imsglobal.org/
 # Choose sort mechanism
         my @showposts = ();
         if ($sortposts eq 'descdate') {
-            @showposts = (sort { $b <=> $a } keys %alldiscussion);
+            @showposts = (sort { $b <=> $a } keys(%alldiscussion));
         } elsif ($sortposts eq 'thread') {
-            @showposts = (sort { $a <=> $b } keys %alldiscussion);
+            @showposts = (sort { $a <=> $b } keys(%alldiscussion));
         } elsif ($sortposts eq 'subject') {
-            foreach (sort keys %subjectsort) {
-                push @showposts, @{$subjectsort{$_}};
+            foreach my $key (sort(keys(%subjectsort))) {
+                push(@showposts, @{$subjectsort{$key}});
             }
         } elsif ($sortposts eq 'username') {
-            foreach my $domain (sort keys %usernamesort) {
-                foreach (sort keys %{$usernamesort{$domain}}) {
-                    push @showposts, @{$usernamesort{$domain}{$_}};
+            foreach my $domain (sort(keys(%usernamesort))) {
+                foreach my $key (sort(keys(%{$usernamesort{$domain}}))) {
+                    push(@showposts, @{$usernamesort{$domain}{$key}});
                 }
             }
         } elsif ($sortposts eq 'lastfirst') {
-            foreach my $last (sort keys %namesort) {
-                 foreach (sort keys %{$namesort{$last}}) {
-                     push @showposts, @{$namesort{$last}{$_}};
+            foreach my $last (sort(keys(%namesort))) {
+                 foreach my $key (sort(keys(%{$namesort{$last}}))) {
+                     push(@showposts, @{$namesort{$last}{$key}});
                  }
             }
         } else {
-            @showposts =  (sort { $a <=> $b } keys %alldiscussion);
+            @showposts =  (sort { $a <=> $b } keys(%alldiscussion));
         }
         my $currdepth = 0;
         my $firstidx = $alldiscussion{$showposts[0]};
-        foreach (@showposts) {
-            unless (($sortposts eq 'thread') || (($sortposts eq '') && ($env{'environment.threadeddiscussion'})) || ($outputtarget eq 'export')) {
-                $alldiscussion{$_} = $_;
+        foreach my $post (@showposts) {
+            unless (($sortposts eq 'thread') || 
+                    (($sortposts eq '') && (!$env{'environment.unthreadeddiscussion'})) || 
+                    ($outputtarget eq 'export')) {
+                $alldiscussion{$post} = $post;
             }
-            unless ( ($notshown{$alldiscussion{$_}} eq '1') || ($shown{$alldiscussion{$_}} == 0) ) {
+            unless ( ($notshown{$alldiscussion{$post}} eq '1') || ($shown{$alldiscussion{$post}} == 0) ) {
                 if ($outputtarget ne 'tex' && $outputtarget ne 'export') {
 		    $discussion.="\n<tr>";
 		}
-	        my $thisdepth=$depth[$alldiscussion{$_}];
+	        my $thisdepth=$depth[$alldiscussion{$post}];
                 if ($outputtarget ne 'tex' && $outputtarget ne 'export') {
 		    for (1..$thisdepth) {
-			$discussion.='<td>&nbsp;&nbsp;&nbsp;</td>';
+			$discussion.='<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>';
 		    }
 		}
 	        my $colspan=$maxdepth-$thisdepth+1;
                 if ($outputtarget eq 'tex') {
 		    #cleanup block
-		    $discussionitems[$alldiscussion{$_}]=~s/<table([^>]*)>/<table TeXwidth="90 mm">/;
-		    $discussionitems[$alldiscussion{$_}]=~s/<tr([^>]*)><td([^>]*)>/<tr><td TeXwidth="20 mm" align="left">/;
+		    $discussionitems[$alldiscussion{$post}]=~s/<table([^>]*)>/<table TeXwidth="90 mm">/;
+		    $discussionitems[$alldiscussion{$post}]=~s/<tr([^>]*)><td([^>]*)>/<tr><td TeXwidth="20 mm" align="left">/;
                     my $threadinsert='';
                     if ($thisdepth > 0) {
 			$threadinsert='<br /><strong>Reply: '.$thisdepth.'</strong>';
 		    }
-		    $discussionitems[$alldiscussion{$_}]=~s/<\/td><td([^>]*)>/$threadinsert<\/td><td TeXwidth="65 mm" align="left">/;
-		    $discussionitems[$alldiscussion{$_}]=~s/<a([^>]+)>(Edit|Hide|Delete|Reply|Submissions)<\/a>//g;
-                    $discussionitems[$alldiscussion{$_}]=~s/(<b>|<\/b>|<\/a>|<a([^>]+)>)//g;
+		    $discussionitems[$alldiscussion{$post}]=~s/<\/td><td([^>]*)>/$threadinsert<\/td><td TeXwidth="65 mm" align="left">/;
+                    $discussionitems[$alldiscussion{$post}]=~s/(<b>|<\/b>|<\/a>|<a([^>]+)>)//g;
 
-		    $discussionitems[$alldiscussion{$_}]='<tex>\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}</tex>'.$discussionitems[$alldiscussion{$_}];
-		    $discussion.=$discussionitems[$alldiscussion{$_}];
+		    $discussionitems[$alldiscussion{$post}]='<tex>\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}</tex>'.$discussionitems[$alldiscussion{$post}];
+		    $discussion.=$discussionitems[$alldiscussion{$post}];
 		} elsif ($outputtarget eq 'export') {
-                    my $postfilename = $alldiscussion{$_}.'-'.$imsitems{$alldiscussion{$_}}{'timestamp'}.'.html';
+                    my $postfilename = $alldiscussion{$post}.'-'.$imsitems{$alldiscussion{$post}}{'timestamp'}.'.html';
                     if ($manifestok) {
-                        if (($depth[$alldiscussion{$_}] <= $currdepth) && ($alldiscussion{$_} != $firstidx)) {
+                        if (($depth[$alldiscussion{$post}] <= $currdepth) && ($alldiscussion{$post} != $firstidx)) {
                             print $manifestfile '  </item>'."\n";
                         }
-                        $currdepth = $depth[$alldiscussion{$_}];
+                        $currdepth = $depth[$alldiscussion{$post}];
                         print $manifestfile "\n". 
-      '<item identifier="ITEM-'.$ressymb.'-'.$alldiscussion{$_}.'" isvisible="'.
-        $imsitems{$alldiscussion{$_}}{'isvisible'}.'" identifieref="RES-'.$ressymb.'-'.$alldiscussion{$_}.'">'.
-        '<title>'.$imsitems{$alldiscussion{$_}}{'title'}.'</title>';
+      '<item identifier="ITEM-'.$ressymb.'-'.$alldiscussion{$post}.'" isvisible="'.
+        $imsitems{$alldiscussion{$post}}{'isvisible'}.'" identifieref="RES-'.$ressymb.'-'.$alldiscussion{$post}.'">'.
+        '<title>'.$imsitems{$alldiscussion{$post}}{'title'}.'</title></item>';
                         $imsresources .= "\n".
-    '<resource identifier="RES-'.$ressymb.'-'.$alldiscussion{$_}.'" type="webcontent" href="'.$postfilename.'">'."\n".
+    '<resource identifier="RES-'.$ressymb.'-'.$alldiscussion{$post}.'" type="webcontent" href="'.$postfilename.'">'."\n".
       '<file href="'.$postfilename.'">'."\n".
-      $imsfiles{$alldiscussion{$_}}{$imsitems{$alldiscussion{$_}}{'currversion'}}."\n".
+      $imsfiles{$alldiscussion{$post}}{$imsitems{$alldiscussion{$post}}{'currversion'}}.'</file>'."\n".
     '</resource>';
                     }
                     my $postingfile;
                     my $postingfilename = $tempexport.'/'.$postfilename;
                     if ($postingfile = Apache::File->new('>'.$postingfilename)) {
                         print $postingfile '<html><head><title>Discussion Post</title></head><body>'.
-                                           $imsitems{$alldiscussion{$_}}{'title'}.' '.
-                                           $imsitems{$alldiscussion{$_}}{'sender'}.
-                                           $imsitems{$alldiscussion{$_}}{'timestamp'}.'<br /><br />'.
-                                           $imsitems{$alldiscussion{$_}}{'message'}.'<br />'.
-                                           $imsitems{$alldiscussion{$_}}{'attach'}.'</body></html>'."\n"; 
+                                           $imsitems{$alldiscussion{$post}}{'title'}.' '.
+                                           $imsitems{$alldiscussion{$post}}{'sender'}.
+                                           $imsitems{$alldiscussion{$post}}{'timestamp'}.'<br /><br />'.
+                                           $imsitems{$alldiscussion{$post}}{'message'}.'<br />'.
+                                           $imsitems{$alldiscussion{$post}}{'attach'}.'</body></html>'."\n"; 
                         close($postingfile);
                     } else {
-                        $discussion .= 'An error occurred opening the export file for posting '.$alldiscussion{$_}.'<br />';
+                        $discussion .= $lt{'aerr'}.' '.$alldiscussion{$post}.'<br />';
                     }
-                    $copyresult.=&replicate_attachments($imsitems{$alldiscussion{$_}}{'allattachments'},$tempexport);
+                    $copyresult.=&replicate_attachments($imsitems{$alldiscussion{$post}}{'allattachments'},$tempexport);
                 } else {
-                    $discussion.='<td  bgcolor="'.$bgcols[$newitem{$alldiscussion{$_}}].
-                       '" colspan="'.$colspan.'">'. $discussionitems[$alldiscussion{$_}].
+                    $discussion.='<td class="'.$bgcols[$newitem{$alldiscussion{$post}}].
+                       '" colspan="'.$colspan.'">'. $discussionitems[$alldiscussion{$post}].
                        '</td></tr>';
                 }
 	    }
@@ -542,17 +583,12 @@ imscp_v1p1.xsd http://www.imsglobal.org/
 	unless ($outputtarget eq 'tex' || $outputtarget eq 'export') {
             my $colspan=$maxdepth+1;
             $discussion .= <<END;
-            <tr bgcolor="#FFFFFF">
-             <td colspan="$colspan" valign="top">
-              <table border="0" bgcolor="#FFFFFF" width="100%" cellspacing="2" cellpadding="2">
+            <tr>
+             <td colspan="$colspan">
+              <table width="100%">
                <tr>
-                <td align="left">
-                 <table border="0" cellpadding="0" cellspacing="4">
-                  <tr>
-                   <td>
-                    <font size="-1"><b>$lt{'cuse'}</b>:</td>
-                   <td>&nbsp;</td>
-                   <td><font size="-1">
+                <td class="LC_disc_action_left">
+                    <font size="-1"><b>$lt{'cuse'}</b>:&nbsp;
 END
             if ($newpostsflag) {
                 $discussion .= 
@@ -569,27 +605,20 @@ END
                 }
             }
             $discussion .= <<END;
-                   </font></td>
-                   <td>&nbsp;</td>
-                   <td align="left">
-                    <font size="-1"><b><a href="$chglink">$lt{'chgt'}</a>?</font></b>
-                   </td>
-                  </tr>
-                 </table>
+                   &nbsp;&nbsp;<b><a href="$chglink">$lt{'chgt'}</a></b></font>
                 </td>
 END
             if ($sortposts) {
                 my %sort_types = ();
                 my %role_types = ();
                 my %status_types = ();
-                &sort_filter_names(\%sort_types,\%role_types,\%status_types);
+                &sort_filter_names(\%sort_types,\%role_types,\%status_types,$crstype);
 
-                $discussion .= '<td><font size="-1"><b>'.&mt('Sorted by').'</b>: '.$sort_types{$sortposts}.'<br />';
+                $discussion .= '<td class="LC_disc_action_right"><font size="-1"><b>'.&mt('Sorted by').'</b>: '.$sort_types{$sortposts}.'<br />';
                 if (defined($env{'form.totposters'})) {
                     $discussion .= &mt('Posts by').':';
                     if ($totposters > 0) {
                         foreach my $poster (@posters) {
-                            $poster =~ s/:/\@/;
                             $discussion .= ' '.$poster.',';
                         }
                         $discussion =~ s/,$//;
@@ -602,13 +631,17 @@ END
                         $filterchoice = '<i>'.&mt('sections').'</i>-&nbsp;'.$env{'form.sectionpick'};
                         $filterchoice .= '&nbsp;&nbsp;&nbsp; ';
                     }
+                    if (@grouppick > 0) {
+                        $filterchoice = '<i>'.&mt('groups').'</i>-&nbsp;'.$env{'form.grouppick'};
+                        $filterchoice .= '&nbsp;&nbsp;&nbsp; ';
+                    }
                     if (@rolefilter > 0) {
                         $filterchoice .= '<i>'.&mt('roles').'</i>-';
-                        foreach (@rolefilter) {
-                            $filterchoice .= '&nbsp;'.$role_types{$_}.',';
+                        foreach my $role (@rolefilter) {
+                            $filterchoice .= '&nbsp;'.$role_types{$role}.',';
                         }
                         $filterchoice =~ s/,$//;
-                        $filterchoice .= '<br />&nbsp;&nbsp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;';
+                        $filterchoice .= '<br />'.('&nbsp;' x8);
                     }
                     if ($statusfilter) {
                         $filterchoice .= '<i>'.&mt('status').'</i>-&nbsp;'.$status_types{$statusfilter};
@@ -616,15 +649,16 @@ END
                     if ($filterchoice) {
                         $discussion .= '<b>'.&mt('Filters').'</b>:&nbsp;'.$filterchoice;
                     }
-                    $discussion .= '</font></td>';
                 }
+                $discussion .= '</font></td>';
+
             }
             if ($dischash{$toggkey}) {
-                my $storebutton = &mt('Store read/unread changes');
+                my $storebutton = &mt('Save read/unread changes');
                 $discussion.='<td align="right">'.
-              '<input type="hidden" name="discsymb" value="'.$ressymb.'">'."\n".
+              '<input type="hidden" name="discsymb" value="'.$ressymb.'" />'."\n".
               '<input type="button" name="readoptions" value="'.$storebutton.'"'.
-              ' onClick="this.form.submit();">'."\n".
+              ' onclick="this.form.submit();" />'."\n".
               '</td>';
             }
             $discussion .= (<<END);
@@ -632,9 +666,11 @@ END
               </table>
              </td>
             </tr>
-           </table>
-           <br /><br /></form>
 END
+            $discussion .= &action_links_bar($colspan,$ressymb,$visible,
+                                             $newpostsflag,$group,
+                                             $prevread,$markondisp,$seehidden);
+            $discussion .= "</table></form>\n";
         } 
         if ($outputtarget eq 'export') {
             if ($manifestok) {
@@ -666,13 +702,13 @@ END
                     open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
                     close(OUTPUT);
                     chdir $cwd;
-                    $discussion .= 'Download the zip file from <a href="'.$imszipfile.'">Discussion Posting Archive</a><br />';
+                    $discussion .= &mt('Download the zip file from [_1]Discussion Posting Archive','<a href="'.$imszipfile.'">').'</a><br />';
                     if ($copyresult) {
-                        $discussion .= 'The following errors occurred during export - <br />'.$copyresult;
+                        $discussion .= &mt('The following errors occurred during export').' - <br />'.$copyresult;
                     }
                 }
             } else {
-                $discussion .= '<br />Unfortunately you will not be able to retrieve an archive of the discussion posts at this time, because there was a problem creating a manifest file.<br />';
+                $discussion .= '<br />'.&mt('Unfortunately you will not be able to retrieve an archive of the discussion posts at this time, because there was a problem creating a manifest file.').'<br />';
             }
             return $discussion;
         }
@@ -680,87 +716,335 @@ END
     if ($discussiononly) {
         my $now = time;
         my $attachnum = 0;
-        my $newattachmsg = '';
-        my @currnewattach = ();
-        my @currdelold = ();
+        my $currnewattach = [];
+        my $currdelold = [];
         my $comment = '';
         my $subject = '';
         if ($env{'form.origpage'}) {
             &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['addnewattach','deloldattach','delnewattach','timestamp','idx','subject','comment']);
-            $subject = &Apache::lonnet::unescape($env{'form.subject'});
-            $comment = &Apache::lonnet::unescape($env{'form.comment'});
+            $subject = &unescape($env{'form.subject'});
+            $comment = &unescape($env{'form.comment'});
             my @keepold = ();
-            &process_attachments(\@currnewattach,\@currdelold,\@keepold);
-            if (@currnewattach > 0) {
-                $attachnum += @currnewattach;
+            &process_attachments($currnewattach,$currdelold,\@keepold);
+            if (@{$currnewattach} > 0) {
+                $attachnum += @{$currnewattach};
             }
         }
-	if (&discussion_open($status)) {
-	    $discussion.=(<<ENDDISCUSS);
-<form action="/adm/feedback" method="post" name="mailform" enctype="multipart/form-data">
-<input type="submit" name="discuss" value="Post Discussion" />
-<input type="submit" name="anondiscuss" value="Post Anonymous Discussion" />
-<input type="hidden" name="symb" value="$ressymb" />
-<input type="hidden" name="sendit" value="true" />
-<input type="hidden" name="timestamp" value="$now" />
-<br /><a name="newpost"></a>
-<font size="1">Note: in anonymous discussion, your name is visible only 
-to course faculty</font><br />
-<b>Title:</b>&nbsp;<input type="text" name="subject" value="$subject" size="30" /><br /><br />
-<textarea name="comment" cols="80" rows="14" wrap="hard">$comment</textarea>
-ENDDISCUSS
-            if ($env{'form.origpage'}) {
-                $discussion.='<input type="hidden" name="origpage" value="'.$env{'form.origpage'}.'" />'."\n";
-                foreach (@currnewattach) {
-                    $discussion.='<input type="hidden" name="currnewattach" value="'.$_.'" />'."\n";
-                }
-            }
-            $discussion.="</form>\n";
-            if ($outputtarget ne 'tex') {
-                $discussion.=&generate_attachments_button('',$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,'',$mode);
-                if (@currnewattach > 0) {
-                    $newattachmsg .= '<b>New attachments</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";
-                    }
+	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$})) {
+                    $discussion .=
+			&postingform_display($mode,$ressymb,$now,$subject,
+					     $comment,$outputtarget,$attachnum,
+					     $currnewattach,$currdelold,
+					     $group,$crstype);
                 }
-                $discussion.=$newattachmsg;
-	        $discussion.=&generate_preview_button();
-	    }
+            } 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>';
+                }
+            }
 	}
-    } else {
+        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'}:''))) {
-	    if ($outputtarget ne 'tex') {
-		$discussion.='<table bgcolor="#BBBBBB"><tr><td><a href="/adm/feedback?replydisc='.
-		    $ressymb.':::" '.$target.'>'.
-		    '<img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" border="0" />'.
-		    &mt('Post Discussion').'</a></td></tr></table>';
-	    }
-	}
+            $discussion.= &send_feedback_link($ressymb);
+            if ($env{'request.role.adv'}) {
+                my $close = &Apache::lonnet::EXT('resource.0.discussend',$ressymb);
+                my $canvote = &Apache::lonnet::EXT('resource.0.discussvote',$ressymb);
+                if (defined($close) && $close ne '' && $close < time) {
+                    if ($canvote eq 'notended') {
+                        $discussion .= '&nbsp;'.&mt('(Posting and voting closed for [_1] roles)',
+                                                    &Apache::lonnet::plaintext('st',$crstype));
+                    } else {
+                        $discussion .= '&nbsp;'.&mt('(Closed for [_1] roles)',
+                                                    &Apache::lonnet::plaintext('st',$crstype));
+                    }
+                }
+            }
+	} else {
+            $discussion.= '<span class="LC_feedback_link">'.&mt('This discussion is closed.').'</span>';
+        }
+	$discussion.= &send_message_link($ressymb).'</div>';
     }
     return $discussion;
 }
 
+sub can_see_hidden {
+    my ($mode,$ressymb,$feedurl,$group,$cdom,$cnum,$crs) = @_;
+    my $seehidden;
+    if ($env{'request.course.id'}) {
+        unless ($cdom ne '' && $cnum ne '') {
+            $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+            $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        }
+        if ($crs eq '') {
+            $crs = '/'.$env{'request.course.id'};
+            if ($env{'request.course.sec'}) {
+                $crs.='_'.$env{'request.course.sec'};
+            }
+            $crs=~s{_}{/}g;
+        }
+        if ($mode eq '') {
+            $mode='board';
+            if ($feedurl =~ /$LONCAPA::assess_re/) {
+                $mode='problem';
+            }
+        }
+        if (($group ne '') && ($mode eq 'board') &&
+            ($ressymb =~ m{^bulletin___\d+\Q___adm/wrapper/adm/$cdom/$cnum/\E\d+/bulletinboard$})) {
+            if (&check_group_priv($group,'dgp') eq 'ok') {
+                $seehidden = 1;
+            }
+        } else {
+            $seehidden=&Apache::lonnet::allowed('rin',$crs);
+        }
+    }
+    return $seehidden;
+}
+
+sub discussion_link {
+   my ($ressymb,$linktext,$cmd,$item,$flag,$prev,$adds,$title)=@_;
+   my $link='/adm/feedback?inhibitmenu=yes&modal=yes&'.$cmd.'='.&escape($ressymb).':::'.$item;
+   if ($flag) { $link .= '&amp;previous='.$prev; }
+   if ($adds) { $link .= $adds; }
+   my $width=600;
+   my $height=600;
+   if (($cmd eq 'hide') || ($cmd eq 'unhide') || ($cmd eq 'like') || ($cmd eq 'unlike')) {
+       $width=300;
+       $height=200;
+   }
+   return &Apache::loncommon::modal_link($link,$linktext,$width,$height,undef,undef,$title);
+}
+
+
+sub send_feedback_link {
+    my ($ressymb) = @_;
+    return '<span class="LC_feedback_link">'.
+                 &discussion_link($ressymb,
+                    '<img alt="" class="LC_noBorder" src="'.
+                    &Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').
+                    '" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Post Discussion').'</span>',
+                    'replydisc').
+           '</span>';
+}
+
+sub send_message_link {
+    my ($ressymb) = @_;
+    my $output = '<span class="LC_message_link">'.
+                 &discussion_link($ressymb,
+                    '<img alt="" class="LC_noBorder" src="'.
+                    &Apache::loncommon::lonhttpdurl('/res/adm/pages/feedback.png').
+                    '" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Send Feedback').'</span>',
+                    'sendmessageonly').
+                 '</span>';
+    return $output;
+}
+
+sub action_links_bar {
+    my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp,
+        $seehidden) = @_;
+    my $discussion = '<tr><td colspan="'.$colspan.'">'.
+                     '<table width="100%"><tr>'.
+                     '<td class="LC_disc_action_left">';
+    my $escsymb=&escape($ressymb);
+    if ($visible) {
+        $discussion .= '<a href="/adm/feedback?cmd=threadedon&amp;symb='.$escsymb;
+        if ($newpostsflag) {
+            $discussion .= '&amp;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 .= '&amp;previous='.$prevread;
+        }
+        $discussion .= &group_args($group);
+        $discussion .='">'.&mt('Chronological View').'</a>&nbsp;&nbsp;';
+
+        my $otherviewurl='/adm/feedback?cmd=sortfilter&amp;symb='.$escsymb.'&amp;inhibitmenu=yes&amp;modal=yes';
+        if ($newpostsflag) {
+            $otherviewurl .= '&amp;previous='.$prevread;
+        }
+        $otherviewurl .= &group_args($group);
+        $discussion .= &Apache::loncommon::modal_link($otherviewurl,&mt('Other Views ...'),800,340);
+        $discussion .= '<br />';
+    }
+    $discussion .='<a href="/adm/feedback?export='.$escsymb;
+    if ($newpostsflag) {
+        $discussion .= '&amp;previous='.$prevread;
+    }
+    $discussion .= &group_args($group);
+    $discussion .= '">'.&mt('Export').'</a>';
+    if ($seehidden) {
+        $discussion .= '&nbsp;&nbsp;';
+        $discussion .='<a href="/adm/feedback?undeleteall='.$escsymb;
+        if ($newpostsflag) {
+            $discussion .= '&amp;previous='.$prevread;
+        }
+        $discussion .= &group_args($group);
+        $discussion .= '">'.&mt('Undelete all deleted entries').'</a>';
+    }
+    $discussion.='</td>';
+    if ($newpostsflag) {
+        if (!$markondisp) {
+            $discussion .='<td class="LC_disc_action_right"><a href="/adm/preferences?action=changediscussions';
+            $discussion .= &group_args($group);
+            $discussion .= '">'.
+                           &mt('My general 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></td>';
+        } else {
+            $discussion .= '<td>&nbsp;</td>';
+        }
+    } else {
+        $discussion .= '<td>&nbsp;</td>';
+    }
+    $discussion .= '</tr></table></td></tr>';
+    return $discussion;
+}
+
+sub postingform_display {
+    my ($mode,$ressymb,$now,$subject,$comment,$outputtarget,$attachnum,
+        $currnewattach,$currdelold,$group,$crstype) = @_;
+    my $newattachmsg;
+    my %lt = &Apache::lonlocal::texthash(
+              'note' => 'Note: in anonymous discussion, your name is visible only to course faculty',
+             'title' => 'Title',
+             'podi' => 'Post Discussion',
+             'poan' => 'Post Anonymous Discussion',
+             'newa' => 'New attachments',
+    );
+    if ($crstype eq 'Community') {
+        $lt{'note'} = &mt('Note: in anonymous discussion, your name is visible only to community facilitators');
+    }
+    my ($postingform,$textareaclass);
+    if (&Apache::lonhtmlcommon::htmlareabrowser()) {
+        $postingform = &Apache::lonhtmlcommon::htmlareaselectactive();
+        $textareaclass = 'class="LC_richDefaultOff"';
+        if ($env{'request.course.id'}) {
+            unless (($env{'course.'.$env{'request.course.id'}.'.allow_limited_html_in_feedback'} =~ /^\s*yes\s*$/i) || ($env{'form.sendmessageonly'})) {
+                undef($textareaclass);
+            }
+        }
+    }
+    $postingform .= (<<ENDDISCUSS);
+<form action="/adm/feedback" method="post" name="mailform" enctype="multipart/form-data"> <input type="submit" name="discuss" value="$lt{'podi'}" />
+<input type="submit" name="anondiscuss" value="$lt{'poan'}" /> <input type="hidden" name="symb" value="$ressymb" />
+<input type="hidden" name="sendit" value="true" />
+<input type="hidden" name="timestamp" value="$now" />
+<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 />
+<textarea name="comment" cols="80" rows="14" id="comment" $textareaclass>$comment</textarea>
+ENDDISCUSS
+    if ($env{'form.origpage'}) {
+        $postingform .= '<input type="hidden" name="origpage" value="'.
+                        $env{'form.origpage'}.'" />'."\n";
+        foreach my $att (@{$currnewattach}) {
+            $postingform .= '<input type="hidden" name="currnewattach" '.
+                            'value="'.$att.'" />'."\n";
+        }
+    }
+    if (exists($env{'form.ref'})) {
+        $postingform .= '<input type="hidden" name="ref" value="'.
+                        $env{'form.ref'}.'" />';
+    }
+    if ($group ne '') {
+        $postingform .='<input type="hidden" name="group" value="'.$group.'" />';
+    }
+    my $blockblog = &Apache::loncommon::blocking_status('blogs');
+    if (!$blockblog) {
+        $postingform .= &add_blog_checkbox($crstype);
+    }
+    $postingform .= "</form>\n";
+    $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();
+    return $postingform;
+}
+
 sub build_posting_display {
-    my ($usernamesort,$subjectsort,$namesort,$notshown,$newitem,$dischash,$shown,$alldiscussion,$imsitems,$imsfiles,$roleinfo,$discussionitems,$replies,$depth,$posters,$maxdepth,$visible,$newpostsflag,$current,$status,$viewgrades,$seeid,$prevread,$sortposts,$ressymb,$target,$readkey,$showunmark,$showonlyunread,$totposters,$rolefilter,$sectionpick,$statusfilter,$toggkey,$outputtarget) = @_;
+    my ($usernamesort,$subjectsort,$namesort,$notshown,$newitem,$dischash,$shown,$alldiscussion,$imsitems,$imsfiles,$roleinfo,$discussionitems,$replies,$depth,$posters,$maxdepth,$visible,$newpostsflag,$current,$status,$viewgrades,$seeid,$seehidden,$canvote,$prevread,$sortposts,$ressymb,$readkey,$showunmark,$showonlyunread,$totposters,$rolefilter,$sectionpick,$grouppick,$classgroups,$statusfilter,$toggkey,$outputtarget,$anonhash,$anoncnt,$group) = @_;
     my @original=();
     my @index=();
+    my $skip_group_check = 0;
     my $symb=&Apache::lonenc::check_decrypt($ressymb);
+    my $escsymb=&escape($ressymb);
+# These are the discussion contributions
     my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
 			  $env{'course.'.$env{'request.course.id'}.'.domain'},
 			  $env{'course.'.$env{'request.course.id'}.'.num'});
-
+    my (%likes,%userlikes,%userunlikes,@theselikes,$oneplus,$twoplus,$oneminus,$twominus);
+    my $thisuser=$env{'user.name'}.':'.$env{'user.domain'};
+    if ($seeid || $canvote) {
+# And these are the likes/unlikes
+        %likes=&Apache::lonnet::dump('disclikes',
+                          $env{'course.'.$env{'request.course.id'}.'.domain'},
+                          $env{'course.'.$env{'request.course.id'}.'.num'},
+                          '^'.$symb.':');
+# Array with likes to figure out averages, etc.
+        @theselikes=();
+# Hashes containing likes and unlikes for this user.
+        %userlikes=();
+        %userunlikes=();
+    }
+# Is the user allowed to see the real name behind anonymous postings?
+    my $see_anonymous = 
+	&Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
+
+    if ((@{$grouppick} == 0) || (grep(/^all$/,@{$grouppick}))) {
+        $skip_group_check = 1;
+    }
+# Deletions and hiddens are just lists. Split them up into a hash for quicker lookup
+    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));
+    }
+# Versions if store/restore are used to actually store the messages. 
     if ($contrib{'version'}) {
         my $oldest = $contrib{'1:timestamp'};
         if ($prevread eq '0') {
@@ -768,22 +1052,75 @@ sub build_posting_display {
         }
         my ($skiptest,$rolematch,$roleregexp,$secregexp,$statusregexp);
         if ($sortposts) {
-            ($skiptest,$roleregexp,$secregexp,$statusregexp) = &filter_regexp($rolefilter,$sectionpick,$statusfilter);
+            ($skiptest,$roleregexp,$secregexp,$statusregexp) = 
+                     &filter_regexp($rolefilter,$sectionpick,$statusfilter);
             $rolematch = $roleregexp.':'.$secregexp.':'.$statusregexp;
-        } 
+        }
+        if ($seeid || $canvote) {
+# We need to go through this twice, first to get the likes/dislikes, then to actually build the display
+            for (my $id=1;$id<=$contrib{'version'};$id++) {
+                my $idx=$id;
+                next if ($contrib{$idx.':deleted'});
+                next if ($contrib{$idx.':hidden'});
+                unless ((($hiddens{$idx}) && (!$seehidden)) || ($deletions{$idx}) || (!$contrib{$idx.':message'})) {
+                    if ($likes{$symb.':'.$idx.':likes'} ne '') {
+                        push(@theselikes,$likes{$symb.':'.$idx.':likes'});
+                        if (ref($likes{$symb.':'.$idx.':likers'}) eq 'HASH') {
+                            if (exists($likes{$symb.':'.$idx.':likers'}{$thisuser})) {
+                                $userlikes{$idx} = 1;
+                            }
+                        }
+                        if (ref($likes{$symb.':'.$idx.':unlikers'}) eq 'HASH') {
+                            if (exists($likes{$symb.':'.$idx.':unlikers'}{$thisuser})) {
+                                $userunlikes{$idx} = 1;
+                            }
+                        }
+                    }
+                }
+            }
+# Figure out average likes and standard deviation if there are enough 
+# discussions to warrant that
+            my $ave=0;
+            my $stddev=10000;
+            if ($#theselikes>1) {
+                my $sum=0;
+                my $num=$#theselikes+1;
+                foreach my $thislike (@theselikes) {
+                    $sum+=$thislike;
+                }
+                $ave=$sum/$num;
+                my $sumsq=0;
+                foreach my $thislike (@theselikes) {
+                    $sumsq+=($thislike-$ave)*($thislike-$ave);
+                }
+                $stddev=sqrt($sumsq/$num);
+            }
+# Now we know the average likes $ave and the standard deviation $stddev
+# Get the boundaries for markup
+            $oneplus=$ave+$stddev;
+            $twoplus=$ave+2.*$stddev;
+            $oneminus=$ave-$stddev;
+            $twominus=$ave-2.*$stddev;
+        }
+#
+# This is now the real loop. Go through all entries, pick up what we need
+#
 	for (my $id=1;$id<=$contrib{'version'};$id++) {
 	    my $idx=$id;
+            next if ($contrib{$idx.':deleted'});
+            next if ($contrib{$idx.':hidden'});
+# If we get here, we are actually going to display the message - we don't know where and we don't know if we display
+# previous edits, but it counts as one entry
             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'}) {
-                if ( (($env{'environment.threadeddiscussion'}) && ($sortposts eq '')) || ($sortposts eq 'thread') || ($outputtarget eq 'export')) {
+                if ( ((!$env{'environment.unthreadeddiscussion'}) && ($sortposts eq '')) || 
+                     ($sortposts eq 'thread') || ($outputtarget eq 'export')) {
 # this is a follow-up message
 		    $original[$idx]=$original[$contrib{$idx.':replyto'}];
 		    $$depth[$idx]=$$depth[$contrib{$idx.':replyto'}]+1;
@@ -803,11 +1140,11 @@ sub build_posting_display {
 	    } else {
 		$$replies[$$depth[$idx]]=1;
 	    }
-	    unless ((($hidden) && (!$seeid)) || ($deleted)) {
+            unless ((($hiddens{$idx}) && (!$seehidden)) || ($deletions{$idx})) {
 		$$visible++;
                 if ($contrib{$idx.':history'}) {
                     if ($contrib{$idx.':history'} =~ /:/) {
-                        my @oldversions = split/:/,$contrib{$idx.':history'};
+                        my @oldversions = split(/:/,$contrib{$idx.':history'});
                         $numoldver = @oldversions;
                     } else {
                         $numoldver = 1;
@@ -818,10 +1155,17 @@ sub build_posting_display {
                 my %subjects = ();
                 my %attachtxt = ();
                 my %allattachments = ();
-                my ($screenname,$plainname);
+                my ($screenname,$plainname,$showaboutme);
                 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. 
+		my $key=$contrib{$idx.':sendername'}.'@'.$contrib{$idx.':senderdomain'};
+		unless ($$anonhash{$key}) {
+                    $anoncnt++;
+		    $$anonhash{$key}=&mt('Anonymous').' '.$anoncnt;
+		}
                 my ($message,$subject,$vgrlink,$ctlink);
-                &get_post_contents(\%contrib,$idx,$seeid,$outputtarget,\%messages,\%subjects,\%allattachments,\%attachtxt,$imsfiles,\$screenname,\$plainname,$numoldver);
+                &get_post_contents(\%contrib,$idx,$seeid,$seehidden,$outputtarget,\%messages,\%subjects,\%allattachments,\%attachtxt,$imsfiles,\$screenname,\$plainname,\$showaboutme,$numoldver);
 
 
 # Set up for sorting by subject
@@ -830,7 +1174,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).';
@@ -839,35 +1183,44 @@ sub build_posting_display {
 
                         if ($subject eq '') {
                            if (defined($$subjectsort{'__No subject'})) {
-                               push @{$$subjectsort{'__No subject'}}, $idx;
+                               push(@{$$subjectsort{'__No subject'}}, $idx);
                            } else {
                                @{$$subjectsort{'__No subject'}} = ("$idx");
                            }
                         } else {
                             if (defined($$subjectsort{$subject})) {
-                               push @{$$subjectsort{$subject}}, $idx;
+                               push(@{$$subjectsort{$subject}}, $idx);
                             } else {
                                @{$$subjectsort{$subject}} = ("$idx");
                             }
                         }
-		        if ((!$contrib{$idx.':anonymous'}) || ($seeid)) {
-			    $sender=&Apache::loncommon::aboutmewrapper(
-					 $plainname,
-					 $contrib{$idx.':sendername'},
-					 $contrib{$idx.':senderdomain'}).' ('.
-					 $contrib{$idx.':sendername'}.' at '.
-					 $contrib{$idx.':senderdomain'}.')';
+		        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 = '<b>'.$sender.'</b>';
 			    if ($contrib{$idx.':anonymous'}) {
-			        $sender.=' ['.&mt('anonymous').'] '.
+			        $sender.=' <font color="red"><b>['.$$anonhash{$key}.']</b></font> '.
 				    $screenname;
 			    }
-
+			    if ($see_anonymous) {
+				$sender.=&Apache::loncommon::student_image_tag($contrib{$idx.':senderdomain'},$contrib{$idx.':sendername'});
+			    }
 # Set up for sorting by domain, then username
                             unless (defined($$usernamesort{$contrib{$idx.':senderdomain'}})) {
                                 %{$$usernamesort{$contrib{$idx.':senderdomain'}}} = ();
                             }
                             if (defined($$usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}})) {
-                                push @{$$usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}}}, $idx;
+                                push(@{$$usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}}}, $idx);
                             } else {
                                 @{$$usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}}} = ("$idx");
                             }
@@ -887,59 +1240,57 @@ sub build_posting_display {
                                 %{$$namesort{$lastname}} = ();
                             }
                             if (defined($$namesort{$lastname}{$firstname})) {
-                                push @{$$namesort{$lastname}{$firstname}}, $idx;
+                                push(@{$$namesort{$lastname}{$firstname}}, $idx);
                             } else {
                                 @{$$namesort{$lastname}{$firstname}} = ("$idx");
                             }
-                            if ($env{'course.'.$env{'request.course.id'}.'.allow_discussion_post_editing'} =~ m/yes/i) {
-                                if (($env{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($env{'user.name'} eq $contrib{$idx.':sendername'})) {
-                                    $sender.=' <a href="/adm/feedback?editdisc='.
-                                         $ressymb.':::'.$idx;
-                                    if ($newpostsflag) {
-                                        $sender .= '&previous='.$prevread;
-                                    }
-                                    $sender .= '" '.$target.'>'.&mt('Edit').'</a>';                                             
-                                    unless ($seeid) {
-                                        $sender.=" <a href=\"javascript:studentdelete('$ressymb','$idx','$newpostsflag','$prevread')";
-                                        $sender .= '">'.&mt('Delete').'</a>';
-                                    }
+                            if ($outputtarget ne 'tex') {
+# Add karma stars
+                                my $karma=&userkarma($contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'});
+                                for (my $i=1;$i<=$karma;$i++) {
+                                    $sender.='<img border="0" src="/res/adm/pages/star.gif" alt="'.&mt('Contributor Kudos').'" />';
                                 }
-                            } 
-			    if ($seeid) {
-			        if ($hidden) {
-                                    unless ($studenthidden) {
-			                $sender.=' <a href="/adm/feedback?unhide='.
-				                $ressymb.':::'.$idx;
-                                        if ($newpostsflag) {
-                                             $sender .= '&previous='.$prevread;
+# Can people edit this?
+                                if (&editing_allowed($escsymb.':::'.$idx,$group)) {
+                                    if (($env{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($env{'user.name'} eq $contrib{$idx.':sendername'})) {
+                                        $sender.=' '.
+                                         &discussion_link($symb,&mt('Edit'),'editdisc',$idx,$$newpostsflag,$prevread,&group_args($group));
+                                        unless ($seehidden) {
+                                            my $grpargs = &group_args($group);
+                                            $sender.=" <a href=\"javascript:verifydelete('studentdelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')";
+                                            $sender .= '">'.&mt('Delete').'</a>';
                                         }
-                                        $sender .= '">'.&mt('Make Visible').'</a>';
-                                    }
-			        } else {
-				    $sender.=' <a href="/adm/feedback?hide='.
-				        $ressymb.':::'.$idx;
-                                    if ($newpostsflag) {
-                                        $sender .= '&previous='.$prevread;
                                     }
-                                    $sender .= '">'.&mt('Hide').'</a>';
-			        }                     
-			        $sender.=' <a href="/adm/feedback?deldisc='.
-				        $ressymb.':::'.$idx;
-                                if ($newpostsflag) {
-                                    $sender .= '&previous='.$prevread;
                                 }
-                                $sender .= '">'.&mt('Delete').'</a>';
+			        if ($seehidden) {
+			            if ($hiddens{$idx}) {
+                                        unless ($studenthidden) {
+ 		                           $sender.=' '.
+                                            &discussion_link($symb,&mt('Make Visible'),'unhide',$idx,$$newpostsflag,$prevread,&group_args($group));
+                                        }
+			            } else {
+                                        $sender.=' '.
+                                         &discussion_link($symb,&mt('Hide'),'hide',$idx,$$newpostsflag,$prevread,&group_args($group));
+			            }
+                                    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 {
+				$sender='<i>'.$$anonhash{$key}.'</i>';
 			    }
+                            $sender = '<b>'.$sender.'</b>';
 # Set up for sorting by domain, then username for anonymous
                             unless (defined($$usernamesort{'__anon'})) {
                                 %{$$usernamesort{'__anon'}} = ();
                             }
                             if (defined($$usernamesort{'__anon'}{'__anon'})) {
-                                push @{$$usernamesort{'__anon'}{'__anon'}}, $idx;
+                                push(@{$$usernamesort{'__anon'}{'__anon'}}, $idx);
                             } else {
                                 @{$$usernamesort{'__anon'}{'__anon'}} = ("$idx");
                             }
@@ -948,37 +1299,42 @@ sub build_posting_display {
                                 %{$$namesort{'__anon'}} = ();
                             }
                             if (defined($$namesort{'__anon'}{'__anon'})) {
-                                push @{$$namesort{'__anon'}{'__anon'}}, $idx;
+                                push(@{$$namesort{'__anon'}{'__anon'}}, $idx);
                             } else {
                                 @{$$namesort{'__anon'}{'__anon'}} = ("$idx");
                             }
 		        }
-		        if (&discussion_open($status) &&
-			        &Apache::lonnet::allowed('pch',
-						 $env{'request.course.id'}.
-						 ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
-			    $sender.=' <a href="/adm/feedback?replydisc='.
-			            $ressymb.':::'.$idx;
-                            if ($newpostsflag) {
-                                    $sender .= '&previous='.$prevread;
+                        if ($outputtarget ne 'tex') {
+		            if (&discussion_open($status)) {
+                                if (($group ne '') && 
+                                    (&check_group_priv($group,'pgd') eq 'ok')) {
+                                     $sender.=' '.
+                                         &discussion_link($symb,&mt('Reply'),'replydisc',$idx,$$newpostsflag,$prevread,&group_args($group));
+                                } elsif (&Apache::lonnet::allowed('pch', 
+				     $env{'request.course.id'}.
+				     ($env{'request.course.sec'}?'/'.
+                                      $env{'request.course.sec'}:''))) {
+			             $sender.=' '.
+                                         &discussion_link($symb,&mt('Reply'),'replydisc',$idx,$$newpostsflag,$prevread);
+                                }
+                            }
+		            if ($viewgrades) {
+			        $vgrlink=&Apache::loncommon::submlink(&mt('Submissions'),
+                                $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>';
                             }
-                            $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
-                        }
-		        if ($viewgrades) {
-			        $vgrlink=&Apache::loncommon::submlink('Submissions',
-                            $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
                 }
                 if ($outputtarget eq 'export' || $message) {
 		    my $thisindex=$idx;
-		    if ( (($env{'environment.threadeddiscussion'}) && ($sortposts eq '')) || ($sortposts eq 'thread') || ($outputtarget eq 'export')) {
+		    if ( ((!$env{'environment.unthreadeddiscussion'}) && ($sortposts eq '')) || 
+                         ($sortposts eq 'thread') || ($outputtarget eq 'export')) {
 			$thisindex=$origindex.substr('00'.$$replies[$$depth[$idx]],-2,2);
 		    }
 		    $$alldiscussion{$thisindex}=$idx;
@@ -988,7 +1344,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};
@@ -996,7 +1352,7 @@ sub build_posting_display {
                     $$imsitems{$idx}{'attach'}=$attachtxt{$numoldver};
                     $$imsitems{$idx}{'timestamp'}=$contrib{$idx.':timestamp'};
                     $$imsitems{$idx}{'sender'}=$plainname.' ('.
-                                         $contrib{$idx.':sendername'}.' at '.
+                                         $contrib{$idx.':sendername'}.':'.
                                          $contrib{$idx.':senderdomain'}.')';
                     $$imsitems{$idx}{'isanonymous'}='false';
                     if ($contrib{$idx.':anonymous'}) {
@@ -1010,16 +1366,17 @@ sub build_posting_display {
                 } else {
                     if ($message) {
                         my $spansize = 2;
+                        my ($uname,$udom);
                         if ($showonlyunread && $prevread > $posttime) {
                             $$notshown{$idx} = 1;
                         } elsif ($showunmark && $$dischash{$readkey}=~/\.$idx\./) {
                             $$notshown{$idx} = 1;
                         } else {
 # apply filters
-                            my $uname = $contrib{$idx.':sendername'};
-                            my $udom = $contrib{$idx.':senderdomain'};
+                            $uname = $contrib{$idx.':sendername'};
+                            $udom = $contrib{$idx.':senderdomain'};
                             my $poster = $uname.':'.$udom;
-                            if (defined($env{'form.totposters'})) {
+                            if ($env{'form.totposters'} ne '') {
                                 if ($totposters == 0) {
                                     $$shown{$idx} = 0;
                                 } elsif ($totposters > 0) {
@@ -1044,6 +1401,23 @@ sub build_posting_display {
                                         }
                                     }
                                 }
+                                if ($$shown{$idx} && !$skip_group_check) {
+                                    my $showflag = 0;
+                                    if (ref($$classgroups{$poster}{active}) eq 'HASH') {
+                                        foreach my $grp (@{$grouppick}) {
+                                            if (grep/^\Q$grp\E$/,
+                                 keys(%{$$classgroups{$poster}{active}})) {
+                                                $showflag = 1;
+                                                last;
+                                            }
+                                        }
+                                    }
+                                    if ($showflag) {
+                                        $$shown{$idx} = 1;
+                                    } else {
+                                        $$shown{$idx} = 0;
+                                    }
+                                }
                             } else {
                                 $$shown{$idx} = 1;
                             }
@@ -1051,34 +1425,88 @@ sub build_posting_display {
                         unless ($$notshown{$idx} == 1) {
                             if ($prevread > 0 && $prevread <= $posttime) {
                                 $$newitem{$idx} = 1;
-                                $$discussionitems[$idx] .= '
-                                 <p><table border="0" width="100%">
-                                  <tr><td align="left"><font color="#FF0000"><b>NEW</b></font></td>';
+                                $$discussionitems[$idx] .= '<font color="#FF0000"><b>'.&mt('NEW').'&nbsp;&nbsp;</b></font>';
                             } else {
                                 $$newitem{$idx} = 0;
-                                $$discussionitems[$idx] .= '
-                                 <p><table border="0" width="100%">
-                                  <tr><td align="left">&nbsp;</td>';
-                            }
-                            $$discussionitems[$idx] .= '<td align ="left">&nbsp;&nbsp;'.
-                                '<b>'.$subject.'</b>&nbsp;&nbsp;'.
-                                $sender.'</b> '.$vgrlink.' ('.
-                                &Apache::lonlocal::locallocaltime($posttime).')</td>';
+                            }
+                            $$discussionitems[$idx] .= '<b>'.$subject.'</b>&nbsp;&nbsp;'.
+                                $sender.' '.$vgrlink.' ('.
+                                &Apache::lonlocal::locallocaltime($posttime).')';
                             if ($$dischash{$toggkey}) {
-                                $$discussionitems[$idx].='<td align="right">&nbsp;&nbsp;'.
-                                  $ctlink.'</td>';
+                                $$discussionitems[$idx].='&nbsp;&nbsp;'.$ctlink;
                             }
-                            $$discussionitems[$idx].= '</tr></table><blockquote>'.
-                                    $message.'</blockquote></p>';
+                            my $thislikes=$likes{$symb.':'.$idx.':likes'};
+                            my $likesize="100";
+                            if ($seeid || $canvote) {
+# Figure out size based on likes
+                                my $thislikes=$likes{$symb.':'.$idx.':likes'};
+                                if ($thislikes>$twoplus) {
+                                    $likesize="200";
+                                } elsif ($thislikes>$oneplus) {
+                                    $likesize="150";
+                                }
+                                if ($thislikes<$twominus) {
+                                    $likesize="50";
+                                } elsif ($thislikes<$oneminus) {
+                                    $likesize="75";
+                                }
+                            }
+# Actually glue in the message itself
+                            $$discussionitems[$idx].= '<br /><blockquote>'.
+                                    "<div style='font-size:$likesize%'>".
+                                    $message.
+                                    '</div></blockquote>';
+                            if ($canvote) {
+                                my $ownpost;
+                                if (($uname eq $env{'user.name'}) &&
+                                    ($udom eq $env{'user.domain'})) {
+                                    $ownpost = 1;
+                                }   
+# Put in the like and unlike buttons
+                                if ($ownpost || (($hiddens{$idx}) && ($seehidden))) { 
+                                    my $novote;
+                                    if ($ownpost) { 
+                                        $novote = &mt('No voting for your own posts.');
+                                    } else {
+                                        $novote = &mt('No voting for hidden posts.');
+                                    }
+                                    $$discussionitems[$idx].=
+                                        '<a href="javascript:alert('."'$novote'".');" style="text-decoration: none;">'.
+                                        '<img border="0" src="/res/adm/pages/thumbsup_novote.png" alt="'.$novote.'" />&nbsp;'.
+                                        '<img border="0" src="/res/adm/pages/thumbsdown_novote.png" alt="'.$novote.'" /></a>'; 
+
+                                } else {
+                                    if ($userlikes{$idx}) {
+                                        $$discussionitems[$idx].='<img border="0" src="/res/adm/pages/thumbsup_gray.png" alt="'.&mt('You like this posting').'" />';
+                                    } else {
+                                        $$discussionitems[$idx].='&nbsp;'.&discussion_link($symb,'<img border="0" src="/res/adm/pages/thumbsup.png" alt="'.&mt('Like').'" />','like',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Like this posting"));
+                                    }
+                                    if ($userunlikes{$idx}) {
+                                        $$discussionitems[$idx].='<img border="0" src="/res/adm/pages/thumbsdown_gray.png" alt="'.&mt('You unlike this posting').'" />';
+                                    } else {
+                                        $$discussionitems[$idx].='&nbsp;'.&discussion_link($symb,'<img border="0" src="/res/adm/pages/thumbsdown.png" alt="'.&mt('Unlike').'" />','unlike',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Unlike this posting"));
+                                    }
+                                }
+                            }
+                            if ($seeid || $canvote) {
+                                my $thislikes=$likes{$symb.':'.$idx.':likes'};
+                                if ($thislikes>0) {
+                                    $$discussionitems[$idx].='&nbsp;('.&mt("[_1] likes",$thislikes).')';
+                                } elsif ($thislikes<0) {
+                                    $$discussionitems[$idx].='&nbsp;('.&mt("[_1] unlikes",abs($thislikes)).')';
+                                }
+                            }
+# If there is any history to this post, inform the reader
                             if ($contrib{$idx.':history'}) {
                                 my @postversions = ();
-                                $$discussionitems[$idx] .= &mt('This post has been edited by the author.');
-                                if ($seeid) {
-                                    $$discussionitems[$idx] .= '&nbsp;&nbsp;<a href="/adm/feedback?allversions='.$ressymb.':::'.$idx.'">'.&mt('Display all versions').'</a>';
+                                $$discussionitems[$idx] .= '&nbsp;&nbsp;'.&mt('This post has been edited by the author.');
+                                if ($seehidden) {
+                                    $$discussionitems[$idx] .= '&nbsp;&nbsp;'.
+                                         &discussion_link($symb,&mt('Display all versions'),'allversions',$idx,$$newpostsflag,$prevread,&group_args($group));
                                 }
                                 $$discussionitems[$idx].='<br/>'.&mt('Earlier version(s) were posted on: ');
                                 if ($contrib{$idx.':history'} =~ m/:/) {
-                                    @postversions = split/:/,$contrib{$idx.':history'};
+                                    @postversions = split(/:/,$contrib{$idx.':history'});
                                 } else {
                                     @postversions = ("$contrib{$idx.':history'}");
                                 }
@@ -1087,12 +1515,19 @@ sub build_posting_display {
                                     $$discussionitems[$idx] .= '<b>'.$version.'.</b> - '.&Apache::lonlocal::locallocaltime($postversions[$i]).'  ';
                                 }
                             }
+# end of unless ($$notshown ...)
                         }
+# end of if ($message) ...
                     }
+# end of the else-branch of target being export
                 }
+# end of unless hidden or deleted
             }
+# end of the loop over all discussion entries
 	}
+# end of "if there actually are any discussions
     }
+# end of subroutine "build_posting_display" 
 }
 
 sub filter_regexp {
@@ -1101,9 +1536,9 @@ sub filter_regexp {
     my $skiptest = 1;
     if (@{$rolefilter} > 0) {
         my @okrolefilter = ();
-        foreach (@{$rolefilter}) {
-            unless ($_ eq '') {
-                push @okrolefilter, $_;
+        foreach my $role (@{$rolefilter}) {
+            unless ($role eq '') {
+                push(@okrolefilter, $role);
             }
         }
         if (@okrolefilter > 0) {
@@ -1121,9 +1556,9 @@ sub filter_regexp {
     }
     if (@{$sectionpick} > 0) {
         my @oksectionpick = ();
-        foreach (@{$sectionpick}) {
-            unless ($_ eq '') {
-                 push @oksectionpick, $_;
+        foreach my $sec (@{$sectionpick}) {
+            unless ($sec eq '') {
+                 push(@oksectionpick, $sec);
             }
         }
         if ((@oksectionpick > 0) && (!grep/^all$/,@oksectionpick)) {
@@ -1137,6 +1572,7 @@ sub filter_regexp {
             $secregexp .= '[^:]*';
         }
     }
+
     if (defined($statusfilter) && $statusfilter ne '') {
         if ($statusfilter eq 'all') {
             $statusregexp = '[^:]+';
@@ -1150,45 +1586,48 @@ sub filter_regexp {
 
 
 sub get_post_contents {
-    my ($contrib,$idx,$seeid,$type,$messages,$subjects,$allattachments,$attachtxt,$imsfiles,$screenname,$plainname,$numver) = @_;
+    my ($contrib,$idx,$seeid,$seehidden,$type,$messages,$subjects,$allattachments,$attachtxt,$imsfiles,$screenname,$plainname,$showaboutme,$numver) = @_;
     my $discussion = '';
     my $start=$numver;
     my $end=$numver + 1;
     %{$$imsfiles{$idx}}=();
     if ($type eq 'allversions') {
-       unless($seeid) {
-           $discussion=&mt('You do not have privileges to view all versions of posts.').&mt('Please select a different role');
+       unless($seehidden) {
+           $discussion=&mt('You do not have privileges to view all versions of posts.').' '.&mt('Please select a different role.');
            return $discussion;
        } 
     }
 #    $$screenname=&Apache::loncommon::screenname(
 #                                        $$contrib{$idx.':sendername'},
 #                                        $$contrib{$idx.':senderdomain'});
-#    $$plainname=&Apache::loncommon::nickname(
-#                                        $$contrib{$idx.':sendername'},
-#                                        $$contrib{$idx.':senderdomain'});
-    ($$screenname,$$plainname)=($$contrib{$idx.':screenname'},
-				$$contrib{$idx.':plainname'});
-    my $sender=&Apache::loncommon::aboutmewrapper(
+    $$plainname=&Apache::loncommon::nickname(
+                                        $$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'}).' ('.
-                                 $$contrib{$idx.':sendername'}.' at '.
-                                 $$contrib{$idx.':senderdomain'}.')';
+                                 $$contrib{$idx.':senderdomain'});
+    }
+    if ($seeid) {
+        $sender .= ' ('.$$contrib{$idx.':sendername'}.':'.
+                   $$contrib{$idx.':senderdomain'}.')';
+    }
     my $attachmenturls = $$contrib{$idx.':attachmenturl'};
     my @postversions = ();
     if ($type eq 'allversions' || $type eq 'export') {
         $start = 0;
         if ($$contrib{$idx.':history'}) {
-            if ($$contrib{$idx.':history'} =~ m/:/) {
-                @postversions = split/:/,$$contrib{$idx.':history'};
-            } else {
-                @postversions = ("$$contrib{$idx.':history'}");
-            }
+	    @postversions = split(/:/,$$contrib{$idx.':history'});
         }
         &get_post_versions($messages,$$contrib{$idx.':message'},1);
         &get_post_versions($subjects,$$contrib{$idx.':subject'},1);
-        push @postversions,$$contrib{$idx.':timestamp'};
+        push(@postversions,$$contrib{$idx.':timestamp'});
         $end = @postversions;
     } else {
         &get_post_versions($messages,$$contrib{$idx.':message'},1,$numver);
@@ -1205,7 +1644,9 @@ sub get_post_contents {
         my ($timesent,$attachmsg);
         my %currattach = ();
         $timesent = &Apache::lonlocal::locallocaltime($postversions[$i]);
-        $$messages{$i}=~s/\n/\<br \/\>/g;
+        unless (&contains_block_html($messages->{$i})) {
+            &newline_to_br(\$messages->{$i});
+        }
         $$messages{$i}=&Apache::lontexconvert::msgtexconverted($$messages{$i});
         $$subjects{$i}=~s/\n/\<br \/\>/g;
         $$subjects{$i}=&Apache::lontexconvert::msgtexconverted($$subjects{$i});
@@ -1215,18 +1656,18 @@ sub get_post_contents {
         if ($type eq 'export') {
             $$imsfiles{$idx}{$i} = '';
             if ($attachmsg) {
-                $$attachtxt{$i} = '<br />Attachments:<br />';
-                foreach (sort keys %currattach) {
-                    if ($$allattachments{$_}{'filename'} =~ m-^/uploaded/([^/]+/[^/]+)(/feedback)?(/?\d*)/([^/]+)$-) {
+                $$attachtxt{$i} = '<br />'.&mt('Attachments').':<br />';
+                foreach my $key (sort(keys(%currattach))) {
+                    if ($$allattachments{$key}{'filename'} =~ m-^/uploaded/([^/]+/[^/]+)(/feedback)?(/?\d*)/([^/]+)$-) {
                         my $fname = $1.$3.'/'.$4;
-                        $$imsfiles{$idx}{$i} .= '<file href="'.$fname.'">'."\n";
+                        $$imsfiles{$idx}{$i} .= '<file href="'.$fname.'" />'."\n";
                         $$attachtxt{$i}.= '<a href="'.$fname.'">'.$4.'</a><br />';
                     }
                 }
             }
         } else {
             if ($attachmsg) {
-                $$attachtxt{$i} = '<br />Attachments:'.$attachmsg.'<br />';
+                $$attachtxt{$i} = '<br />'.&mt('Attachments').':'.$attachmsg.'<br />';
             } else {
                 $$attachtxt{$i} = '';
             }
@@ -1240,7 +1681,7 @@ END
         }
     }
     if ($type eq 'allversions') {
-        $discussion.=('</ul></body></html>');
+        $discussion.='</ul>';
         return $discussion;
     } else {
         return;
@@ -1250,11 +1691,11 @@ END
 sub replicate_attachments {
     my ($attachrefs,$tempexport) = @_;
     my $response;
-    foreach my $id (keys %{$attachrefs}) {
+    foreach my $id (keys(%{$attachrefs})) {
         if ($$attachrefs{$id}{'filename'} =~ m-^/uploaded/([^/]+)/([^/]+)(/feedback)?(/?\d*)/([^/]+)$-) {
             my $path = $tempexport;
             my $tail = $1.'/'.$2.$4;
-            my @extras = split/\//,$tail;
+            my @extras = split(/\//,$tail);
             my $destination = $tempexport.'/'.$1.'/'.$2.$4.'/'.$5;
             if (!-e $destination) {
                 my $i= 0;
@@ -1273,11 +1714,11 @@ sub replicate_attachments {
                         print $attachcopy $content;
                         close($attachcopy);
                     } else {
-                        $response .= 'Error copying file attachment - '.$5.' to IMS package: '.$!.'<br />'."\n";
+                        $response .= &mt('Error copying file attachment - [_1] to IMS package',$5).': '.$!.'<br />'."\n";
                     }
                 } else {
                     &Apache::lonnet::logthis("Replication of attachment failed when building IMS export of discussion posts - domain: $1, course: $2, file: $$attachrefs{$id}{'filename'} -error: $rtncode");
-                    $response .= 'Error copying file attachment - '.$5.' to IMS package: '.$rtncode.'<br />'."\n";
+                    $response .= &mt('Error copying file attachment - [_1] to IMS package: ',$5).$rtncode.'<br />'."\n";
                 }
             }
         }
@@ -1286,14 +1727,23 @@ sub replicate_attachments {
 }
 
 sub mail_screen {
-  my ($r,$feedurl,$options) = @_;
+  my ($r,$feedurl,$options,$caller_symb,$attachmaxtext) = @_;
   if (exists($env{'form.origpage'})) {
-      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','currnewattach','addnewattach','deloldattach','delnewattach','timestamp','idx','anondiscuss','discuss']);
+      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','currnewattach','addnewattach','deloldattach','delnewattach','timestamp','idx','anondiscuss','discuss','blog','group','ref']);
   }
-  my $bodytag=&Apache::loncommon::bodytag('Resource Feedback and Discussion',
-                                          '','onLoad="window.focus();setposttype();"');
-  my $title=&Apache::lonnet::gettitle($feedurl);
-  if (!$title) { $title = $feedurl; }
+
+  my %lt = &Apache::lonlocal::texthash(
+            'myqu' => 'Question/comment/feedback:',
+            'title' => 'Title',
+            'reta' => 'Retained attachments',
+            'atta' => 'Attachment',
+           );
+  if($env{'form.editdisc'} || $env{'form.replydisc'}){
+    %lt = &Apache::lonlocal::texthash(
+            'myqu' => 'Post Discussion',
+    );
+  }
+  my $restitle = &get_resource_title($caller_symb,$feedurl);
   my $quote='';
   my $subject = '';
   my $comment = '';
@@ -1311,12 +1761,15 @@ sub mail_screen {
   my $attachnum = 0;
   my $anonchk = (<<END);
   function anonchk() {
-     if (document.mailform.anondiscuss.checked == true) {
-          document.attachment.anondiscuss.value = '1'
-     }
-     if (document.mailform.discuss.checked == true) {
-          document.attachment.discuss.value = '1'
-     }
+      for (var i=0; i < document.mailform.discuss.length; i++) {
+	  if (document.mailform.discuss[i].checked) {
+	      document.attachment.discuss.value = 
+		  document.mailform.discuss[i].value;
+	  }
+      }
+      if (document.mailform.blog.checked) {
+	  document.attachment.blog.value = 1;
+      }
      return
    }
 END
@@ -1324,13 +1777,15 @@ END
   if (exists($env{'form.origpage'})) {
       $anonscript = (<<END);
   function setposttype() {
-      var anondisc = $env{'form.anondiscuss'};
-      var disc = $env{'form.discuss'};
-      if (anondisc == 1) {
-          document.mailform.anondiscuss.checked = true
+      var disc = "$env{'form.discuss'}";
+      for (var i=0; i < document.mailform.discuss.length; i++) {
+	  if (disc == document.mailform.discuss[i].value) {
+	      document.mailform.discuss[i].checked = 1;
+	  }
       }
-      if (disc == 1) {
-          document.mailform.discuss.checked = true
+      var blog = "$env{'form.blog'}";
+      if (blog == 1) {
+          document.mailform.blog.checked=1;
       }
       return
   }
@@ -1352,65 +1807,49 @@ END
 					   $env{'course.'.$env{'request.course.id'}.'.domain'},
 					   $env{'course.'.$env{'request.course.id'}.'.num'});
       unless (($contrib{'hidden'}=~/\.$idx\./) || ($contrib{'deleted'}=~/\.$idx\./)) {
+          my $numoldver = 0;
           if ($contrib{$idx.':history'}) {
               if ($contrib{$idx.':history'} =~ /:/) {
-                  my @oldversions = split/:/,$contrib{$idx.':history'};
+                  my @oldversions = split(/:/,$contrib{$idx.':history'});
                   $numoldver = @oldversions;
               } else {
                   $numoldver = 1;
               }
           }
-          if ($env{'form.replydisc'}) {
-              if ($contrib{$idx.':history'}) {
-                  if ($contrib{$idx.':history'} =~ /:/) {
-                      my @oldversions = split/:/,$contrib{$idx.':history'};
-                      $numoldver = @oldversions;
-                  } else {
-                      $numoldver = 1;
-                  }
+          if ($idx > 0) {
+              my (%msgversions,%subversions,$htmldecode);
+              $htmldecode = 0;
+              if ($env{'form.replydisc'}) {
+                  $htmldecode = 1;
               }
-              my $message;
-              if ($idx > 0) {
-                  my %msgversions = ();
-                  &get_post_versions(\%msgversions,$contrib{$idx.':message'},0,$numoldver);
-                  $message = $msgversions{$numoldver};
-              }
-	      $message=~s/\n/\<br \/\>/g;
-	      $quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($message).'</blockquote>';
-              if ($idx > 0) {
-                  my %subversions = ();
-                  &get_post_versions(\%subversions,$contrib{$idx.':subject'},1,$numoldver);
-                  $subject = 'Re: '.$subversions{$numoldver};
-              }
-              $subject = &HTML::Entities::encode($subject,'<>&"');
-          } else {
-              $attachmenturls = $contrib{$idx.':attachmenturl'};
-              if ($idx > 0) {
-                  my %msgversions = ();
-                  &get_post_versions(\%msgversions,$contrib{$idx.':message'},0,$numoldver);
+              &get_post_versions(\%msgversions,$contrib{$idx.':message'},0,$numoldver);
+              &get_post_versions(\%subversions,$contrib{$idx.':subject'},$htmldecode,
+                                 $numoldver);
+              $subject = $subversions{$numoldver};
+              if ($env{'form.replydisc'}) {
+                  $quote = $msgversions{$numoldver};
+                  $subject = &HTML::Entities::encode(&mt('Re: ').$subject,'<>&"');
+              } else {
                   $comment = $msgversions{$numoldver};
-                  my %subversions = ();
-                  &get_post_versions(\%subversions,$contrib{$idx.':subject'},0,$numoldver);
-                  $subject = $subversions{$numoldver}; 
               }
+          }
+          if ($env{'form.editdisc'}) {
+              $attachmenturls = $contrib{$idx.':attachmenturl'};
               if (defined($contrib{$idx.':replyto'})) {
                   $parentmsg = $contrib{$idx.':replyto'};
               }
               unless (exists($env{'form.origpage'})) {
-                  my $anonflag = 0;
+                  my $anonflag = 'nonanon';
                   if ($contrib{$idx.':anonymous'}) {
-                      $anonflag = 1;
+                      $anonflag = 'anon';
                   }
                   $anonscript = (<<END);
   function setposttype () {
-      var currtype = $anonflag
-      if (currtype == 1) {
-          document.mailform.elements.discuss.checked = false
-          document.mailform.elements.anondiscuss.checked = true
-      }
-      if (currtype == 0) {
-          document.mailform.elements.anondiscuss.checked = false
-          document.mailform.elements.discuss.checked = true
+      var currtype = "$anonflag";
+      for (var i=0; i<document.mailform.discuss.length; i++) {
+	  if (document.mailform.elements.discuss[i].value == currtype ) {
+	      document.mailform.elements.discuss[i].checked=1;
+	  } 
       }
       return
   }
@@ -1424,51 +1863,33 @@ END
   }
 
   if ($env{'form.origpage'}) {
-      $subject = &Apache::lonnet::unescape($env{'form.subject'});
-      $comment = &Apache::lonnet::unescape($env{'form.comment'});
+      $subject = &unescape($env{'form.subject'});
+      $comment = &unescape($env{'form.comment'});
       &process_attachments(\@currnewattach,\@currdelold,\@keepold);
   }
-  my $latexHelp=&Apache::loncommon::helpLatexCheatsheet();
-  my $htmlheader=&Apache::lonhtmlcommon::htmlareaheaders();
+  my $latexHelp=&Apache::loncommon::helpLatexCheatsheet(undef,undef,1,($env{'form.modal'}?'popup':0));
   my $send=&mt('Send');
-  my $html=&Apache::lonxml::xmlbegin();
-  $r->print(<<END);
-$html
-<head>
-<title>The LearningOnline Network with CAPA</title>
-<meta http-equiv="pragma" content="no-cache"></meta>
-$htmlheader
+  my $alert = &mt('Please select a feedback type.');
+  my $js= <<END;
 <script type="text/javascript">
 //<!--
     function gosubmit() {
         var rec=0;
-        if (typeof(document.mailform.elements.author)!="undefined") {
-          if (document.mailform.elements.author.checked) {
-             rec=1;
-          } 
-        }
-        if (typeof(document.mailform.elements.question)!="undefined") {
-          if (document.mailform.elements.question.checked) {
-             rec=1;
-          } 
-        }
-        if (typeof(document.mailform.elements.course)!="undefined") {
-          if (document.mailform.elements.course.checked) {
-             rec=1;
-          } 
-        }
-        if (typeof(document.mailform.elements.policy)!="undefined") {
-          if (document.mailform.elements.policy.checked) {
-             rec=1;
-          } 
-        }
         if (typeof(document.mailform.elements.discuss)!="undefined") {
-          if (document.mailform.elements.discuss.checked) {
-             rec=1;
-          } 
-        }
-        if (typeof(document.mailform.elements.anondiscuss)!="undefined") {
-          if (document.mailform.elements.anondiscuss.checked) {
+	    if (typeof(document.mailform.elements.discuss.length) == "undefined") {
+		if (document.mailform.elements.discuss.checked ) {
+		    rec=1;
+		}
+	    } else {
+		for (var i=0; i<document.mailform.elements.discuss.length; i++) {
+		    if (document.mailform.elements.discuss[i].checked ) {
+			rec=1;
+		    } 
+		}
+	    }
+	}
+        if (typeof(document.mailform.elements.blog)!="undefined") {
+          if (document.mailform.elements.blog.checked) {
              rec=1;
           } 
         }
@@ -1479,20 +1900,60 @@ $htmlheader
 	    }
 	    document.mailform.submit();
         } else {
-            alert('Please check a feedback type.');
+            alert('$alert');
 	}
     }
     $anonchk
     $anonscript
 //-->
 </script>
-</head>
-$bodytag
-<h2><tt>$title</tt></h2>
+END
+
+  my ($textareaheader,$textareaclass);
+  if (&Apache::lonhtmlcommon::htmlareabrowser()) {
+      $textareaheader = &Apache::lonhtmlcommon::htmlareaselectactive();
+      $textareaclass = 'class="LC_richDefaultOff"';
+      if ($env{'request.course.id'}) {
+          unless (($env{'course.'.$env{'request.course.id'}.'.allow_limited_html_in_feedback'} =~ /^\s*yes\s*$/i) || ($env{'form.sendmessageonly'})) {
+              undef($textareaclass);
+          }
+      }
+  }
+
+  # Breadcrumbs
+  my $brcrum = [{'href' => '',
+                 'text' => 'Resource Feedback and Discussion'}];
+
+  my %onload = ('onload' => 'window.focus();setposttype();');
+  my %parms=('add_entries' => \%onload);
+  if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum }
+  my $start_page=
+      &Apache::loncommon::start_page('Resource Feedback and Discussion',$js,\%parms);
+
+  if ($quote ne '') {
+      $quote = &HTML::Entities::decode($quote);
+      unless (&contains_block_html($quote)) {
+          &newline_to_br(\$quote);
+      }
+        $quote=&Apache::lonhtmlcommon::start_pick_box().
+               &Apache::lonhtmlcommon::row_title(&mt('Quote')).
+               &Apache::lontexconvert::msgtexconverted($quote).
+               &Apache::lonhtmlcommon::row_closure(1).
+               &Apache::lonhtmlcommon::end_pick_box();
+  }
+  my $header='';
+  unless ($env{'form.modal'}) {
+     $header="<h2><tt>$restitle</tt></h2>";
+  }
+  $r->print(<<END);
+$start_page
+<h1>$lt{'myqu'}</h1>
+$header
 <form action="/adm/feedback" method="post" name="mailform"
 enctype="multipart/form-data">
 $prevtag
 <input type="hidden" name="postdata" value="$feedurl" />
+<input type="hidden" name="modal" value="$env{'form.modal'}" />
 END
   if ($env{'form.replydisc'}) {
       $r->print(<<END);
@@ -1500,57 +1961,78 @@ END
 END
   } elsif ($env{'form.editdisc'}) {
      $r->print(<<END);
-<input type="hidden" name="editdisc" value ="$env{'form.editdisc'}" />
-<input type="hidden" name="parentmsg" value ="$parentmsg" />
+<input type="hidden" name="editdisc" value="$env{'form.editdisc'}" />
+<input type="hidden" name="parentmsg" value="$parentmsg" />
 END
   }
   $r->print(<<END);
-Please check at least one of the following feedback types:
-$options<hr />
+$options
+<br>
+END
+$r->print(&Apache::lonhtmlcommon::start_pick_box());
+$r->print(<<END);
 $quote
-<p>My question/comment/feedback:</p>
 <p>
-$latexHelp
-Title: <input type="text" name="subject" size="30" value="$subject" /></p>
+$textareaheader
+</p>
 <p>
-<textarea name="comment" id="comment" cols="60" rows="10" wrap="hard">$comment
-</textarea></p>
+$latexHelp
+</p>
 <p>
 END
+
+    
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Subject')));
+    $r->print('<input type="text" name="subject" size="30" value="'.
+              $subject.'" /></p>');
+    $r->print(&Apache::lonhtmlcommon::row_closure());
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Message')));
+    $r->print('<textarea name="comment" id="comment" cols="60" rows="10" '.
+              $textareaclass.'>'.$comment.
+              '</textarea>');
+    $r->print(&Apache::lonhtmlcommon::row_closure(1));
+    $r->print(&Apache::lonhtmlcommon::end_pick_box());
+
     if ( ($env{'form.editdisc'}) || ($env{'form.replydisc'}) ) {
         if ($env{'form.origpage'}) {
-            foreach (@currnewattach) {
-                $r->print('<input type="hidden" name="currnewattach" value="'.$_.'" />'."\n");
+            foreach my $attach (@currnewattach) {
+                $r->print('<input type="hidden" name="currnewattach" value="'.$attach.'" />'."\n");
             }
-            foreach (@currdelold) {
-                $r->print('<input type="hidden" name="deloldattach" value="'.$_.'" />'."\n");
+            foreach my $oldatt (@currdelold) {
+                $r->print('<input type="hidden" name="deloldattach" value="'.$oldatt.'" />'."\n");
             }
         }
         if ($env{'form.editdisc'}) {
             if ($attachmenturls) {
                 &extract_attachments($attachmenturls,$idx,$numoldver,\$attachmsg,\%attachments,\%currattach,\@currdelold);
-                $attachnum = scalar(keys %currattach);
-                foreach (keys %currattach) {
-                    $r->print('<input type="hidden" name="keepold" value="'.$_.'" />'."\n");
+                $attachnum = scalar(keys(%currattach));
+                foreach my $key (keys(%currattach)) {
+                    $r->print('<input type="hidden" name="keepold" value="'.$key.'" />'."\n");
                 }
             }
         }
     } else {
         $r->print(<<END);
-Attachment (128 KB max size): <input type="file" name="attachment" />
+<p>
+$lt{'atta'} $attachmaxtext: <input type="file" name="attachment" />
 </p>
 END
     }
+    if (exists($env{'form.group'})) {
+        $r->print('<input type="hidden" name="group" value="'.$env{'form.group'}.'" />');
+    }
+    if (exists($env{'form.ref'})) {
+        $r->print('<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />');
+    }
     $r->print(<<END);
-<p>
 <input type="hidden" name="sendit" value="1" />
-<input type="button" value="$send" onClick='gosubmit();' />
-</p>
+<input type="button" value="$send" onclick='gosubmit();' />
 </form>
 END
     if ($env{'form.editdisc'} || $env{'form.replydisc'}) {
         my $now = time;
         my $ressymb = $symb;
+        &Apache::lonenc::check_encrypt(\$ressymb);
         my $postidx = '';
         if ($env{'form.editdisc'}) {
             $postidx = $idx;
@@ -1558,10 +2040,10 @@ END
         if (@currnewattach > 0) {
             $attachnum += @currnewattach;
         }
-        $r->print(&generate_attachments_button($postidx,$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,$numoldver));
+        my $blockblog = &Apache::loncommon::blocking_status('blogs');
         if ($attachnum > 0) {
             if (@currnewattach > 0) {
-                $newattachmsg .= '<b>New attachments</b><br />';
+                $newattachmsg .= '<br /><b>'.&mt('New attachments').'</b><br />';
                 if (@currnewattach > 1) {
                     $newattachmsg .= '<ol>';
                     foreach my $item (@currnewattach) {
@@ -1575,16 +2057,17 @@ END
                 }
             }
             if ($attachmsg) {
-                $r->print("<b>Retained attachments</b>:$attachmsg<br />\n");
+                $r->print("<br /><b>$lt{'reta'}</b>:$attachmsg<br />\n");
             }
             if ($newattachmsg) {
-                $r->print("$newattachmsg<br />");
+                $r->print("$newattachmsg");
             }
         }
+        $r->print(&generate_attachments_button($postidx,$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,$numoldver,'',$blockblog));
     }
     $r->print(&generate_preview_button().
-              &Apache::lonhtmlcommon::htmlareaselectactive('comment').
-              '</body></html>');
+	      &Apache::loncommon::end_page());
+
 }
 
 sub print_display_options {
@@ -1595,24 +2078,21 @@ sub print_display_options {
     my $function = &Apache::loncommon::get_users_function();
     my $tabcolor = &Apache::loncommon::designparm($function.'.tabbg',
                                                     $env{'user.domain'});
-    my $bodytag=&Apache::loncommon::bodytag('Discussion options',
-                                          '','');
 
     my %lt = &Apache::lonlocal::texthash(
-        'dido' => 'Discussion display options',
         'pref' => 'Display Preference',
         'curr' => 'Current setting ',
         'actn' => 'Action',
         'deff' => 'Default for all discussions',
         'prca' => 'Preferences can be set for this discussion that determine ....',
-        'whpo' => 'Which posts are displayed when you display this bulletin board or resource, and',
+        'whpo' => 'Which posts are displayed when you display this discussion board or resource, and',
         'unwh' => 'Under what circumstances posts are identified as "NEW", and',
         'wipa' => 'Whether individual posts can be marked as read/unread',
         'allposts' => 'All posts',
         'unread' => 'New posts only',
         'unmark' => 'Posts not marked read',
         'ondisp' => 'Once displayed',
-        'onmark' => 'Once marked not NEW ',
+        'onmark' => 'Once marked not NEW',
         'toggon' => 'Shown',
         'toggoff' => 'Not shown',
         'disa' => 'Posts displayed?',
@@ -1657,13 +2137,9 @@ sub print_display_options {
         $currtogg = $lt{'toggon'};
         $disctogg = 'toggon';
     }
-    my $html=&Apache::lonxml::xmlbegin();
-    $r->print(<<END);
-$html
-<head>
-<title>$lt{'dido'}</title>
-<meta http-equiv="pragma" content="no-cache" />
-<script>
+
+    my $js = <<END;
+<script type="text/javascript">
 function discdispChk(caller) {
     var disctogg = '$toggchg'
     if (caller == 0) {
@@ -1730,61 +2206,76 @@ function setDisp() {
     }
 }
 </script>
-</head>
-$bodytag
+END
+
+
+    my $start_page =
+	&Apache::loncommon::start_page('Discussion display options',$js);
+    my $end_page =
+	&Apache::loncommon::end_page();
+    $r->print(<<END);
+$start_page
 <form name="modifydisp" method="post" action="/adm/feedback">
 $lt{'sdpf'}<br/> $lt{'prca'}  <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li><li>$lt{'wipa'}</li></ol>
 <br />
-<table border="0" cellpadding="0" cellspacing="0">
- <tr>
-  <td width="100%" bgcolor="#000000">
-   <table width="100%" border="0" cellpadding="1" cellspacing="0">
-    <tr>
-     <td width="100%" bgcolor="#000000">
-      <table border="0" cellpadding="3" cellspacing="1" bgcolor="#FFFFFF">
-       <tr bgcolor="$tabcolor">
-        <td><b>$lt{'pref'}</b></td>
-        <td><b>$lt{'curr'}</b></td>
-        <td><b>$lt{'actn'}?</b></td>
+END
+    $r->print(&Apache::loncommon::start_data_table());
+    $r->print(<<END);
+       <tr>
+        <th>$lt{'pref'}</td>
+        <th>$lt{'curr'}</td>
+        <th>$lt{'actn'}?</td>
        </tr>
-       <tr bgcolor="#dddddd">
+END
+    $r->print(&Apache::loncommon::start_data_table_row());
+    $r->print(<<END);
        <td>$lt{'disa'}</td>
        <td>$lt{$discdisp}</td>
-       <td><label><input type="checkbox" name="discdisp" onClick="discdispChk('0')" />&nbsp;$lt{'chgt'} "$dispchangeA"</label>
+       <td><label><input type="checkbox" name="discdisp" onclick="discdispChk('0')" />&nbsp;$lt{'chgt'} "$dispchangeA"</label>
            <br />
-           <label><input type="checkbox" name="discdisp" onClick="discdispChk('1')" />&nbsp;$lt{'chgt'} "$dispchangeB"</label>
+           <label><input type="checkbox" name="discdisp" onclick="discdispChk('1')" />&nbsp;$lt{'chgt'} "$dispchangeB"</label>
        </td>
-      </tr><tr bgcolor="#eeeeee">
+END
+    $r->print(&Apache::loncommon::end_data_table_row());
+    $r->print(&Apache::loncommon::start_data_table_row());
+    $r->print(<<END);
        <td>$lt{'npmr'}</td>
        <td>$lt{$discmark}</td>
        <td><label><input type="checkbox" name="discmark" />$lt{'chgt'} "$markchange"</label></td>
-      </tr><tr bgcolor="#dddddd">
+END
+    $r->print(&Apache::loncommon::end_data_table_row());
+    $r->print(&Apache::loncommon::start_data_table_row());
+    $r->print(<<END);
        <td>$lt{'dotm'}</td>
        <td>$lt{$disctogg}</td>
-       <td><label><input type="checkbox" name="disctogg" onClick="discdispChk('2')" />$lt{'chgt'} "$toggchange"</label></td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-  </table>
- </td>
-</tr>
-</table>
+       <td><label><input type="checkbox" name="disctogg" onclick="discdispChk('2')" />$lt{'chgt'} "$toggchange"</label></td>
+END
+    my $save = &mt('Save');
+    $r->print(&Apache::loncommon::end_data_table_row());
+    $r->print(&Apache::loncommon::end_data_table());
+    $r->print(<<END);
 <br />
 <br />
 <input type="hidden" name="symb" value="$symb" />
 <input type="hidden" name="previous" value="$previous" />
-<input type="hidden" name="$dispchgA" value=""/>
-<input type="hidden" name="$dispchgB" value=""/>
-<input type="hidden" name="$markchg" value=""/>
+<input type="hidden" name="$dispchgA" value="" />
+<input type="hidden" name="$dispchgB" value="" />
+<input type="hidden" name="$markchg" value="" />
 <input type="hidden" name="$toggchg" value="" />
-<input type="button" name="sub" value="Store Changes" onClick="javascript:setDisp()" />
+<input type="button" name="sub" value="$save" onclick="javascript:setDisp()" />
+END
+    if (exists($env{'form.group'})) {
+        $r->print('<input type="hidden" name="group" value="'.$env{'form.group'}.'" />');
+    }
+    if (exists($env{'form.ref'})) {
+        $r->print('<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />');
+    }
+    $r->print("
 <br />
 <br />
 </form>
-</body>
-</html>
-END
+$end_page
+    ");
     return;
 }
 
@@ -1795,35 +2286,66 @@ sub print_sortfilter_options {
     $r->send_http_header;
 
     &Apache::lonenc::check_encrypt(\$symb);
-    my @sections = ();
+    my @sections;
     my $section_sel = '';
-    my $numsections = 0;
     my $numvisible = 5;
-    my %sectioncount = ();
-
-    $numsections = &Apache::loncommon::get_sections($env{'course.'.$env{'request.course.id'}.'.domain'},$env{'course.'.$env{'request.course.id'}.'.num'},\%sectioncount);
-
+    my @groups;
+    my $group_sel = '';
+    my $numgroupvis = 5;
+    my %sectioncount = &Apache::loncommon::get_sections();
+    my @courseroles = qw(st ad ep ta in);
+    my $crstype = &Apache::loncommon::course_type();
+    my $ccrole = 'cc';
+    if ($crstype eq 'Community') {
+        $ccrole = 'co';
+    }
+    push(@courseroles,$ccrole);
+    
     if ($env{'request.course.sec'} !~ /^\s*$/) {  #Restrict section choice to current section 
         @sections = ('all',$env{'request.course.sec'});
         $numvisible = 2;
     } else {
         @sections = sort {$a cmp $b} keys(%sectioncount);
+        if (scalar(@sections) < 4) {
+            $numvisible = scalar(@sections) + 1;
+        }
         unshift(@sections,'all'); # Put 'all' at the front of the list
-        if ($numsections < 4) {
-            $numvisible = $numsections + 1;
+
+    }
+    foreach my $sec (@sections) {
+        $section_sel .= "  <option value=\"$sec\">$sec</option>\n";
+    }
+
+    if (&check_group_priv() eq 'ok') {
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; 
+        my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
+        @groups = sort {$a cmp $b} keys(%curr_groups);
+        if (scalar(@groups) < 4) {
+            $numgroupvis = scalar(@groups) + 1;
+        }
+        unshift(@groups,'all'); # Put 'all' at the front of the list
+    } else { 
+        my @coursegroups = split(/:/,$env{'request.course.groups'});
+        if (@coursegroups > 0) {
+            @coursegroups = sort {$a cmp $b} @coursegroups;
+            @groups = ('all',@coursegroups);
+            if (scalar(@groups) < 4) {
+                $numgroupvis = scalar(@groups) + 1;
+            }
+        } else {
+            @groups = ('all');
+            $numgroupvis = 1;
         }
     }
-    foreach (@sections) {
-        $section_sel .= "  <option value=\"$_\" />$_\n";
+    foreach my $group (@groups) {
+        $group_sel .= "  <option value=\"$group\">$group</option>\n";
     }
-                                                                                   
+
     my $function = &Apache::loncommon::get_users_function();
     my $tabcolor = &Apache::loncommon::designparm($function.'.tabbg',
                                                     $env{'user.domain'});
-    my $bodytag=&Apache::loncommon::bodytag('Discussion options',
-                                          '','');
     my %lt = &Apache::lonlocal::texthash(
-        'diso' => 'Discussion sorting and filtering options',
         'diop' => 'Display Options',
         'curr' => 'Current setting ',
         'actn' => 'Action',
@@ -1832,20 +2354,18 @@ sub print_sortfilter_options {
         'spur' => 'Specific user roles',
         'sprs' => 'Specific role status',
         'spse' => 'Specific sections',
+        'spgr' => 'Specific groups',
         'psub' => 'Pick specific users (by name)',
-        'shal' => 'Show a list of current posters'
+        'shal' => 'Show a list of current posters',
+        'stor' => 'Save changes',
     );
 
     my %sort_types = ();
     my %role_types = ();
     my %status_types = ();
-    &sort_filter_names(\%sort_types,\%role_types,\%status_types);
-    my $html=&Apache::lonxml::xmlbegin();
-    $r->print(<<END);
-$html
-<head>
-<title>$lt{'diso'}</title>
-<meta http-equiv="pragma" content="no-cache" />
+    &sort_filter_names(\%sort_types,\%role_types,\%status_types,$crstype);
+
+    my $js = <<END;
 <script type="text/javascript">
 function verifyFilter() {
     var rolenum = 0
@@ -1867,79 +2387,114 @@ function verifyFilter() {
     if (secnum == 0) {
         document.modifyshown.sectionpick.options[0].selected = true
     }
+
+    var grpnum = 0
+    for (var i=0; i<document.modifyshown.grouppick.length; i++) {
+        if (document.modifyshown.grouppick.options[i].selected == true) {
+            grpnum ++
+        }
+    }
+    if (grpnum == 0) {
+        document.modifyshown.grouppick.options[0].selected = true
+    }
+
     document.modifyshown.submit();
 }
 </script>
-</head>
-$bodytag
+END
+
+    my $start_page=
+	&Apache::loncommon::start_page('Discussion options',$js);
+    my $end_page=
+	&Apache::loncommon::end_page();
+
+    $r->print(<<END);
+$start_page
 <form name="modifyshown" method="post" action="/adm/feedback">
 <b>$lt{'diso'}</b><br/> $lt{'prca'}
-<br /><br />
+<br />
 <table border="0">
  <tr>
-  <td><b>$lt{'soor'}</b></td>
-  <td>&nbsp;</td>
-  <td><b>$lt{'sprs'}</b></td>
-  <td>&nbsp;</td>
-  <td><b>$lt{'spur'}</b></td>
-  <td>&nbsp;</td>
-  <td><b>$lt{'spse'}</b></td>
-  <td>&nbsp;</td>
-  <td><b>$lt{'psub'}</b></td>
+  <th>$lt{'soor'}</th>
+  <th>&nbsp;</th>
+  <th>$lt{'sprs'}</th>
+  <th>&nbsp;</th>
+  <th>$lt{'spur'}</th>
+  <th>&nbsp;</th>
+  <th>$lt{'spse'}</th>
+  <th>&nbsp;</th>
+  <th>$lt{'spgr'}</th>
+  <th>&nbsp;</th>
+  <th>$lt{'psub'}</th>
  </tr>
  <tr>
-  <td align="center">
+  <td align="center" valign="top">
    <select name="sortposts">
-    <option value="ascdate" selected="selected" />$sort_types{'ascdate'}
-    <option value="descdate" />$sort_types{'descdate'}
-    <option value="thread" />$sort_types{'thread'}
-    <option value="subject" />$sort_types{'subject'}
-    <option value="username" />$sort_types{'username'}
-    <option value="lastfirst" />$sort_types{'lastfirst'}
+    <option value="ascdate" selected="selected">$sort_types{'ascdate'}</option>
+    <option value="descdate">$sort_types{'descdate'}</option>
+    <option value="thread">$sort_types{'thread'}</option>
+    <option value="subject">$sort_types{'subject'}</option>
+    <option value="username">$sort_types{'username'}</option>
+    <option value="lastfirst">$sort_types{'lastfirst'}</option>
    </select>
   </td>
   <td>&nbsp;</td>
-  <td align="center">
+  <td align="center" valign="top">
    <select name="statusfilter">
-    <option value="all" selected="selected" />$status_types{'all'}
-    <option value="Active" />$status_types{'Active'}
-    <option value="Expired" />$status_types{'Expired'}
+    <option value="all" selected="selected">$status_types{'all'}</option>
+    <option value="Active">$status_types{'Active'}</option>
+    <option value="Expired">$status_types{'Expired'}</option>
+    <option value="Future">$status_types{'Future'}</option>
    </select>
   </td>
   <td>&nbsp;</td>
-  <td align="center">
-   <select name="rolefilter" multiple="true" size="5">
-    <option value="all" />$role_types{'all'}
-    <option value="st" />$role_types{'st'}
-    <option value="cc" />$role_types{'cc'}
-    <option value="in" />$role_types{'in'}
-    <option value="ta" />$role_types{'ta'}
-    <option value="ep" />$role_types{'ep'}
-    <option value="ad" />$role_types{'ad'}
-    <option value="cr" />$role_types{'cr'}
+  <td align="center" valign="top">
+   <select name="rolefilter" multiple="multiple" size="5">
+    <option value="all">$role_types{'all'}</option>
+    <option value="st">$role_types{'st'}</option>
+    <option value="$ccrole">$role_types{$ccrole}</option>
+    <option value="in">$role_types{'in'}</option>
+    <option value="ta">$role_types{'ta'}</option>
+    <option value="ep">$role_types{'ep'}</option>
+    <option value="ad">$role_types{'ad'}</option>
+    <option value="cr">$role_types{'cr'}</option>
    </select>
   </td>
   <td>&nbsp;</td>
-  <td align="center">
-   <select name="sectionpick" multiple="true" size="$numvisible">
+  <td align="center" valign="top">
+   <select name="sectionpick" multiple="multiple" size="$numvisible">
     $section_sel
    </select>
   </td>
   <td>&nbsp;</td>
-  <td><label><input type="checkbox" name="posterlist" value="$symb" />$lt{'shal'}</label></td>
+  <td align="center" valign="top">
+   <select name="grouppick" multiple="multiple" size="$numvisible">
+    $group_sel
+   </select>
+  </td>
+  <td>&nbsp;</td>
+  <td valign="top"><label><input type="checkbox" name="posterlist" value="$symb" />$lt{'shal'}</label></td>
  </tr>
 </table>
 <br />
-<br />
+<input type="hidden" name="inhibitmenu" value="$env{'form.inhibitmenu'}" />
+<input type="hidden" name="modal" value="$env{'form.modal'}" />
 <input type="hidden" name="previous" value="$previous" />
 <input type="hidden" name="applysort" value="$symb" />
-<input type="button" name="sub" value="Store Changes" onClick="verifyFilter()" />
+<input type="button" name="sub" value="$lt{'stor'}" onclick="verifyFilter()" />
+END
+    if (exists($env{'form.group'})) {
+        $r->print('<input type="hidden" name="group" value="'.$env{'form.group'}.'" />');
+    }
+    if (exists($env{'form.ref'})) {
+        $r->print('<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />');
+    }
+    $r->print("
 <br />
 <br />
 </form>
-</body>
-</html>
-END
+$end_page
+");
 }
 
 sub print_showposters {
@@ -1949,28 +2504,28 @@ sub print_showposters {
     $r->send_http_header;
 
     &Apache::lonenc::check_encrypt(\$symb);
-    my $crs='/'.$env{'request.course.id'};
-    if ($env{'request.course.sec'}) {
-        $crs.='_'.$env{'request.course.sec'};
-    }
-    $crs=~s/\_/\//g;
-    my $seeid=&Apache::lonnet::allowed('rin',$crs);
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $group = $env{'form.group'};
+    my $ressymb = &wrap_symb($symb);
+    my $seehidden = &can_see_hidden('',$ressymb,$feedurl,$group,$cdom,$cnum);
     my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
-                          $env{'course.'.$env{'request.course.id'}.'.domain'},
-                          $env{'course.'.$env{'request.course.id'}.'.num'});
+                                         $cdom,$cnum);
     my %namesort = ();
     my %postcounts = ();
-    my %lt=&Apache::lonlocal::texthash(
-                     'diso' => 'Discussion filtering options',
-    );
-    my $bodytag=&Apache::loncommon::bodytag('Discussion options',
-                                          '','');
+
+    my %lt = &Apache::lonlocal::texthash(
+                                          sele => 'Select',
+                                          full => 'Fullname',
+                                          usdo => 'Username:domain',
+                                          post => 'Posts',
+                                        );
     if ($contrib{'version'}) {
         for (my $idx=1;$idx<=$contrib{'version'};$idx++) {
             my $hidden=($contrib{'hidden'}=~/\.$idx\./);
             my $deleted=($contrib{'deleted'}=~/\.$idx\./);
-            unless ((($hidden) && (!$seeid)) || ($deleted)) {
-                if ((!$contrib{$idx.':anonymous'}) || ($seeid)) {
+            unless ((($hidden) && (!$seehidden)) || ($deleted)) {
+                if ((!$contrib{$idx.':anonymous'}) || (&Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')))) {
                     my %names = &Apache::lonnet::get('environment',['firstname','lastname'],$contrib{$idx.':senderdomain'},$contrib{$idx.':sendername'});
                     my $lastname = $names{'lastname'};
                     my $firstname = $names{'firstname'};
@@ -1987,61 +2542,59 @@ sub print_showposters {
                     $postcounts{$poster} ++;
                     if (defined($namesort{$lastname}{$firstname})) {
                         if (!grep/^$poster$/,@{$namesort{$lastname}{$firstname}}) {
-                            push @{$namesort{$lastname}{$firstname}}, $poster;
+                            push(@{$namesort{$lastname}{$firstname}}, $poster);
                         }
                     } else {
                         @{$namesort{$lastname}{$firstname}} = ("$poster");
                     }
                 }
             }
-        }
+        }       
     }
-    my $html=&Apache::lonxml::xmlbegin();
+
+    my $start_page = &Apache::loncommon::start_page('Discussion options');
+    my $table_start =&Apache::loncommon::start_data_table();
     $r->print(<<END);
-$html
-<head>
-<title>$lt{'diso'}</title>
-<meta http-equiv="pragma" content="no-cache" />
-</head>
-$bodytag
+$start_page
  <form name="pickpostersform" method="post">
-  <table border="0">
-   <tr>
-    <td bgcolor="#777777">
-     <table border="0" cellpadding="3">
-      <tr bgcolor="#e6ffff">
-       <td><b>No.</b></td>
-       <td><b>Select</b></td>
-       <td><b>Fullname</b><font color="#999999">(Username/domain)</font></td>
-       <td><b>Posts</td>
+ <br />
+    $table_start
+      <tr>
+       <th>#</th>
+       <th>$lt{'sele'}</th>
+       <th>$lt{'full'} <font color="#999999">($lt{'usdo'})</font></th>
+       <th>$lt{'post'}</th>
       </tr>
 END
     my $count = 0;
-    foreach my $last (sort keys %namesort) {
-        foreach my $first (sort keys %{$namesort{$last}}) {
-            foreach (sort @{$namesort{$last}{$first}}) {
-                my ($uname,$udom) = split/:/,$_;
+    foreach my $last (sort(keys(%namesort))) {
+        foreach my $first (sort(keys(%{$namesort{$last}}))) {
+            foreach my $user (sort(@{$namesort{$last}{$first}})) {
+                my ($uname,$udom) = split(/:/,$user);
                 if (!$uname || !$udom) { 
                     next;
                 } else {
                     $count ++;
-                    $r->print('<tr bgcolor="#ffffe6"><td align="right">'.$count.'</td><td align="center"><label><input name="stuinfo" type="checkbox" value="'.$_.'" /></td><td>'.$last.', '.$first.' ('.$uname.','.$udom.')</label></td><td>'.$postcounts{$_}.'</td></tr>');
+                    $r->print(&Apache::loncommon::start_data_table_row().
+			      '<td align="right">'.$count.'</td>
+                               <td align="center"><label><input name="stuinfo" type="checkbox" value="'.$user.'" /></td>
+                               <td>'.$last.', '.$first.' ('.$uname.':'.$udom.')</label></td>
+                               <td>'.$postcounts{$user}.'</td>'.
+			      &Apache::loncommon::end_data_table_row());
                 }
             }
         }
     }
+    $r->print(&Apache::loncommon::end_data_table());
+    my $end_page   = &Apache::loncommon::end_page();
     $r->print(<<END);
-     </table>
-    </td>
-   </tr>
-  </table>
 <br />
 <input type="hidden" name="sortposts" value="$sortposts" />
+<input type="hidden" name="modal" value="$env{'form.modal'}" />
 <input type="hidden" name="userpick" value="$symb" />
-<input type="button" name="store" value="Display posts" onClick="javascript:document.pickpostersform.submit()" />
+<input type="button" name="store" value="Display posts" onclick="javascript:document.pickpostersform.submit()" />
 </form>
-</body>
-</html>
+$end_page
 END
 }
 
@@ -2049,7 +2602,8 @@ sub get_post_versions {
     my ($versions,$incoming,$htmldecode,$numver) = @_;
     if ($incoming =~ /^<version num="0">/) {
         my $p = HTML::LCParser->new(\$incoming);
-        my $done = 0;                                                                       
+        my $done = 0; 
+
         while ( (my $token = $p->get_tag("version")) && (!$done)) {
             my $num = $token->[1]{num};
             my $text = $p->get_text("/version");
@@ -2109,43 +2663,39 @@ sub get_post_attachments {
 sub fail_redirect {
   my ($r,$feedurl) = @_;
   if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
+  my %lt = &Apache::lonlocal::texthash(
+                 'sorr' => 'Sorry, no recipients ...',
+  );
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
-  my $html=&Apache::lonxml::xmlbegin();
-  $r->print (<<ENDFAILREDIR);
-$html
-<head>
-<title>Feedback not sent</title>
-<meta http-equiv="pragma" content="no-cache" />
-<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
-</head>
-<body bgcolor="#FFFFFF">
+  $r->print(&Apache::loncommon::start_page('Feedback not sent',undef,
+					   {'redirect'  => [2,$feedurl],
+					    'only_body' => 1,}));
+  $r->print(<<ENDFAILREDIR);
 <img align="right" src="$logo" />
-<b>Sorry, no recipients  ...</b>
-<br /><a href="$feedurl">Continue</a>
-</body>
-</html>
+<b>$lt{'sorr'}</b>
 ENDFAILREDIR
+  $r->print(&Apache::loncommon::end_page());
 }
 
 sub redirect_back {
-  my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status,$previous,$sort,$rolefilter,$statusfilter,$sectionpick,$numpicks) = @_;
+  my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$blog,$status,$previous,$sort,$rolefilter,$statusfilter,$sectionpick,$grouppick,$numpicks,$group,$toolarge) = @_;
   my $sorttag = '';
   my $roletag = '';
   my $statustag = '';
   my $sectag = '';
+  my $grptag = '';
   my $userpicktag = '';
   my $qrystr = '';
   my $prevtag = '';
 
   &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;
-
   &dewrapper(\$feedurl);
   if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
   if ($previous > 0) {
       $qrystr = 'previous='.$previous;
       if ($feedurl =~ /\?register=1/) {
-          $feedurl .= '&'.$qrystr;
+          $feedurl .= '&amp;'.$qrystr;
       } else {
           $feedurl .= '?'.$qrystr;
       }
@@ -2154,62 +2704,94 @@ sub redirect_back {
   if (defined($sort)) {
       my $sortqry = 'sortposts='.$sort;
       if (($feedurl =~ /\?register=1/) || ($feedurl =~ /\?previous=/)) {
-          $feedurl .= '&'.$sortqry;
+          $feedurl .= '&amp;'.$sortqry;
       } else {
           $feedurl .= '?'.$sortqry;
       }
       $sorttag = '<input type="hidden" name="sortposts" value="'.$sort.'" />';
       if (defined($numpicks)) {
           my $userpickqry = 'totposters='.$numpicks;
-          $feedurl .= '&'.$userpickqry;
+          $feedurl .= '&amp;'.$userpickqry;
           $userpicktag = '<input type="hidden" name="totposters" value="'.$numpicks.'" />';
       } else {
           if (ref($sectionpick) eq 'ARRAY') {
-              $feedurl .= '&sectionpick=';
+              $feedurl .= '&amp;sectionpick=';
               $sectag .=  '<input type="hidden" name="sectionpick" value="';
-              foreach (@{$sectionpick}) {
-                  $feedurl .= $_.',';
-                  $sectag .= $_.',';
+              foreach my $sec (@{$sectionpick}) {
+                  $feedurl .= $sec.',';
+                  $sectag .= $sec.',';
               }
               $feedurl =~ s/,$//;
               $sectag =~ s/,$//;
               $sectag .= '" />';
           } else {
-              $feedurl .= '&sectionpick='.$sectionpick;
+              $feedurl .= '&amp;sectionpick='.$sectionpick;
               $sectag = '<input type="hidden" name="sectionpick" value="'.$sectionpick.'" />';
           }
+          if (ref($grouppick) eq 'ARRAY') {
+              $feedurl .= '&amp;grouppick=';
+              $sectag .=  '<input type="hidden" name="grouppick" value="';
+              foreach my $grp (@{$grouppick}) {
+                  $feedurl .= $grp.',';
+                  $grptag .= $grp.',';
+              }
+              $feedurl =~ s/,$//;
+              $grptag =~ s/,$//;
+              $grptag .= '" />';
+          } else {
+              $feedurl .= '&amp;grouppick='.$grouppick;
+              $grptag = '<input type="hidden" name="grouppick" value="'.$grouppick.'" />';
+          }
           if (ref($rolefilter) eq 'ARRAY') {
-              $feedurl .= '&rolefilter=';
+              $feedurl .= '&amp;rolefilter=';
               $roletag .=  '<input type="hidden" name="rolefilter" value="';
-              foreach (@{$rolefilter}) {
-                  $feedurl .= $_.',';
-                  $roletag .= $_.',';
+              foreach my $role (@{$rolefilter}) {
+                  $feedurl .= $role.',';
+                  $roletag .= $role.',';
               }
               $feedurl =~ s/,$//;
               $roletag =~ s/,$//;
               $roletag .= '" />';
           } else {
-              $feedurl .= '&rolefilter='.$rolefilter;
+              $feedurl .= '&amp;rolefilter='.$rolefilter;
               $roletag = '<input type="hidden" name="rolefilter" value="'.$rolefilter.'" />';
           }
-          $feedurl .= '&statusfilter='.$statusfilter;
+          $feedurl .= '&amp;statusfilter='.$statusfilter;
           $statustag ='<input type="hidden" name="statusfilter" value="'.$statusfilter.'" />';
       }
   }
-  $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+  my $grouptag;
+  if ($group ne '') {
+      $grouptag = '<input type="hidden" name="group" value="'.$group.'" />';
+      my $refarg;
+      if (exists($env{'form.ref'})) {
+          $refarg = '&amp;ref='.$env{'form.ref'};
+          $grouptag .= '<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />';
+      }
+      if ($feedurl =~ /\?/) {
+          $feedurl .= '&amp;group='.$group.$refarg;
+      } else {
+          $feedurl .= '?group='.$group.$refarg;
+      }
+  } 
+  &Apache::lonenc::check_encrypt(\$feedurl);
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
-  my $html=&Apache::lonxml::xmlbegin();
-  $r->print (<<ENDREDIR);
-$html
-<head>
-<title>Feedback sent</title>
-<meta http-equiv="pragma" content="no-cache" />
-<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
-</head>
-<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { this.document.reldt.submit(); self.close(); }'>
+  my %parms=('only_body'   => 1);
+  if ($env{'form.modal'}) {
+      $parms{'add_entries'}={'onLoad' => 'document.forms.reldt.submit()'};
+  } else {
+      $parms{'redirect'}=[0,$feedurl];
+  }
+  my $start_page=
+      &Apache::loncommon::start_page('Feedback sent',undef,\%parms);
+  my $end_page = &Apache::loncommon::end_page();
+  $r->print(<<ENDREDIR);
+$start_page
 <img align="right" src="$logo" />
 $typestyle
 <b>Sent $sendsomething message(s), and $sendposts post(s).</b>
+$blog
+$toolarge
 <font color="red">$status</font>
 <form name="reldt" action="$feedurl" target="loncapaclient">
 $prevtag
@@ -2217,88 +2799,125 @@ $sorttag
 $statustag
 $roletag
 $sectag
+$grptag
 $userpicktag
+$grouptag
 </form>
-<br /><a href="$feedurl">Continue</a>
-</body>
-</html>
+$end_page
 ENDREDIR
 }
 
 sub no_redirect_back {
   my ($r,$feedurl) = @_;
-  my $nofeed=&mt('Sorry, no feedback possible on this resource  ...');
-  my $continue=&mt('Continue');
-  my $html=&Apache::lonxml::xmlbegin();
-  $r->print (<<ENDNOREDIR);
-$html
-<head>
-<title>Feedback not sent</title>
-<meta http-equiv="pragma" content="no-cache" />
-ENDNOREDIR
-
-  if ($feedurl!~/^\/adm\/feedback/) { 
-      $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="2; url='.
-		&Apache::lonenc::check_encrypt($feedurl).'">');
+  my $nofeed=&mt('Sorry, no feedback possible on this resource ...');
+ 
+  my %onload;
+
+  my %body_options = ('only_body'   => 1,
+		      'bgcolor'     => '#FFFFFF',
+		      'add_entries' => \%onload,);
+
+  if ($feedurl !~ m{^/adm/feedback}) { 
+      $body_options{'redirect'} = [2,$feedurl];
   }
-  $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+  my $start_page=
+      &Apache::loncommon::start_page('Feedback not sent',undef,
+				     \%body_options);
+				      
+  my $end_page = &Apache::loncommon::end_page();
+
+  &Apache::lonenc::check_encrypt(\$feedurl);
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   $r->print (<<ENDNOREDIRTWO);
-</head>
-<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { self.close(); }'>
+$start_page
 <img align="right" src="$logo" />
 <b>$nofeed</b>
-<br /><a href="$feedurl">$continue</a>
-</body>
-</html>
+<br />
+$end_page
 ENDNOREDIRTWO
 }
 
 sub screen_header {
-    my ($feedurl,$symb) = @_;
+    my ($feedurl,$symb,$group) = @_;
+    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');
+    my $anoncontrib = &mt('Anonymous contribution to course discussion of resource');
+    my $namevis = &mt('name only visible to course faculty');
+    my $crstype;
+    if ($env{'request.course.id'}) {
+        $crstype = &Apache::loncommon::course_type();
+        if ($crstype eq 'Community') {
+            $crscontent = &mt('Question/Comment/Feedback about community content');
+            $crspolicy = &mt('Question/Comment/Feedback about community policy');
+            $contribdisc = &mt('Contribution to community discussion of resource');
+            $anoncontrib = &mt('Anonymous contribution to community discussion of resource');
+            $namevis = &mt('name only visible to community facilitators');
+        }
+    }
     my $msgoptions='';
     my $discussoptions='';
     unless (($env{'form.replydisc'}) || ($env{'form.editdisc'})) {
-	if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {
+	if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/) && ($env{'user.adv'})) {
 	    $msgoptions= 
-		'<p><label><input type="checkbox" name="author" /> '.
-		&mt('Feedback to resource author').'</label></p>';
+		'<label><input type="radio" name="discuss" value="author" /> '.
+		&mt('Feedback to resource author').'</label><br />';
+	}
+        my %optionhash=();
+        foreach my $type ('question','comment','policy') {
+	    $optionhash{$type}=$env{'course.'.$env{'request.course.id'}.'.'.$type.'.email.text'};
 	}
 	if (&feedback_available(1)) {
 	    $msgoptions.=
-		'<p><label><input type="checkbox" name="question" /> '.
-		&mt('Question about resource content').'</label></p>';
+		'<label><input type="radio" name="discuss" value="question" /> '.
+		($optionhash{'question'}?$optionhash{'question'}:&mt('Question about resource content')).'</label><br />';
 	}
 	if (&feedback_available(0,1)) {
 	    $msgoptions.=
-		'<p><label><input type="checkbox" name="course" /> '.
-		&mt('Question/Comment/Feedback about course content').
-		'</label></p>';
+		'<label><input type="radio" name="discuss" value="course" /> '.
+		($optionhash{'comment'}?$optionhash{'comment'}:$crscontent).
+		'</label><br />';
 	}
 	if (&feedback_available(0,0,1)) {
 	    $msgoptions.=
-		'<p><label><input type="checkbox" name="policy" /> '.
-		&mt('Question/Comment/Feedback about course policy').
-		'</label></p>';
+		'<label><input type="radio" name="discuss" value="policy" /> '.
+		($optionhash{'policy'}?$optionhash{'policy'}:$crspolicy).
+		'</label><br />';
 	}
     }
-    if ($env{'request.course.id'}) {
-	if (&discussion_open(undef,$symb) &&
-	    &Apache::lonnet::allowed('pch',
-				     $env{'request.course.id'}.
-				     ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
-	    $discussoptions='<label><input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;" '.
-		($env{'form.replydisc'}?' checked="1"':'').' /> '.
-		&mt('Contribution to course discussion of resource');
-	    $discussoptions.='</label><br /><label><input type="checkbox" name="anondiscuss" onClick="this.form.discuss.checked=false;" /> '.
-		&mt('Anonymous contribution to course discussion of resource').
-		' <i>('.&mt('name only visible to course faculty').')</i></label>';
+    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 = &get_realsymb($symb);
+        if (!$blocked && &discussion_open(undef,$realsymb) && 
+	    (&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')))) {
+	    $discussoptions='<label><input type="radio" name="discuss" value="nonanon" checked="checked" /> '.
+		$contribdisc.
+	        '</label><br /><label><input type="radio" name="discuss" value="anon" /> '.
+		$anoncontrib.
+		' <i>('.$namevis.')</i></label> '.
+		'<a href="/adm/preferences?action=changescreenname">'.&mt('Change Screenname').'</a>';
+            my $blockblog = &Apache::loncommon::blocking_status('blogs');
+            if (!$blockblog) {
+                $discussoptions.= &add_blog_checkbox($crstype);
+            }
         }
     }
-    if ($msgoptions) { $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
+    if ($msgoptions) {
+        $msgoptions='<tr><th><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/feedback.png').'" />'
+                   .'<br />'.&mt('Send Feedback').'<br />'.&Apache::lonhtmlcommon::coursepreflink(&mt('Feedback Settings'),'feedback').'</th>'.
+                   '<td>'.$msgoptions.'</td></tr>';
+    }
     if ($discussoptions) { 
-	$discussoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" />'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
-    return $msgoptions.$discussoptions;
+	$discussoptions='<tr><th><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" alt="" />'
+                        .'<br />'.&mt('Discussion Contributions').'<br />'.&Apache::lonhtmlcommon::coursepreflink(&mt('Discussion Settings'),'discussion').'</th>'.
+                        '<td>'.$discussoptions.'</td></tr>';
+    }
+    return  &Apache::loncommon::start_data_table().$msgoptions.$discussoptions.&Apache::loncommon::end_data_table();
 }
 
 sub resource_output {
@@ -2316,7 +2935,6 @@ sub resource_output {
 
 sub clear_out_html {
   my ($message,$override)=@_;
-  unless (&Apache::lonhtmlcommon::htmlareablocked()) { return $message; }
 # Always allow the <m>-tag
   my %html=(M=>1);
 # Check if more is allowed
@@ -2325,11 +2943,12 @@ sub clear_out_html {
       ($override)) {
       # allows <B> <I> <P> <A> <LI> <OL> <UL> <EM> <BR> <TT> <STRONG> 
       # <BLOCKQUOTE> <DIV .*> <DIV> <IMG> <M> <SPAN> <H1> <H2> <H3> <H4> <SUB>
-      # <SUP>
+      # <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, DIV=>1, IMG=>1,
-	     M=>1, ALGEBRA=>1, SUB=>1, SUP=>1, SPAN=>1, 
-	     H1=>1, H2=>1, H3=>1, H4=>1, H5=>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);
   }
 # Do the substitution of everything that is not explicitly allowed
   $message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/
@@ -2340,133 +2959,150 @@ sub clear_out_html {
 }
 
 sub assemble_email {
-  my ($feedurl,$message,$prevattempts,$usersaw,$useranswer)=@_;
+  my ($message,$prevattempts,$usersaw,$useranswer)=@_;
+  my %lt = &Apache::lonlocal::texthash(
+             'prev' => 'Previous attempts of student (if applicable)',
+             'orig' => 'Original screen output (if applicable)',
+             'corr' => 'Correct Answer(s) (if applicable)',
+  );
+  if (&Apache::loncommon::course_type() eq 'Community') {
+      $lt{'prev'} = &mt('Previous attempts of member (if applicable)');
+  }
   my $email=<<"ENDEMAIL";
 $message
 ENDEMAIL
     my $citations=<<"ENDCITE";
-<h2>Previous attempts of student (if applicable)</h2>
+<h2>$lt{'prev'}</h2>
 $prevattempts
 <br /><hr />
-<h2>Original screen output (if applicable)</h2>
+<h2>$lt{'orig'}</h2>
 $usersaw
-<h2>Correct Answer(s) (if applicable)</h2>
+<h2>$lt{'corr'}</h2>
 $useranswer
 ENDCITE
   return ($email,$citations);
 }
 
-sub secapply {
-    my $rec=shift;
-    my $defaultflag=shift;
-    $rec=~s/\s+//g;
-    $rec=~s/\@/\:/g;
-    my ($adr,$sections)=($rec=~/^([^\(]+)\(([^\)]+)\)/);
-    if ($sections) {
-	foreach (split(/\;/,$sections)) {
-            if (($_ eq $env{'request.course.sec'}) ||
-                ($defaultflag && ($_ eq '*'))) {
-                return $adr; 
-            }
-        }
-    } else {
-       return $rec;
-    }
-    return '';
-}
-
-sub decide_receiver {
-  my ($feedurl,$author,$question,$course,$policy,$defaultflag) = @_;
-  my $typestyle='';
-  my %to=();
-  if ($env{'form.author'}||$author) {
-    $typestyle.='Submitting as Author Feedback<br>';
-    $feedurl=~/^\/res\/(\w+)\/(\w+)\//;
-    $to{$2.':'.$1}=1;
-  }
-  if ($env{'form.question'}||$question) {
-    $typestyle.='Submitting as Question<br>';
-    foreach (split(/\,/,
-		   $env{'course.'.$env{'request.course.id'}.'.question.email'})
-	     ) {
-	my $rec=&secapply($_,$defaultflag);
-        if ($rec) { $to{$rec}=1; }
-    } 
-  }
-  if ($env{'form.course'}||$course) {
-    $typestyle.='Submitting as Comment<br />';
-    foreach (split(/\,/,
-		   $env{'course.'.$env{'request.course.id'}.'.comment.email'})
-	     ) {
-	my $rec=&secapply($_,$defaultflag);
-        if ($rec) { $to{$rec}=1; }
-    } 
-  }
-  if ($env{'form.policy'}||$policy) {
-    $typestyle.='Submitting as Policy Feedback<br />';
-    foreach (split(/\,/,
-		   $env{'course.'.$env{'request.course.id'}.'.policy.email'})
-	     ) {
-	my $rec=&secapply($_,$defaultflag);
-        if ($rec) { $to{$rec}=1; }
-    } 
-  }
-  if ((scalar(%to) eq '0') && (!$defaultflag)) {
-     ($typestyle,%to)=
-	 &decide_receiver($feedurl,$author,$question,$course,$policy,1);
-  }
-  return ($typestyle,%to);
-}
 
 sub feedback_available {
     my ($question,$course,$policy)=@_;
-    my ($typestyle,%to)=&decide_receiver('',0,$question,$course,$policy);
+    my ($typestyle,%to)=&Apache::lonmsg::decide_receiver('',0,$question,
+							 $course,$policy);
     return scalar(%to);
 }
 
 sub send_msg {
-  my ($feedurl,$email,$citations,$attachmenturl,%to)=@_;
-  my $status='';
-  my $sendsomething=0;
-  foreach (keys %to) {
-    if ($_) {
-      my $declutter=&Apache::lonnet::declutter($feedurl);
-      unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_),
-               'Feedback ['.$declutter.']',$email,$citations,$feedurl,
-                $attachmenturl)=~/ok/) {
-	$status.='<br />'.&mt('Error sending message to').' '.$_.'<br />';
-      } else {
-	$sendsomething++;
-      }
+    my ($title,$feedurl,$email,$citations,$attachmenturl,$symb,%to)=@_;
+    my $status='';
+    my $sendsomething=0;
+    my $restitle = &get_resource_title($symb,$feedurl);
+    if ($title=~/^Error/) { $title=&mt('Feedback').': '.$title; }
+    unless ($title=~/\w/) { $title=&mt('Feedback'); }
+    foreach my $key (keys(%to)) {
+	if ($key) {
+	    my ($user,$domain) = split(/\:/,$key,2);
+	    if (!defined($user)) {
+		$status.='<br />'.&mt('Error sending message to [_1], no user specified.',$key);
+	    } elsif (!defined($domain)) {
+		$status.='<br />'.&mt('Error sending message to [_1], no domain specified.',$key);
+	    } else {
+		unless (&Apache::lonmsg::user_normal_msg($user,$domain,
+							 $title.' ['.$restitle.']',$email,$citations,$feedurl,
+							 $attachmenturl,undef,undef,$symb,$restitle)=~/ok/) {
+		    $status.='<br />'.&mt('Error sending message to').' '.$key.'<br />';
+		} else {
+		    $sendsomething++;
+		}
+	    }
+	}
     }
-  }
 
-    my %record=&Apache::lonnet::restore('_feedback');
-    my ($temp)=keys %record;
-    unless ($temp=~/^error\:/) {
-       my %newrecord=();
-       $newrecord{'resource'}=$feedurl;
-       $newrecord{'subnumber'}=$record{'subnumber'}+1;
-       unless (&Apache::lonnet::cstore(\%newrecord,'_feedback') eq 'ok') {
-	   $status.='<br />'.&mt('Not registered').'<br />';
-       }
+# Records of number of feedback messages are kept under the "symb" called "_feedback"
+# There are two entries within the framework of a course:
+# - the URLs for which feedback was provided
+# - the total number of contributions
+    if ($sendsomething) {
+        my %record=&getfeedbackrecords();
+        my ($temp)=keys(%record);
+        unless ($temp=~/^error\:/) {
+	    my %newrecord=();
+	    $newrecord{'resource'}=$feedurl;
+	    $newrecord{'subnumber'}=$record{'subnumber'}+1;
+	    unless (&Apache::lonnet::cstore(\%newrecord,'_feedback') eq 'ok') {
+	        $status.='<br />'.&mt('Not registered').'<br />';
+	    }
+        }
     }
-       
-  return ($status,$sendsomething);
+    return ($status,$sendsomething);
 }
 
+# Routine to get the complete feedback records
+
+sub getfeedbackrecords {
+    my ($uname,$udom,$course)=@_;
+    unless ($uname) { $uname=$env{'user.name'}; }
+    unless ($udom)  { $udom=$env{'user.domain'}; }
+    unless ($course) { $course=$env{'request.course.id'}; }
+    my %record=&Apache::lonnet::restore('_feedback',$course,$udom,$uname);
+    return %record;
+}
+
+# Routine to get feedback statistics
+
+sub getfeedbackstats {
+    my %record=&getfeedbackrecords(@_);
+    return ($record{'subnumber'},$record{'points'},$record{'totallikes'});
+}
+
+# Store feedback credit
+
+sub storefeedbackpoints {
+    my ($points,$uname,$udom,$course)=@_;
+    unless ($points) { $points=0; }
+    unless ($uname) { $uname=$env{'user.name'}; }
+    unless ($udom)  { $udom=$env{'user.domain'}; }
+    unless ($course) { $course=$env{'request.course.id'}; }
+    my %record=('grader_user'   => $env{'user.name'},
+                'grader_domain' => $env{'user.domain'},
+                'points' => $points);
+    return &Apache::lonnet::cstore(\%record,'_feedback',$course,$udom,$uname);
+}
+
+# Store feedback "likes"
+
+sub storefeedbacklikes {
+    my ($likes,$uname,$udom,$course)=@_;
+    unless ($likes) { $likes=0; }
+    if ($likes>0) { $likes=1; }
+    if ($likes<0) { $likes=-1; }
+    unless ($uname) { $uname=$env{'user.name'}; }
+    unless ($udom)  { $udom=$env{'user.domain'}; }
+    unless ($course) { $course=$env{'request.course.id'}; }
+    my %record=&getfeedbackrecords($uname,$udom,$course);
+    my $totallikes=$record{'totallikes'};
+    $totallikes+=$likes;
+    my %newrecord=('likes_user'   => $env{'user.name'},
+                   'likes_domain' => $env{'user.domain'},
+                   'likes' => $likes,
+                   'totallikes' => $totallikes);
+    return &Apache::lonnet::cstore(\%newrecord,'_feedback',$course,$udom,$uname);
+}
+
+
 sub adddiscuss {
-    my ($symb,$email,$anon,$attachmenturl,$subject)=@_;
+    my ($symb,$email,$anon,$attachmenturl,$subject,$group)=@_;
     my $status='';
-    my $realsymb;
-    if ($symb=~/^bulletin___/) {
-	my $filename=(&Apache::lonnet::decode_symb($symb))[2];
-	$filename=~s|^adm/wrapper/||;
-	$realsymb=&Apache::lonnet::symbread($filename);
+    my $realsymb = &get_realsymb($symb);
+    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'}:''))) {
+	(&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$})))) {
 
     my %contrib=('message'      => $email,
                  'sendername'   => $env{'user.name'},
@@ -2485,11 +3121,11 @@ sub adddiscuss {
 	$contrib{'anonymous'}='true';
     }
     if (($symb) && ($email)) {
+        my $now = time;
         if ($env{'form.editdisc'}) {
-            my %newcontrib = ();
             $contrib{'ip'}=$ENV{'REMOTE_ADDR'};
             $contrib{'host'}=$Apache::lonnet::perlvar{'lonHostID'};
-            $contrib{'timestamp'} = time;
+            $contrib{'timestamp'} = $now;
             $contrib{'history'} = '';
             my $numoldver = 0;
             my ($oldsymb,$oldidx)=split(/\:\:\:/,$env{'form.editdisc'});
@@ -2504,7 +3140,7 @@ sub adddiscuss {
             }
             if (defined($oldcontrib{$oldidx.':history'})) {
                 if ($oldcontrib{$oldidx.':history'} =~ /:/) {
-                    my @oldversions = split/:/,$oldcontrib{$oldidx.':history'};
+                    my @oldversions = split(/:/,$oldcontrib{$oldidx.':history'});
                     $numoldver = @oldversions;
                 } else {
                     $numoldver = 1;
@@ -2529,12 +3165,8 @@ sub adddiscuss {
                 }
             }
             $contrib{'history'} .= $oldcontrib{$oldidx.':timestamp'};
-            foreach (keys %contrib) {
-                my $key = $oldidx.':'.&Apache::lonnet::escape($oldsymb).':'.$_;                                                                               
-                $newcontrib{$key} = $contrib{$_};
-            }
             my $put_reply = &Apache::lonnet::putstore($env{'request.course.id'},
-                  \%newcontrib,
+                  $oldsymb,$oldidx,\%contrib,
                   $env{'course.'.$env{'request.course.id'}.'.domain'},
                   $env{'course.'.$env{'request.course.id'}.'.num'});
             $status='Editing class discussion'.($anon?' (anonymous)':'');
@@ -2544,20 +3176,21 @@ sub adddiscuss {
                      $env{'course.'.$env{'request.course.id'}.'.domain'},
 		     $env{'course.'.$env{'request.course.id'}.'.num'});
         }
-        my %storenewentry=($symb => time);
+        my %storenewentry=($symb => $now);
         $status.='<br />'.&mt('Updating discussion time').': '.
         &Apache::lonnet::put('discussiontimes',\%storenewentry,
                      $env{'course.'.$env{'request.course.id'}.'.domain'},
 		     $env{'course.'.$env{'request.course.id'}.'.num'});
     }
-    my %record=&Apache::lonnet::restore('_discussion');
-    my ($temp)=keys %record;
+    my %record=&getdiscussionrecords();
+    my ($temp)=keys(%record);
     unless ($temp=~/^error\:/) {
        my %newrecord=();
        $newrecord{'resource'}=$symb;
        $newrecord{'subnumber'}=$record{'subnumber'}+1;
        $status.='<br />'.&mt('Registering').': '.
                &Apache::lonnet::cstore(\%newrecord,'_discussion');
+       &updatekarma();
     }
     } else {
 	$status.='Failed.';
@@ -2565,48 +3198,284 @@ sub adddiscuss {
     return $status.'<br />';   
 }
 
+
+# Routine to get the complete discussion records
+
+sub getdiscussionrecords {
+    my ($uname,$udom,$course)=@_;
+    unless ($uname) { $uname=$env{'user.name'}; }
+    unless ($udom)  { $udom=$env{'user.domain'}; }
+    unless ($course) { $course=$env{'request.course.id'}; }
+    my %record=&Apache::lonnet::restore('_discussion',$course,$udom,$uname);
+    return %record;
+}
+
+# Routine to get discussion statistics
+
+sub getdiscussionstats {
+    my %record=&getdiscussionrecords(@_);
+    my $totalvotes = $record{'totallikes'} + $record{'totalunlikes'};
+    return ($record{'subnumber'},$record{'points'},$record{'totallikes'},$totalvotes);
+}
+
+# Calculate discussion karma
+
+sub calcdiscussionkarma {    
+    my ($subs,$pts,$likes,$votes)=&getdiscussionstats(@_);
+    my $karma=0;
+    if ($votes>0) {
+        $karma=int(.1+5.*(1.-exp(-$subs/10.))*$likes/$votes);
+        if ($karma<0) { $karma=0; }
+        if ($karma>5) { $karma=5; }
+    }
+    return $karma;
+}
+
+# Update karma
+
+sub updatekarma {
+    my ($uname,$udom,$course)=@_;
+    unless ($uname) { $uname=$env{'user.name'}; }
+    unless ($udom)  { $udom=$env{'user.domain'}; }
+    unless ($course) { $course=$env{'request.course.id'}; }
+    my $karma=&calcdiscussionkarma($uname,$udom,$course);
+    &Apache::lonnet::cstore({ 'karma' => $karma },'_discussion',$course,$udom,$uname);
+    &Apache::lonnet::do_cache_new('karma',$uname.':'.$udom.':'.$course,$karma,3600);
+    return $karma;
+}
+
+# Retrieve karma
+
+sub userkarma {
+    my ($uname,$udom,$course)=@_;
+    unless ($uname) { $uname=$env{'user.name'}; }
+    unless ($udom)  { $udom=$env{'user.domain'}; }
+    unless ($course) { $course=$env{'request.course.id'}; }
+    my $hashkey=$uname.':'.$udom.':'.$course;
+    my ($karma,$cached)=&Apache::lonnet::is_cached_new('karma',$hashkey);
+    if ($cached) {
+        return $karma;
+    }
+    my %userdisc=&getdiscussionrecords($uname,$udom,$course);
+    $karma=$userdisc{'karma'};
+    &Apache::lonnet::do_cache_new('karma',$hashkey,$karma,3600);
+    return $karma;
+}
+
+# Store discussion credit
+
+sub storediscussionpoints {
+    my ($points,$uname,$udom,$course)=@_;
+    unless ($points) { $points=0; }
+    unless ($uname) { $uname=$env{'user.name'}; }
+    unless ($udom)  { $udom=$env{'user.domain'}; }
+    unless ($course) { $course=$env{'request.course.id'}; }
+    my %record=('grader_user'   => $env{'user.name'},
+                'grader_domain' => $env{'user.domain'},
+                'points' => $points);
+    return &Apache::lonnet::cstore(\%record,'_discussion',$course,$udom,$uname);
+}
+
+# Store discussion "likes"
+
+sub storediscussionlikes {
+    my ($chglikes,$chgunlikes,$uname,$udom,$course,$context)=@_;
+    unless ($uname) { $uname=$env{'user.name'}; }
+    unless ($udom)  { $udom=$env{'user.domain'}; }
+    unless ($course) { $course=$env{'request.course.id'}; }
+    my %record=&getdiscussionrecords($uname,$udom,$course);
+    my $totallikes=$record{'totallikes'};
+    my $totalunlikes=$record{'totalunlikes'};
+    $totallikes += $chglikes;
+    $totalunlikes += $chgunlikes;
+    my %newrecord=('likes_user'   => $env{'user.name'},
+                   'likes_domain' => $env{'user.domain'},
+                   'totallikes'   => $totallikes,
+                   'totalunlikes' => $totalunlikes,
+                   'context'      => $context);
+    my $status=&Apache::lonnet::cstore(\%newrecord,'_discussion',$course,$udom,$uname);
+    if ($status eq 'ok') {
+        &updatekarma($uname,$udom,$course);
+    }
+    return $status;
+}
+
+sub get_discussion_info {
+    my ($idx,%contrib) = @_;
+    my $changelast = 0;
+    my $count = 0;
+    my $hiddenflag = 0;
+    my $deletedflag = 0;
+    my ($hidden,$deleted,%info,$newlastdisc);
+    my $version = $contrib{'version'};
+    if ($version) {
+        for (my $id=$version; $id>0; $id--) {
+            my $vkeys=$contrib{$id.':keys'};
+            my @keys=split(/:/,$vkeys);
+            if (grep(/^hidden$/,@keys)) {
+                if (!$hiddenflag) {
+                    $hidden = $contrib{$id.':hidden'};
+                    $hiddenflag = 1;
+                }
+            } elsif (grep(/^deleted$/,@keys)) {
+                if (!$deletedflag) {
+                    $deleted = $contrib{$id.':deleted'};
+                    $deletedflag = 1;
+                }
+            } else {
+                if (($hidden !~/\.$id\./) && ($deleted !~/\.$id\./)) {
+                    $count++;
+                    $info{$count}{'id'} = $id;
+                    $info{$count}{'timestamp'}=$contrib{$id.':timestamp'}; 
+                }
+            }
+        }
+        if ($info{'1'}{'id'} == $idx) {
+            $changelast = 1;
+            if ($count > 1) { 
+                $newlastdisc =  $info{'2'}{'timestamp'};
+            } else {
+                $newlastdisc = 0;
+            }
+        }
+    }
+    return ($changelast,$newlastdisc);
+}
+
 # ----------------------------------------------------------- Preview function
 
 sub show_preview {
-    my $r=shift;
+    my ($r) = @_;
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
+    my $start_page=
+	&Apache::loncommon::start_page('Preview',undef,
+				       {'only_body'   => 1,});
+
     my $message=&clear_out_html($env{'form.comment'});
-    $message=~s/\n/\<br \/\>/g;
+    &newline_to_br(\$message);
     $message=&Apache::lonspeller::markeduptext($message);
     $message=&Apache::lontexconvert::msgtexconverted($message);
     my $subject=&clear_out_html($env{'form.subject'});
     $subject=~s/\n/\<br \/\>/g;
     $subject=&Apache::lontexconvert::msgtexconverted($subject);
-    my $html=&Apache::lonxml::xmlbegin();
-    $r->print($html.'<head>'.
-	      '</head><body><table border="2"><tr><td>'.
-	      '<b>Subject:</b> '.$subject.'<br /><br />'.
-	      $message.'</td></tr></table></body></html>');
+					
+    my $end_page = &Apache::loncommon::end_page();
+
+    $r->print($start_page
+             .'<h1>'.&mt('Preview').'</h1>'
+             .&Apache::lonhtmlcommon::start_pick_box()
+             .&Apache::lonhtmlcommon::row_title(&mt('Subject'))
+             .$subject
+             .&Apache::lonhtmlcommon::row_closure()
+             .&Apache::lonhtmlcommon::row_title(&mt('Message'))
+             .$message
+             .&Apache::lonhtmlcommon::row_closure(1)
+             .&Apache::lonhtmlcommon::end_pick_box()
+             .$end_page
+    );
+}
+
+sub contains_block_html {
+    my ($message)=@_;
+    return ($message =~ m{
+        <(br|h1|h2|h3|h4|h5|h6|p|ol|ul|table|pre|address|blockquote|center|div) 
+	  \s*
+	 (\w+\=['"]\w+['"])*
+	  \s*
+	(
+	  \s*/>|
+	  >.*</\1\s*>
+	)}xs 
+    );
+}
+
+sub tidy_html {
+	my ($message)=@_;
+# 	my $tidy = HTML::Tidy::libXML->new();
+# 	my $xhtml = $tidy->clean($message, 'utf-8', 1);
+# 	$xhtml =~ m/<body>(.*)<\/body>/is;
+# 	my $clean = $1;
+# 	# remove any empty block-level tags
+# 	$clean =~ s/<(table|p|div|tbody|blockquote|m|pre|algebra|center|ol|ul|span|h1|h2|h3|h4|h5|h6)\s*\/>//i;
+# 	$message=$clean;
+	return $message;
+}
+
+sub newline_to_br {
+    my ($message)=@_;
+    my $newmessage;
+    my $parser=HTML::LCParser->new($message);
+    while (my $token=$parser->get_token()) {
+	if ($token->[0] eq 'T') {
+	    my $text=$token->[1];
+	    $text=~s/\n/\<br \/\>/g;
+	    $newmessage.=$text;
+	} elsif ($token->[0] eq 'D' || $token->[0] eq 'C') {
+	    $newmessage.=$token->[1];
+	} elsif ($token->[0] eq 'PI' || $token->[0] eq 'E') {
+	    $newmessage.=$token->[2];
+	} elsif ($token->[0] eq 'S') {
+	    $newmessage.=$token->[4];
+	}
+	    
+    }
+    $$message=$newmessage;
 }
 
 sub generate_preview_button {
+    my ($formname,$fieldname)=@_;
+    unless ($formname) { $formname='mailform'; }
+    unless ($fieldname) { $fieldname='comment'; }
     my $pre=&mt("Show Preview and Check Spelling");
     return(<<ENDPREVIEW);
+<br />
 <form name="preview" action="/adm/feedback?preview=1" method="post" target="preview">
-<input type="hidden" name="subject">
+<input type="hidden" name="subject" />
 <input type="hidden" name="comment" />
 <input type="button" value="$pre"
-onClick="if (typeof(document.mailform.onsubmit)=='function') {document.mailform.onsubmit();};this.form.comment.value=document.mailform.comment.value;this.form.subject.value=document.mailform.subject.value;this.form.submit();" />
+onclick="if (typeof(document.$formname.onsubmit)=='function') {document.$formname.onsubmit();};this.form.comment.value=document.$formname.$fieldname.value;this.form.subject.value=document.$formname.subject.value;this.form.submit();" />
 </form>
 ENDPREVIEW
 }
 
 sub modify_attachments {
-    my ($r,$currnewattach,$currdelold,$symb,$idx,$attachmenturls)=@_;
-    my $orig_subject = &Apache::lonnet::unescape($env{'form.subject'});
+    my ($r,$currnewattach,$currdelold,$symb,$idx,$attachmenturls,
+        $attachmaxtext,$toolarge)=@_;
+
+    my %lt = &Apache::lonlocal::texthash(
+               'subj' => 'Subject',
+               'chth' => 'Check the checkboxes for any you wish to remove.',
+               'thef' => 'The following attachments have been uploaded for inclusion with this posting.',
+               'adda' => 'Add a new attachment to this post',
+               'stch' => 'Save Changes',
+               'clic' => 'Add/remove attachments',
+             );
+    my $js = <<END;
+<script type="text/javascript">
+ function setAction () {
+   document.modattachments.action = document.modattachments.origpage.value;
+   document.modattachments.submit();
+ }
+</script> 
+END
+
+    # Breadcrumbs
+    my $brcrum = [{'href' => '',
+                   'text' => 'Discussion Post Attachments'}];
+    my %parms=('only_body' => 1);
+    if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum }
+
+    my $start_page = 
+	&Apache::loncommon::start_page('Discussion Post Attachments',$js,\%parms);
+
+    my $orig_subject = &unescape($env{'form.subject'});
     my $subject=&clear_out_html($orig_subject);
     $subject=~s/\n/\<br \/\>/g;
     $subject=&Apache::lontexconvert::msgtexconverted($subject);
     my $timestamp=$env{'form.timestamp'};
     my $numoldver=$env{'form.numoldver'};
-    my $bodytag=&Apache::loncommon::bodytag('Discussion Post Attachments',
-                                          '','');
+
     my $msg = '';
     my %attachments = ();
     my %currattach = ();
@@ -2614,72 +3483,70 @@ sub modify_attachments {
         &extract_attachments($attachmenturls,$idx,$numoldver,\$msg,\%attachments,\%currattach,$currdelold);
     }
     &Apache::lonenc::check_encrypt(\$symb);
-    my $html=&Apache::lonxml::xmlbegin();
+
+    my $end_page = 
+	&Apache::loncommon::end_page();
+				       
     $r->print(<<END);
-$html
-<head>
-<title>Managing Attachments</title>
-<script>
- function setAction () {
-   document.modattachments.action = document.modattachments.origpage.value;
-   document.modattachments.submit();
- }
-</script> 
-</head>
-$bodytag
+$start_page
+$toolarge
 <form name="modattachments" method="post" enctype="multipart/form-data" action="/adm/feedback?attach=$symb">
- <table border="2">
-  <tr>
-   <td>
-    <b>Subject:</b> $subject</b><br /><br />
+
+ <h1>$lt{'clic'}</h1>
 END
-    if ($idx) {
-        if ($attachmenturls) {
-            my @currold = keys %currattach;
-            if (@currold > 0) {
-                $r->print("The following attachments were part of the most recent saved version of this posting.<br />Check the checkboxes for any you wish to remove<br />\n");  
-                foreach my $id (@currold) {
-                    my $attachurl = &HTML::Entities::decode($attachments{$id}{'filename'}); 
-                    $attachurl =~ m#/([^/]+)$#;
-                    $r->print('<label><input type="checkbox" name="deloldattach" value="'.$id.'" />&nbsp;'.$1.'</label><br />'."\n");
+    $r->print(&Apache::lonhtmlcommon::start_pick_box());
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Subject')));
+    $r->print('<b>'.$subject.'</b>');
+    $r->print(&Apache::lonhtmlcommon::row_closure());
+    $r->print(&Apache::lonhtmlcommon::row_title($lt{'adda'}));
+    $r->print('<input type="file" name="addnewattach" /><input type="button" name="upload" value="Upload" onclick="this.form.submit()" />  '.$attachmaxtext);
+    if(($idx)||(ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)){
+        $r->print(&Apache::lonhtmlcommon::row_closure());
+        $r->print(&Apache::lonhtmlcommon::row_title(&mt('Attachments')));
+        if ($idx) {
+            if ($attachmenturls) {
+                my @currold = keys(%currattach);
+                if (@currold > 0) {
+                    $r->print($lt{'thfo'}.'<br />'.$lt{'chth'}.'<br />'."\n");
+                    foreach my $id (@currold) {
+                        my $attachurl = &HTML::Entities::decode($attachments{$id}{'filename'});
+                        $attachurl =~ m#/([^/]+)$#;
+                        $r->print('<label><input type="checkbox" name="deloldattach" value="'.$id.'" />&nbsp;'.$1.'</label><br />'."\n");
+                    }
+                    $r->print("<br />");
                 }
-                $r->print("<br />");
             }
         }
-    }
-    if (@{$currnewattach} > 0) {
-        $r->print("The following attachments have been uploaded for inclusion with this posting.<br />Check the checkboxes for any you wish to remove<br />\n");
-        foreach (@{$currnewattach}) {
-            $_ =~ m#/([^/]+)$#;
-            $r->print('<label><input type="checkbox" name="delnewattach" value="'.$_.'" />&nbsp;'.$1.'</label><br />'."\n");
+        if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) {
+            $r->print($lt{'chth'}.'<br />'."\n");
+            foreach my $attach (@{$currnewattach}) {
+                $attach =~ m#/([^/]+)$#;
+                $r->print('<label><input type="checkbox" name="delnewattach" value="'.$attach.'" />&nbsp;'.$1.'</label><br />'."\n");
+            }
         }
-        $r->print("<br />"); 
     }
+    $r->print(&Apache::lonhtmlcommon::row_closure(1));
+    $r->print(&Apache::lonhtmlcommon::end_pick_box());
     $r->print(<<END);
-   Add a new attachment to this post.&nbsp;<input type="file" name="addnewattach" /><input type="button" name="upload" value="Upload" onClick="this.form.submit()" />    
-   </td>
-  </tr>
- </table>
 <input type="hidden" name="subject" value="$env{'form.subject'}" />
 <input type="hidden" name="comment" value="$env{'form.comment'}" />
 <input type="hidden" name="timestamp" value="$env{'form.timestamp'}" />
 <input type="hidden" name="idx" value="$env{'form.idx'}" />
 <input type="hidden" name="numoldver" value="$env{'form.numoldver'}" />
 <input type="hidden" name="origpage" value="$env{'form.origpage'}" />
-<input type="hidden" name="anondiscuss" value="$env{'form.anondiscuss'}" />
+<input type="hidden" name="blog" value="$env{'form.blog'}" />
 <input type="hidden" name="discuss" value="$env{'form.discuss'}" />
 END
-    foreach (@{$currnewattach}) {
-        $r->print('<input type="hidden" name="currnewattach" value="'.$_.'" />'."\n");
+    foreach my $item (@{$currnewattach}) {
+        $r->print('<input type="hidden" name="currnewattach" value="'.$item.'" />'."\n");
     }
-    foreach (@{$currdelold}) {
-        $r->print('<input type="hidden" name="deloldattach" value="'.$_.'" />'."\n");
+    foreach my $item (@{$currdelold}) {
+        $r->print('<input type="hidden" name="deloldattach" value="'.$item.'" />'."\n");
     }
     $r->print(<<END);
- <input type="button" name="rtntoedit" value="Store Changes" onClick="setAction()"/>
+ <input type="button" name="rtntoedit" value="$lt{'stch'}" onclick="setAction()" />
 </form>
-</body>
-</html>
+$end_page
 END
     return;
 }
@@ -2697,14 +3564,14 @@ sub process_attachments {
         my @currnew = ();
         foreach my $newone (@{$currnewattach}) {
             my $delflag = 0;
-            foreach (@currdelnew) {
-                if ($newone eq $_) {
+            foreach my $item (@currdelnew) {
+                if ($newone eq $item) {
                     $delflag = 1;
                     last;
                 }
             }
             unless ($delflag) {
-                push @currnew, $newone;
+                push(@currnew, $newone);
             }
         }
         @{$currnewattach} = @currnew;
@@ -2713,14 +3580,22 @@ 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(
+                'clic' => 'Add/remove attachments',
+    ); 
     my $response = (<<END);
+<br />
 <form name="attachment" action="/adm/feedback?attach=$ressymb" method="post">
-Click to add/remove attachments:&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);
+<input type="button" value="$lt{'clic'}"
+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();';
     }
@@ -2731,21 +3606,21 @@ this.form.submit();" />
 <input type="hidden" name="timestamp" value="$now" />
 <input type="hidden" name="subject" />
 <input type="hidden" name="comment" />
-<input type="hidden" name="anondiscuss" value = "0";
-<input type="hidden" name="discuss" value = "0";
+<input type="hidden" name="blog" value="0" />
+<input type="hidden" name="discuss" value="0" />
 <input type="hidden" name="numoldver" value="$numoldver" />
 ENDATTACH
     if (defined($deloldattach)) {
         if (@{$deloldattach} > 0) {
-            foreach (@{$deloldattach}) {
-                $response .= '<input type="hidden" name="deloldattach" value="'.$_.'" />'."\n";
+            foreach my $delatt (@{$deloldattach}) {
+                $response .= '<input type="hidden" name="deloldattach" value="'.$delatt.'" />'."\n";
             }
         }
     }
     if (defined($currnewattach)) {
         if (@{$currnewattach} > 0) {
-            foreach (@{$currnewattach}) {
-                $response .= '<input type="hidden" name="currnewattach" value="'.$_.'" />'."\n";
+            foreach my $attach (@{$currnewattach}) {
+                $response .= '<input type="hidden" name="currnewattach" value="'.$attach.'" />'."\n";
             }
         }
     }
@@ -2757,7 +3632,7 @@ sub extract_attachments {
     my ($attachmenturls,$idx,$numoldver,$message,$attachments,$currattach,$currdelold) = @_;
     %{$attachments}=();
     &get_post_attachments($attachments,$attachmenturls);
-    foreach my $id (sort keys %{$attachments}) {
+    foreach my $id (sort(keys(%{$attachments}))) {
         if (exists($$attachments{$id}{$numoldver})) {
             if (defined($currdelold)) {
                 if (@{$currdelold} > 0) {
@@ -2772,7 +3647,7 @@ sub extract_attachments {
             }
         }
     }
-    my @attached = (sort { $a <=> $b } keys %{$currattach});
+    my @attached = (sort { $a <=> $b } keys(%{$currattach}));
     if (@attached == 1) {
         my $id = $attached[0];
         my $attachurl;
@@ -2788,8 +3663,8 @@ sub extract_attachments {
                                $attachurl);
     } elsif (@attached > 1) {
         $$message.='<ol>';
-        foreach (@attached) {
-            my $id = $_;
+        foreach my $attach (@attached) {
+            my $id = $attach;
             my $attachurl = &HTML::Entities::decode($$attachments{$id}{'filename'});
             my ($fname)
               =($attachurl=~m|/([^/]+)$|);
@@ -2816,7 +3691,7 @@ sub construct_attachmenturl {
         $oldattachmenturl = $contrib{$idx.':attachmenturl'};
         if ($contrib{$idx.':history'}) {
             if ($contrib{$idx.':history'} =~ /:/) {
-                my @oldversions = split/:/,$contrib{$idx.':history'};
+                my @oldversions = split(/:/,$contrib{$idx.':history'});
                 $currver = 1 + scalar(@oldversions);
             } else {
                 $currver = 2;
@@ -2829,13 +3704,13 @@ sub construct_attachmenturl {
                 my %attachments = ();
                 my $prevver = $currver-1;
                 &get_post_attachments(\%attachments,$oldattachmenturl);
-                my $numattach = scalar(keys %attachments);
+                my $numattach = scalar(keys(%attachments));
                 $startnum += $numattach;
-                foreach my $num (sort {$a <=> $b} keys %attachments) {
+                foreach my $num (sort {$a <=> $b} keys(%attachments)) {
                     $newattachmenturl .= '<attachment id="'.$num.'"><filename>'.$attachments{$num}{'filename'}.'</filename>';
-                    foreach $_ (sort {$a <=> $b} keys %{$attachments{$num}}) {
-                        unless ($_ eq 'filename') {
-                            $newattachmenturl .= '<post id="'.$_.'">'.$attachments{$num}{$_}.'</post>';
+                    foreach my $item (sort {$a <=> $b} keys(%{$attachments{$num}})) {
+                        unless ($item eq 'filename') {
+                            $newattachmenturl .= '<post id="'.$item.'">'.$attachments{$num}{$item}.'</post>';
                         }
                     }
                     if (grep/^$num$/,@{$keepold}) {
@@ -2860,25 +3735,55 @@ sub construct_attachmenturl {
     return $newattachmenturl; 
 }
 
+sub add_blog_checkbox {
+    my ($crstype) = @_;
+    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.' /> ';
+    if ($crstype eq 'Community') {
+        $output .= &mt('Add to my public community blog');
+    } else {
+        $output .= &mt('Add to my public course blog');
+    } 
+    $output .= '</label><br />'."\n";
+    return $output;
+}
+
 sub has_discussion {
     my $resourcesref = shift;
     my $navmap = Apache::lonnavmaps::navmap->new();
-    my @allres=$navmap->retrieveResources();
-    foreach my $resource (@allres) {
-        if ($resource->hasDiscussion()) {
-            my $ressymb = $resource->symb();
-            if ($ressymb =~ m-___adm/\w+/\w+/\d+/bulletinboard$-) {
-                $ressymb = $resource->wrap_symb();
+    if (defined($navmap)) {
+        my @allres=$navmap->retrieveResources();
+        foreach my $resource (@allres) {
+            if ($resource->hasDiscussion()) {
+                my $ressymb = $resource->wrap_symb();
+                if (ref($resourcesref) eq 'ARRAY') {
+                    push(@{$resourcesref}, $ressymb);
+                }
             }
-            push @{$resourcesref}, $ressymb;
         }
+    } else {
+        &Apache::lonnet::logthis('Has discussion check failed - could not create navmap object.');
     }
     return;
 }
 
 sub sort_filter_names {
-    my ($sort_types,$role_types,$status_types) = @_;
-    %{$sort_types} = (
+    my ($sort_types,$role_types,$status_types,$crstype) = @_;
+    if (ref($sort_types) eq 'HASH') {
+        %{$sort_types} = (
                      ascdate => 'Date order - oldest first',
                      descdate => 'Date order - newest first',
                      thread => 'Threaded',
@@ -2886,21 +3791,28 @@ sub sort_filter_names {
                      username => 'By domain and username',
                      lastfirst => 'By last name, first name'
                    );
-    %{$role_types} = (
-                     all => 'All roles',
-                     st  => 'Students',
-                     cc  => 'Course Coordinators',
-                     in  => 'Instructors',
-                     ta  => 'TAs',
-                     ep  => 'Exam proctors',
-                     ad  => 'Administrators',
-                     cr  => 'Custom roles'
-                   );
-    %{$status_types} = (
+    }
+    my @courseroles = qw(st in ta ep ad);
+    if ($crstype eq 'Community') {
+        push(@courseroles,'co');
+    } else {
+        push(@courseroles,'cc');
+    }
+    if (ref($role_types) eq 'HASH') {
+        foreach my $role (@courseroles) {
+            $role_types->{$role} = &Apache::lonnet::plaintext($role,$crstype);
+        }
+        $role_types->{'all'} = 'All roles';
+        $role_types->{'cr'} = 'Custom role';
+    }
+    if (ref($status_types) eq 'HASH') {
+        %{$status_types} = (
                      all     => 'Roles of any status',
-                     Active => 'Only active roles',
-                     Expired => 'Only inactive roles'
+                     Active  => 'Only active roles',
+                     Expired => 'Only past roles',
+                     Future  => 'Only future roles',
                    );
+    }
 }
   
 sub handler {
@@ -2914,14 +3826,31 @@ sub handler {
 # --------------------------- Get query string for limited number of parameters
 
   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-         ['hide','unhide','deldisc','postdata','preview','replydisc','editdisc','cmd','symb','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navtime','navmaps','navurl','sortposts','applysort','rolefilter','statusfilter','sectionpick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export']);
-
+         ['like','unlike','modal','hide','unhide','deldisc','undeleteall','postdata','preview','replydisc','editdisc','cmd','symb','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navtime','navmaps','navurl','sortposts','applysort','rolefilter','statusfilter','sectionpick','groupick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export','sendmessageonly','group','ref']);
+  my $group = $env{'form.group'};
+  my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+  my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+
+  my %attachmax = (
+                    text => &mt('(128 KB max size)'),
+                    num  => 131072,
+                  );
+  if ($env{'form.editdisc'}) {
+      if (!(&editing_allowed($env{'form.editdisc'},$group))) {
+          my $symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0];
+          my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
+          my $feedurl=&Apache::lonnet::clutter($url);
+          &redirect_back($r,$feedurl,&mt('Editing not permitted').'<br />',                     '0','0','','',$env{'form.previous'},undef,undef,undef,
+                    undef,undef,undef,$group);
+          return OK;
+      }
+  } 
   if ($env{'form.discsymb'}) {
       my ($symb,$feedurl) = &get_feedurl_and_clean_symb($env{'form.discsymb'});
       my $readkey = $symb.'_read';
       my $chgcount = 0;
       my %readinghash = &Apache::lonnet::get('nohist_'.$env{'request.course.id'}.'_discuss',[$readkey],$env{'user.domain'},$env{'user.name'});
-      foreach my $key (keys %env) {
+      foreach my $key (keys(%env)) {
           if ($key =~ m/^form\.postunread_(\d+)/) {
               if ($readinghash{$readkey} =~ /\.$1\./) {
                   $readinghash{$readkey} =~ s/\.$1\.//;
@@ -2939,42 +3868,44 @@ sub handler {
 			  \%readinghash,$env{'user.domain'},$env{'user.name'});
       }
       &redirect_back($r,$feedurl,&mt('Marked postings read/unread').'<br />',
-		     '0','0','',$env{'form.previous'},'','','',);
+		     '0','0','','',$env{'form.previous'},'','','',
+                     undef,undef,undef,$group);
       return OK;
   }
   if ($env{'form.allversions'}) {
       &Apache::loncommon::content_type($r,'text/html');
+      &Apache::loncommon::no_cache($r);
       $r->send_http_header;
-      my $html=&Apache::lonxml::xmlbegin();
-      my $bodytag=&Apache::loncommon::bodytag('Discussion Post Versions');
-      $r->print(<<END);
-$html
-<head>
-<title>Post Versions</title>
-<meta http-equiv="pragma" content="no-cache" />
-</head>
-$bodytag
-END
-      my $crs='/'.$env{'request.course.id'};
-      if ($env{'request.course.sec'}) {
-          $crs.='_'.$env{'request.course.sec'};
-      }
-      $crs=~s|_|/|g;
-      my $seeid=&Apache::lonnet::allowed('rin',$crs);
+
+      # Breadcrumbs
+      my $brcrum = [{'href' => '',
+                     'text' => 'Discussion Post Versions'}];
+      
+      my %parms=();
+      if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum }
+
+      $r->print(&Apache::loncommon::start_page('Discussion Post Versions',undef,\%parms));
+
       my ($symb,$idx)=split(/\:\:\:/,$env{'form.allversions'});
-      ($symb)=&get_feedurl_and_clean_symb($symb);
+      ($symb, my $feedurl)=&get_feedurl_and_clean_symb($symb);
+      my $ressymb = &wrap_symb($symb);
+      my $seeid;
+      if (&Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
+          $seeid = 1;
+      }
+      my $seehidden = &can_see_hidden('',$ressymb,$feedurl,$group,$cdom,$cnum);
       if ($idx > 0) {
           my %messages = ();
           my %subjects = ();
           my %attachmsgs = ();
           my %allattachments = ();
           my %imsfiles = ();
-          my ($screenname,$plainname);
+          my ($screenname,$plainname,$showaboutme);
           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));
+                                               $cdom,$cnum);
+          $r->print(&get_post_contents(\%contrib,$idx,$seeid,$seehidden,'allversions',\%messages,\%subjects,\%allattachments,\%attachmsgs,\%imsfiles,\$screenname,\$plainname,\$showaboutme));
       }
+      $r->print(&Apache::loncommon::end_page());
       return OK;
   }
   if ($env{'form.posterlist'}) {
@@ -2991,17 +3922,18 @@ END
       $discinfo{$symb.'_userpick'} = join('&',@posters);
       &Apache::lonnet::put('nohist_'.$env{'request.course.id'}.'_discuss',
 			   \%discinfo,$env{'user.domain'},$env{'user.name'});
-      &redirect_back($r,$feedurl,&mt('Changed sort/filter').'<br />','0','0',
+      &redirect_back($r,$feedurl,&mt('Changed sort/filter').'<br />','0','0','',
 		     '',$env{'form.previous'},$env{'form.sortposts'},'','','',
-		     $numpicks);
+		     '',$numpicks,$group);
       return OK;
   }
   if ($env{'form.applysort'}) {
       my ($symb,$feedurl)=&get_feedurl_and_clean_symb($env{'form.applysort'});
-      &redirect_back($r,$feedurl,&mt('Changed sort/filter').'<br />','0','0',
+      &redirect_back($r,$feedurl,&mt('Changed sort/filter').'<br />','0','0','',
 		     '',$env{'form.previous'},$env{'form.sortposts'},
 		     $env{'form.rolefilter'},$env{'form.statusfilter'},
-		     $env{'form.sectionpick'});
+		     $env{'form.sectionpick'},$env{'form.grouppick'},
+                     undef,$group);
       return OK;
   } elsif ($env{'form.cmd'} eq 'sortfilter') {
       my ($symb,$feedurl)=&get_feedurl_and_clean_symb($env{'form.symb'});
@@ -3012,7 +3944,7 @@ END
       my @resources = ();
       if (defined($env{'form.navmaps'})) {
           if ($env{'form.navmaps'} =~ /:/) {
-              @resources = split/:/,$env{'form.navmaps'};
+              @resources = split(/:/,$env{'form.navmaps'});
           } else {
               @resources = ("$env{'form.navmaps'}");
           }
@@ -3025,10 +3957,10 @@ END
       my %lt = &Apache::lonlocal::texthash(
           'mnpa' => 'Marked "New" posts as read in a total of',
           'robb' => 'resources/bulletin boards.',
-          'twnp' => 'There are currently no resources or bulletin boards with unread discussion postings.'
+          'twnp' => 'There are currently no resources or discussion boards with unread discussion postings.'
       );       
-      foreach (@resources) {
-          my $ressymb=$_;
+      foreach my $res (@resources) {
+          my $ressymb=$res;
 	  &Apache::lonenc::check_decrypt(\$ressymb);
           my $lastkey = $ressymb.'_lastread';
           $discinfo{$lastkey} = $env{'form.navtime'};
@@ -3043,22 +3975,22 @@ END
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
       my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
-      my $html=&Apache::lonxml::xmlbegin();
+      my %onload;
+
+      my $start_page=
+	  &Apache::loncommon::start_page('New posts marked as read',undef,
+					 {'redirect'    => [2,$feedurl],
+					  'only_body'   => 1,
+					  'add_entries' => \%onload});
+      my $end_page = &Apache::loncommon::end_page();
       $r->print (<<ENDREDIR);
-$html
-<head>
-<title>New posts marked as read</title>
-<meta http-equiv="pragma" content="no-cache" />
-<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
-</head>
-<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { this.document.reldt.submit(); self.close(); }'>
+$start_page
 <img align="right" src="$logo" />
 $textline
 <form name="reldt" action="$feedurl" target="loncapaclient">
 </form>
-<br /><a href="$feedurl">Continue</a>
-</body>
-</html>
+<br />
+$end_page
 ENDREDIR
       return OK;
   } elsif ($env{'form.modifydisp'}) {
@@ -3102,73 +4034,305 @@ ENDREDIR
       my $previous=$env{'form.previous'};
       if ($env{'form.markondisp'}) { $previous=undef; }
       &redirect_back($r,$feedurl,&mt('Changed display status').'<br />',
-		     '0','0','',$previous);
+		     '0','0','','',$previous,'','','','','','',$group);
       return OK;
   } elsif (($env{'form.hide'}) || ($env{'form.unhide'})) {
 # ----------------------------------------------------------------- Hide/unhide
       my $entry=$env{'form.hide'}?$env{'form.hide'}:$env{'form.unhide'};
       my ($symb,$idx)=split(/\:\:\:/,$entry);
       ($symb,my $feedurl)=&get_feedurl_and_clean_symb($symb);
+      my $ressymb = &wrap_symb($symb);
+
+      my $seehidden = &can_see_hidden('',$ressymb,$feedurl,$group,$cdom,$cnum);
+      unless (($seehidden) || (&editing_allowed($env{'form.hide'},$group))) {
+          &redirect_back($r,$feedurl,&mt('Hiding not permitted').'<br />',
+                         '0','0','','',$env{'form.previous'},'','','','',
+                         undef,undef,$group,);
+          return OK;
+      }
 
       my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
-                          $env{'course.'.$env{'request.course.id'}.'.domain'},
-		          $env{'course.'.$env{'request.course.id'}.'.num'});
+                                           $cdom,$cnum);
 
       my $currenthidden=$contrib{'hidden'};
       my $currentstudenthidden=$contrib{'studenthidden'};
 
-      my $crs='/'.$env{'request.course.id'};
-      if ($env{'request.course.sec'}) {
-	  $crs.='_'.$env{'request.course.sec'};
-      }
-      $crs=~s/\_/\//g;
-      my $seeid=&Apache::lonnet::allowed('rin',$crs);
-
       if ($env{'form.hide'}) {
 	  $currenthidden.='.'.$idx.'.';
-	  unless ($seeid) {
+	  unless ($seehidden) {
 	      $currentstudenthidden.='.'.$idx.'.';
 	  }
       } else {
 	  $currenthidden=~s/\.$idx\.//g;
       }
       my %newhash=('hidden' => $currenthidden);
-      if ( ($env{'form.hide'}) && (!$seeid) ) {
+      if ( ($env{'form.hide'}) && (!$seehidden) ) {
 	  $newhash{'studenthidden'} = $currentstudenthidden;
       }
-
-      &Apache::lonnet::store(\%newhash,$symb,$env{'request.course.id'},
-                           $env{'course.'.$env{'request.course.id'}.'.domain'},
-			   $env{'course.'.$env{'request.course.id'}.'.num'});
-
-      &redirect_back($r,$feedurl,&mt('Changed discussion status').'<br />',
-		     '0','0','',$env{'form.previous'});
+      if ($env{'form.hide'}) {
+          my $changelast = 0;
+          my $newlast;
+          ($changelast,$newlast) = &get_discussion_info($idx,%contrib);
+          if ($changelast) {
+              &Apache::lonnet::put('discussiontimes',{$symb => $newlast},
+                                   $cdom,$cnum);
+          }
+      }
+      my $result;
+      if (&Apache::lonnet::store(\%newhash,$symb,$env{'request.course.id'},
+                                 $cdom,$cnum) eq 'ok') {
+          my $prefix=$symb.':'.$idx.':';
+          my %likes=&Apache::lonnet::dump('disclikes',$cdom,$cnum,
+                                          '^'.$prefix);
+          my ($totallikes,$totalunlikes);
+          if (ref($likes{$prefix.'likers'}) eq 'HASH') {
+              $totallikes = scalar(keys(%{$likes{$prefix.'likers'}}));
+          }
+          if (ref($likes{$prefix.'unlikers'}) eq 'HASH') {
+              $totalunlikes = scalar(keys(%{$likes{$prefix.'unlikers'}}));
+          }
+          if ($totallikes || $totalunlikes) {
+              my ($chglikes,$chgunlikes,$context);
+              if ($env{'form.hide'}) {
+                  $chglikes = -1 * $totallikes;
+                  $chgunlikes = -1 * $totalunlikes;
+                  $context = 'hide';
+              } else {
+                  $chglikes = $totallikes;
+                  $chgunlikes = $totalunlikes;
+                  $context = 'unhide';
+              }
+              &storediscussionlikes($chglikes,$chgunlikes,
+                                    $contrib{$idx.':sendername'},
+                                    $contrib{$idx.':senderdomain'},
+                                    $env{'request.course.id'},
+                                    $context);
+          
+          }
+          $result = &mt('Changed discussion status');
+      } else {
+          $result = &mt('Discussion status unchanged'); 
+      }
+      &redirect_back($r,$feedurl,$result.'<br />','0','0','','',
+		     $env{'form.previous'},undef,undef,undef,
+                     undef,undef,undef,$group);
+      return OK;
+  } elsif (($env{'form.like'}) || ($env{'form.unlike'})) {
+# ----------------------------------------------------------------- Like/unlike
+      my $entry=$env{'form.like'}?$env{'form.like'}:$env{'form.unlike'};
+      my ($symb,$idx)=split(/\:\:\:/,$entry);
+      ($symb,my $feedurl)=&get_feedurl_and_clean_symb($symb);
+      my $result;
+      if ($idx > 0) {
+          my $realsymb = &get_realsymb($symb);
+          my $status='OPEN';
+          if ($Apache::lonhomework::parsing_a_problem ||
+              $Apache::lonhomework::parsing_a_task) {
+              $status=$Apache::inputtags::status[-1];
+          }
+          if (&discussion_vote_available($status,$realsymb)) {
+              my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
+                                                   $cdom,$cnum);
+              my $ownpost;
+              if (($contrib{$idx.':sendername'} eq $env{'user.name'}) && 
+                  ($contrib{$idx.':senderdomain'} eq $env{'user.domain'})) {
+                  $ownpost = 1;
+              }
+              if ($ownpost || $contrib{$idx.':hidden'} || $contrib{$idx.':deleted'}) {
+                  $result = &mt('Vote not registered.').' ';
+              }
+              if ($ownpost) {
+                  $result .= &mt('No voting for your own posts.');
+              } elsif ($contrib{$idx.':hidden'}) {
+                  $result .= &mt('No voting for hidden posts.');
+              } elsif ($contrib{$idx.':deleted'}) {
+                  $result .= &mt('No voting for deleted posts.');
+              } else {
+#
+# Likes and unlikes are in db-file "disclikes" of the course
+# The prefix is the $symb to identify the resource discussion,
+# and the $idx to identify the entry
+#
+                  my $prefix=$symb.':'.$idx.':';
+                  my %likes=&Apache::lonnet::dump('disclikes',$cdom,$cnum,
+                                                  '^'.$prefix);
+
+# Get current like or unlike status for the $idx for this user.
+                  my $thisuser=$env{'user.name'}.':'.$env{'user.domain'};
+                  my ($userlikes,$userunlikes);
+                  if (ref($likes{$prefix.'likers'}) eq 'HASH') {
+                      if (exists($likes{$prefix.'likers'}{$thisuser})) {
+                          $userlikes = 1;
+                      }
+                  }
+                  if (ref($likes{$prefix.'unlikers'}) eq 'HASH') {
+                      if (exists($likes{$prefix.'unlikers'}{$thisuser})) {
+                          $userunlikes = 1;
+                      }
+                  }
+# Get the current "likes" count
+                  my $likescount=$likes{$prefix.'likes'};
+# Find out if they already voted
+# Users cannot like a post twice, or unlike it twice.
+# They can change their mind, though.
+                  my $alreadyflag=0;
+                  my $votetype;
+                  if ($env{'form.like'}) {
+                      if ($userlikes) {
+                          $alreadyflag=1;
+                      } elsif ($userunlikes) {
+                          delete($likes{$prefix.'unlikers'}{$thisuser});
+                          $votetype = 'switch';
+                          $likescount++;
+                      } else {
+                          if (ref($likes{$prefix.'likers'}) eq 'HASH') {
+                              $likes{$prefix.'likers'}{$thisuser} = 1;
+                          } else {
+                              $likes{$prefix.'likers'} = {$thisuser => 1};
+                          }
+                          $likescount++;
+                      }
+                  } else {
+                      if ($userunlikes) {
+                          $alreadyflag=1;
+                      } elsif ($userlikes) {
+                          delete($likes{$prefix.'likers'}{$thisuser});
+                          $votetype = 'switch';
+                          $likescount--;
+                      } else {
+                          if (ref($likes{$prefix.'unlikers'}) eq 'HASH') {
+                              $likes{$prefix.'unlikers'}{$thisuser} = 1;
+                          } else {
+                              $likes{$prefix.'unlikers'} = {$thisuser => 1};
+                          }
+                          $likescount--;
+                      }
+                  }
+# $alreadyflag would be 1 if they tried to double-like or double-unlike
+                  if ($alreadyflag) {
+                      if ($env{'form.like'}) {
+                          $result= &mt("'Like' already registered");
+                      } else {
+                          $result= &mt("'Unlike' already registered");
+                      }
+                  } else {
+                      my %newhash=($prefix.'likes'    => $likescount,
+                                   $prefix.'likers'   => $likes{$prefix.'likers'},
+                                   $prefix.'unlikers' => $likes{$prefix.'unlikers'});
+# Store data in db-file "disclikes"
+                      if (&Apache::lonnet::put('disclikes',\%newhash,$cdom,$cnum) eq 'ok') {
+# Also store with the person who posted the liked/unliked entry
+                          my ($chglike,$chgunlike);
+                          if ($env{'form.like'}) {
+                              if ($votetype eq 'switch') {
+                                  $chglike = 0;
+                                  $chgunlike = -1;
+                              } else {
+                                  $chglike = 1;
+                                  $chgunlike = 0;
+                              } 
+                              &storediscussionlikes($chglike,$chgunlike,
+                                                    $contrib{$idx.':sendername'},
+                                                    $contrib{$idx.':senderdomain'},
+                                                    $env{'request.course.id'},'like');
+                              $result=&mt("Registered 'Like'");
+                          } else {
+                              if ($votetype eq 'switch') {
+                                  $chglike = -1;
+                                  $chgunlike = 0;
+                              } else {
+                                  $chglike = 0;
+                                  $chgunlike = 1;
+                              }
+                             &storediscussionlikes($chglike,$chgunlike,
+                                                   $contrib{$idx.':sendername'},
+                                                   $contrib{$idx.':senderdomain'},
+                                                   $env{'request.course.id'},'unlike');
+                             $result=&mt("Registered 'Unlike'");
+                          }
+                      } else {
+# Oops, something went wrong
+                          $result=&mt("Failed to register vote");
+                      }
+                  }
+              }
+          } else {
+              $result=&mt('Voting unavailable for this discussion');
+          }
+      } else {
+          $result=&mt('Invalid post number'); 
+      }
+      &redirect_back($r,$feedurl,$result.'<br />',
+                     '0','0','','',$env{'form.previous'},undef,undef,undef,
+                     undef,undef,undef,$group);
       return OK;
   } elsif ($env{'form.cmd'}=~/^(threadedoff|threadedon)$/) {
       my ($symb,$feedurl)=&get_feedurl_and_clean_symb($env{'form.symb'});
-      if ($env{'form.cmd'} eq 'threadedon') {
-	  &Apache::lonnet::put('environment',{'threadeddiscussion' => 'on'});
-	  &Apache::lonnet::appenv('environment.threadeddiscussion' => 'on');
+      if ($env{'form.cmd'} eq 'threadedoff') {
+	  &Apache::lonnet::put('environment',{'unthreadeddiscussion' => 'on'});
+	  &Apache::lonnet::appenv({'environment.unthreadeddiscussion' => 'on'});
+	  &Apache::lonnet::del('environment',['threadeddiscussion']);
+	  &Apache::lonnet::delenv('environment.threadeddiscussion');
       } else {
- 	  &Apache::lonnet::del('environment',['threadeddiscussion']);
-	  &Apache::lonnet::delenv('environment\.threadeddiscussion');
+	  &Apache::lonnet::put('environment',{'threadeddiscussion' => 'on'});
+	  &Apache::lonnet::appenv({'environment.threadeddiscussion' => 'on'});
+	  &Apache::lonnet::del('environment',['unthreadeddiscussion']);
+	  &Apache::lonnet::delenv('environment.unthreadeddiscussion');
       }
       &redirect_back($r,$feedurl,&mt('Changed discussion view mode').'<br />',
-		     '0','0','',$env{'form.previous'});
+		     '0','0','','',$env{'form.previous'},undef,undef,undef,
+                     undef,undef,undef,$group);
       return OK;
   } elsif ($env{'form.deldisc'}) {
 # --------------------------------------------------------------- Hide for good
       my ($symb,$idx)=split(/\:\:\:/,$env{'form.deldisc'});
       ($symb,my $feedurl)=&get_feedurl_and_clean_symb($symb);
+      my $ressymb=&wrap_symb($symb);
+
+      unless (&can_see_hidden('',$ressymb,$feedurl,$group,$cdom,$cnum)) {
+          &redirect_back($r,$feedurl,&mt('Deletion not permitted').'<br />',
+                         '0','0','','',$env{'form.previous'},'','','','',
+                         undef,undef,$group);
+          return OK;
+      }
       my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
-                          $env{'course.'.$env{'request.course.id'}.'.domain'},
-		          $env{'course.'.$env{'request.course.id'}.'.num'});
+                                           $cdom,$cnum);
+      my ($changelast,$newlast) = &get_discussion_info($idx,%contrib);
+      if ($changelast) {
+          &Apache::lonnet::put('discussiontimes',{$symb => $newlast},
+                               $cdom,$cnum);
+      }
       my %newhash=('deleted' => $contrib{'deleted'}.".$idx.");
-      &Apache::lonnet::store(\%newhash,$symb,$env{'request.course.id'},
-			   $env{'course.'.$env{'request.course.id'}.'.domain'},
-			   $env{'course.'.$env{'request.course.id'}.'.num'});
-      &redirect_back($r,$feedurl,&mt('Changed discussion status').'<br />',
-		     '0','0','',$env{'form.previous'});
+
+      my $result;
+      if (&Apache::lonnet::store(\%newhash,$symb,$env{'request.course.id'},
+                             $cdom,$cnum) eq 'ok') {
+          $result = &mt('Changed discussion status');
+          my $prefix=$symb.':'.$idx.':';
+          my %likes=&Apache::lonnet::dump('disclikes',$cdom,$cnum,
+                                          '^'.$prefix);
+          my ($totallikes,$totalunlikes);
+          if (ref($likes{$prefix.'likers'}) eq 'HASH') {
+              $totallikes = scalar(keys(%{$likes{$prefix.'likers'}}));
+          }
+          if (ref($likes{$prefix.'unlikers'}) eq 'HASH') {
+              $totalunlikes = scalar(keys(%{$likes{$prefix.'unlikers'}}));
+          }
+          if ($totallikes || $totalunlikes) {
+              my $chglikes = -1 * $totallikes;
+              my $chgunlikes = -1 * $totalunlikes;
+              &storediscussionlikes($chglikes,$chgunlikes,
+                                    $contrib{$idx.':sendername'},
+                                    $contrib{$idx.':senderdomain'},
+                                    $env{'request.course.id'},
+                                    'delete');
+          }
+      } else {
+          $result = &mt('Discussion status unchanged');
+      } 
+      &redirect_back($r,$feedurl,$result.'<br />','0','0','','',
+		     $env{'form.previous'},undef,undef,undef,
+                     undef,undef,undef,$group);
       return OK;
   } elsif ($env{'form.preview'}) {
 # -------------------------------------------------------- User wants a preview
@@ -3178,14 +4342,16 @@ ENDREDIR
 # -------------------------------------------------------- Work on attachments
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
-      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','addnewattach','delnewattach','timestamp','numoldver','idx','anondiscuss','discuss']);
-      my (@currnewattach,@currdelold,@keepold);
+      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','addnewattach','delnewattach','timestamp','numoldver','idx','discuss','blog']);
+      my (@currnewattach,@currdelold,@keepold,$toolarge);
       &process_attachments(\@currnewattach,\@currdelold,\@keepold);
       if (exists($env{'form.addnewattach.filename'})) {
-          unless (length($env{'form.addnewattach'})>131072) {
+          if (length($env{'form.addnewattach'})<=$attachmax{'num'}) {
               my $subdir = 'feedback/'.$env{'form.timestamp'};
               my $newattachment=&Apache::lonnet::userfileupload('addnewattach',undef,$subdir);
-	      push @currnewattach, $newattachment;
+	      push(@currnewattach, $newattachment);
+          } else {
+              $toolarge = '<p><span class="LC_warning">'.&mt('Attachment not included - exceeded permitted length').'</span><br /></p>';
           }
       }
       my $attachmenturls;
@@ -3193,12 +4359,11 @@ ENDREDIR
       my $idx = $env{'form.idx'};
       if ($idx) {
           my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
-                         $env{'course.'.$env{'request.course.id'}.'.domain'},
-                         $env{'course.'.$env{'request.course.id'}.'.num'});
+                                               $cdom,$cnum);
           $attachmenturls = $contrib{$idx.':attachmenturl'};
       }
       &modify_attachments($r,\@currnewattach,\@currdelold,$symb,$idx,
-			  $attachmenturls);
+			  $attachmenturls,$attachmax{'text'},$toolarge);
       return OK;
   } elsif ($env{'form.export'}) {
       &Apache::loncommon::content_type($r,'text/html');
@@ -3207,18 +4372,72 @@ ENDREDIR
       my $mode='board';
       my $status='OPEN';
       my $previous=$env{'form.previous'};
-      if ($feedurl =~ /\.(problem|exam|quiz|assess|survey|form|library)$/) {
+      if ($feedurl =~ /$LONCAPA::assess_re/) {
           $mode='problem';
           $status=$Apache::inputtags::status[-1];
       }
+       
       my $discussion = &list_discussion($mode,$status,$symb); 
-      my $bodytag=&Apache::loncommon::bodytag('Resource Feedback and Discussion');
-      $r->print($bodytag.$discussion);                                     
+      my $start_page = 
+	  &Apache::loncommon::start_page('Resource Feedback and Discussion');
+      my $end_page = 
+	  &Apache::loncommon::end_page();
+      $r->print($start_page.$discussion.$end_page);
+      return OK;
+
+  } elsif ($env{'form.undeleteall'}) {
+      &Apache::loncommon::content_type($r,'text/html');
+      $r->send_http_header;
+      my ($symb,$feedurl) = &get_feedurl_and_clean_symb($env{'form.undeleteall'});
+      my $ressymb=&wrap_symb($symb);
+      $r->print(&Apache::loncommon::start_page('Undelete all deleted discussion entries'));
+      if (&can_see_hidden('',$ressymb,$feedurl,$group,$cdom,$cnum)) {
+          my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
+                                                $cdom,$cnum);
+          $contrib{'deleted'} =~ s/^\.//;
+          $contrib{'deleted'} =~ s/\.$//;
+          if ($contrib{'deleted'} ne '') {
+              if (&Apache::lonnet::store({'deleted' => ''},$symb,$env{'request.course.id'},
+                                          $cdom,$cnum) eq 'ok') {
+                  my %likes=&Apache::lonnet::dump('disclikes',$cdom,$cnum,'^'.$symb.':');
+                  my @ids = split(/\.\./,$contrib{'deleted'});
+                  my (%chglikes,%chgunlikes);
+                  foreach my $idx (@ids) {
+                      my $uname = $contrib{$idx.':sendername'};
+                      my $udom = $contrib{$idx.':senderdomain'};
+                      my ($totallikes,$totalunlikes);
+                      if (ref($likes{$symb.':'.$idx.':likers'}) eq 'HASH') {
+                          $totallikes = scalar(keys(%{$likes{$symb.':'.$idx.':likers'}}));
+                      }
+                      if (ref($likes{$symb.':'.$idx.':unlikers'}) eq 'HASH') {
+                          $totalunlikes = scalar(keys(%{$likes{$symb.':'.$idx.':unlikers'}}));
+                      }
+                      if ($totallikes || $totalunlikes) {
+                          $chglikes{$uname.':'.$udom} += $totallikes;
+                          $chgunlikes{$uname.':'.$udom} += $totalunlikes;
+                      }
+                  }
+                  foreach my $user (keys(%chglikes)) {
+                      my ($uname,$udom) = split(/:/,$user);
+                      &storediscussionlikes($chglikes{$user},$chgunlikes{$user},
+                                            $uname,$udom,$env{'request.course.id'},
+                                            'undelete');
+                  }
+                  $r->print(&Apache::lonhtmlcommon::confirm_success(&mt("Undeleted all entries")));
+              } else {
+                  $r->print(&Apache::lonhtmlcommon::confirm_success(&mt("Failed to undelete entries"),1));
+              }
+          } else {
+              $r->print(&Apache::lonhtmlcommon::confirm_success(&mt("No entries to undelete"),1));
+          }
+          $r->print("<br /><a href='$feedurl'>".&mt("Return and reload")."</a>");
+      }
+      $r->print(&Apache::loncommon::end_page());
       return OK;
   } else {
 # ------------------------------------------------------------- Normal feedback
       my $feedurl=$env{'form.postdata'};
-      $feedurl=~s/^http\:\/\///;
+      $feedurl=~s/^https?\:\/\///;
       $feedurl=~s/^$ENV{'SERVER_NAME'}//;
       $feedurl=~s/^$ENV{'HTTP_HOST'}//;
       $feedurl=~s/\?.+$//;
@@ -3226,31 +4445,29 @@ ENDREDIR
       my $symb;
       if ($env{'form.replydisc'}) {
 	  $symb=(split(/\:\:\:/,$env{'form.replydisc'}))[0];
-	  my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
-	  $feedurl=&Apache::lonnet::clutter($url);
       } elsif ($env{'form.editdisc'}) {
 	  $symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0];
-	  my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
-	  $feedurl=&Apache::lonnet::clutter($url);
       } elsif ($env{'form.origpage'}) {
 	  $symb=""; 
+      } elsif ($env{'form.sendmessageonly'}) {
+          $symb=(split(/\:\:\:/,$env{'form.sendmessageonly'}))[0];
       } else {
 	  $symb=&Apache::lonnet::symbread($feedurl);
       }
       unless ($symb) {
 	  $symb=$env{'form.symb'};
-	  if ($symb) {
-	      my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
-	      $feedurl=&Apache::lonnet::clutter($url);
-	  }
       }
-      &Apache::lonenc::check_decrypt(\$symb);
+      if (defined($symb)) {
+          ($symb,$feedurl)=&get_feedurl_and_clean_symb($symb);
+      } else {
+          # backward compatibility (bulletin boards used to be 'wrapped')
+          &Apache::lonenc::check_decrypt(\$feedurl);
+          &dewrapper(\$feedurl);
+      }
       my $goahead=1;
-      if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+      if ($feedurl=~/$LONCAPA::assess_re/) {
 	  unless ($symb) { $goahead=0; }
       }
-      # backward compatibility (bulletin boards used to be 'wrapped')
-      &dewrapper(\$feedurl);
       if (!$goahead) {
           # Ambiguous Problem Resource
 	  $r->internal_redirect('/adm/ambiguous');
@@ -3269,15 +4486,26 @@ ENDREDIR
 	  &Apache::loncommon::content_type($r,'text/html');
 	  $r->send_http_header;
 # Unable to give feedback
+          &Apache::lonenc::check_encrypt(\$feedurl);
 	  &no_redirect_back($r,$feedurl);
+	  return OK;
       }
 # --------------------------------------------------- Print login screen header
       unless ($env{'form.sendit'}) {
+          &Apache::lonenc::check_encrypt(\$feedurl);
 	  &Apache::loncommon::content_type($r,'text/html');
 	  $r->send_http_header;
-	  my $options=&screen_header($feedurl,$symb);
+          if (($env{'form.replydisc'}) || ($env{'form.editdisc'})) {
+              my ($blocked,$blocktext) = 
+                     &Apache::loncommon::blocking_status('boards');
+              if ($blocked) {
+                  $r->print(&blocked_reply_or_edit($blocktext));
+                  return OK;
+              }
+          }
+	  my $options=&screen_header($feedurl,$symb,$group);
 	  if ($options) {
-	      &mail_screen($r,$feedurl,$options);
+	      &mail_screen($r,$feedurl,$options,$symb,$attachmax{'text'});
 	  } else {
 	      &fail_redirect($r,$feedurl);
 	  }
@@ -3290,16 +4518,20 @@ ENDREDIR
 				   $env{'request.course.id'});
 
 # Get output from resource
+      &Apache::lonenc::check_encrypt(\$feedurl);
       my $usersaw=&resource_output($feedurl);
 
 # Get resource answer (need to allow student to view grades for this to work)
-      &Apache::lonnet::appenv(('allowed.vgr'=>'F'));
-      my $useranswer=&Apache::loncommon::get_student_answers(
-                                   $symb,$env{'user.name'},$env{'user.domain'},
-		                   $env{'request.course.id'});
+      &Apache::lonnet::appenv({'allowed.vgr'=>'F'});
+      my $usersymb = &Apache::lonenc::check_encrypt($symb);
+      my $useranswer=
+          &Apache::loncommon::get_student_answers(
+              $usersymb,$env{'user.name'},$env{'user.domain'},
+              $env{'request.course.id'});
       &Apache::lonnet::delenv('allowed.vgr');
 # Get attachments, if any, and not too large
       my $attachmenturl='';
+      my $toolarge='';
       if (($env{'form.origpage'}) || ($env{'form.editdisc'}) ||
 	  ($env{'form.replydisc'})) {
 	  my ($symb,$idx);
@@ -3318,39 +4550,74 @@ ENDREDIR
 	  $symb=~s|(bulletin___\d+___)adm/wrapper/|$1|;
 	  $attachmenturl=&construct_attachmenturl(\@currnewattach,\@keepold,$symb,$idx);
       } elsif ($env{'form.attachment.filename'}) {
-	  unless (length($env{'form.attachment'})>131072) {
-	      $attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,'feedback');
-	  }
+	  if (length($env{'form.attachment'})<=$attachmax{'num'}) {
+              my $now = time;
+              my $subdir = 'feedback/'.$now;
+	      $attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,$subdir);
+	  } else {
+              $toolarge = '<p><span class="LC_warning">'.&mt('Attachment not included - exceeded permitted length').'</span><br /></p>';
+          }
       }
 # Filter HTML out of message (could be nasty)
-      my $message=&clear_out_html($env{'form.comment'});
+      my $override;
+      if ($env{'form.discuss'} =~ /^(?:author|question|course|policy)$/) {
+          $override = 1;
+      }
+      my $message=&clear_out_html($env{'form.comment'},$override);
 
 # Assemble email
-      my ($email,$citations)=&assemble_email($feedurl,$message,$prevattempts,
+      my ($email,$citations)=&assemble_email($message,$prevattempts,
 					     $usersaw,$useranswer);
  
 # Who gets this?
-      my ($typestyle,%to) = &decide_receiver($feedurl);
+      my ($typestyle,%to) = &Apache::lonmsg::decide_receiver($feedurl);
 
 # Actually send mail
-      my ($status,$numsent)=&send_msg($feedurl,$email,$citations,
-				      $attachmenturl,%to);
+      my ($status,$numsent)=&send_msg(&clear_out_html($env{'form.subject'}),
+				      $feedurl,$email,$citations,
+				      $attachmenturl,$usersymb,%to);
 
 # Discussion? Store that.
-
       my $numpost=0;
-      if ($env{'form.discuss'} || $env{'form.anondiscuss'}) {
+      if (  ($env{'form.discuss'} ne ''
+	     && $env{'form.discuss'} !~ /^(?:author|question|course|policy)/)
+	   || $env{'form.anondiscuss'} ne '') {
 	  my $subject = &clear_out_html($env{'form.subject'});
-	  my $anonmode=(defined($env{'form.anondiscuss'}));
+	  my $anonmode=($env{'form.discuss'} eq 'anon' || $env{'form.anondiscuss'} );
 	  $typestyle.=&adddiscuss($symb,$message,$anonmode,$attachmenturl,
-				  $subject);
+				  $subject,$group);
 	  $numpost++;
       }
+
+# Add to blog?
+
+      my $blog='';
+      if ($env{'form.blog'}) {
+	  my $subject = &clear_out_html($env{'form.subject'});
+	  $status.=&Apache::lonrss::addentry($env{'user.name'},
+				    $env{'user.domain'},
+				    'CourseBlog_'.$env{'request.course.id'},
+				    $subject,$message,$feedurl,'public');
+          if (&Apache::loncommon::course_type() eq 'Community') {
+              $blog='<br />'.&mt('Added to my community blog').'<br />';
+          } else {
+	      $blog='<br />'.&mt('Added to my course blog').'<br />';
+          }
+      }
 	  
 # Receipt screen and redirect back to where came from
-      &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$status,$env{'form.previous'});
+      &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$blog,$status,$env{'form.previous'},undef,undef,undef,undef,undef,undef,$group,$toolarge);
   }
   return OK;
+}
+
+sub blocked_reply_or_edit {
+    my ($blocktext) = @_;
+    return 
+      &Apache::loncommon::start_page('Resource Feedback and Discussion').
+      $blocktext.'<br /><br /><a href="javascript:history.go(-1)">'.
+      &mt('Back to previous page').
+      &Apache::loncommon::end_page();
 } 
 
 sub wrap_symb {
@@ -3362,6 +4629,7 @@ sub wrap_symb {
     }
     return $ressymb;
 }
+
 sub dewrapper {
     my ($feedurl)=@_;
     if ($$feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
@@ -3387,5 +4655,238 @@ sub get_feedurl_and_clean_symb {
     my $feedurl = &get_feedurl($symb);
     return ($symb,$feedurl);
 }
+
+sub editing_allowed {
+    my ($postid,$group) = @_;
+    $postid = &unescape($postid);
+    my $can_edit = 0;
+    if ($group ne '') {
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        if ($postid =~ m|^bulletin___\d+___adm/wrapper(/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard)|) {
+            if (&check_group_priv($group,'egp') eq 'ok') {
+                $can_edit = 1;
+            }
+            return $can_edit;
+        }     
+    } 
+    my $cid = $env{'request.course.id'};
+    my $role = (split(/\./,$env{'request.role'}))[0];
+    my $section = $env{'request.course.sec'};
+    my $allow_editing_config = 
+	$env{'course.'.$cid.'.allow_discussion_post_editing'};
+    if ($allow_editing_config =~ m/^\s*yes\s*$/i) {
+        $can_edit = 1;
+    } else {
+	foreach my $editor (split(/,/,$allow_editing_config)) {
+	    my ($editor_role,$editor_sec) = split(/:/,$editor);
+	    if ($editor_role eq $role
+		&& defined($editor_sec)
+		&& defined($section)
+		&& $editor_sec eq $section) {
+		$can_edit = 1;
+		last;
+	    }
+	    if ($editor_role eq $role
+		&& !defined($editor_sec)) {
+		$can_edit = 1;
+	    }
+	}
+    }
+    return $can_edit;
+}
+
+sub check_group_priv {
+    my ($group,$grp_priv) = @_;
+    foreach my $priv ('mdg','vcg') {
+        my $checkcourse = $env{'request.course.id'}.
+            ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'');
+        if (&Apache::lonnet::allowed($priv,$checkcourse)) {
+            return 'ok';
+        }
+    }
+    if ($grp_priv && $group ne '') {
+        if (&Apache::lonnet::allowed($grp_priv,$env{'request.course.id'}.'/'.$group)) {
+            return 'ok';
+        }
+    }
+    return '';
+}
+
+sub group_args { 
+    my ($group) = @_;
+    if ($group eq '') { return ''; }
+    my $extra_args = '&amp;group='.$group;
+    if (exists($env{'form.ref'})) {
+        $extra_args .= '&amp;ref='.$env{'form.ref'};
+    }
+    return $extra_args;
+}
+
+sub get_resource_title {
+    my ($symb,$feedurl) = @_;
+    my ($restitle,$plainurl);
+    if (defined($symb)) {
+        my $plain_symb = &Apache::lonenc::check_decrypt($symb);
+        $restitle = &Apache::lonnet::gettitle($plain_symb);
+    }
+    if (defined($feedurl)) {
+        $plainurl = &Apache::lonenc::check_decrypt($feedurl);
+    }
+    if (!defined($restitle)) {
+        if (defined($feedurl)) {
+            $restitle = &Apache::lonnet::gettitle($plainurl);
+        }
+    }
+    if ($plainurl ne $feedurl) {
+        my ($plain_filename) = ($plainurl =~ m-/([^/]+)$-);
+        if ($plain_filename eq $restitle) {
+            $restitle = &mt('Untitled resource');
+        }
+    }
+    if ($restitle eq '') {
+        $restitle = &mt('Untitled resource');
+    }
+    return $restitle;
+}
+
 1;
 __END__
+
+
+=pod
+
+=head1 NAME
+
+Apache::lonfeedback.pm
+
+=head1 SYNOPSIS
+
+Handles feedback from students to instructors and system administrators.
+
+Provides a screenshot of the current resource, as well as previous attempts if the resource was a homework.
+
+Used by lonmsg.pm.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 OVERVIEW
+
+None
+
+=head1 SUBROUTINES
+
+=over
+
+=item discussion_open()
+
+=item discussion_visible()
+
+=item discussion_vote_available()
+
+=item get_realsymb()
+
+=item list_discussion()
+
+=item can_see_hidden()
+
+=item discussion_link()
+
+=item send_feedback_link()
+
+=item send_message_link()
+
+=item action_links_bar()
+
+=item postingform_display()
+
+=item build_posting_display
+
+=item filter_regexp()
+
+=item get_post_contents()
+
+=item replicate_attachments()
+
+=item mail_screen()
+
+=item print_display_options()
+
+=item print_sortfilter_options()
+
+=item print_showposters()
+
+=item get_post_versions()
+
+=item get_post_attachments()
+
+=item fail_redirect()
+
+=item redirect_back()
+
+=item no_redirect_back()
+
+=item screen_header()
+
+=item resource_output()
+
+=item clear_out_html()
+
+=item assemble_email()
+
+=item feedback_available()
+
+=item send_msg()
+
+=item adddiscuss()
+
+=item get_discussion_info()
+
+=item show_preview()
+
+=item newline_to_br()
+
+=item tidy_html()
+
+=item generate_preview_button()
+
+=item modify_attachments()
+
+=item process_attachments()
+
+=item generate_attachments_button()
+
+=item extract_attachments()
+
+=item construct_attachmenturl()
+
+=item add_blog_checkbox()
+
+=item has_discussion()
+
+=item sort_filter_names()
+
+=item handler()
+
+=item blocked_reply_or_edit()
+
+=item wrap_symb()
+
+=item dewrapper()
+
+=item get_feedurl()
+
+=item get_feedurl_and_clean_symb()
+
+=item editing_allowed()
+
+=item check_group_priv()
+
+=item group_args()
+
+=item get_resource_title()
+
+=back
+
+=cut