--- loncom/interface/lonfeedback.pm	2012/03/16 02:59:01	1.346
+++ loncom/interface/lonfeedback.pm	2018/09/14 15:32:55	1.370.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.346 2012/03/16 02:59:01 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.370.2.2 2018/09/14 15:32:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,8 +44,8 @@ use HTML::LCParser();
 #use HTML::Tidy::libXML;
 use Apache::lonspeller();
 use Apache::longroup;
-use Cwd;
-use LONCAPA;
+use Archive::Zip qw( :ERROR_CODES );
+use LONCAPA qw(:DEFAULT :match);
 
 sub discussion_open {
     my ($status,$symb)=@_;
@@ -277,14 +277,10 @@ sub list_discussion {
     $visit ++;
 
     my $seeid;
-    if (($group ne '') && ($mode eq 'board') && 
-        ($ressymb =~ m|^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$|)) {
-        if (&check_group_priv($group,'dgp') eq 'ok') {
-            $seeid = 1;
-        }
-    } else {
-        $seeid=&Apache::lonnet::allowed('rin',$crs);
+    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);
@@ -311,7 +307,7 @@ sub list_discussion {
     $discinfo{$visitkey} = $visit;
 
     &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,$canvote,$prevread,$sortposts,$encsymb,$readkey,$showunmark,$showonlyunread,$totposters,\@rolefilter,\@sectionpick,\@grouppick,$classgroups,$statusfilter,$toggkey,$outputtarget,\%anonhash,$anoncnt,$group);
+    &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;
@@ -340,12 +336,15 @@ sub list_discussion {
         'aner' => 'An error occurred opening the manifest file.',
         'difo' => 'Discussion for',
         'aerr' => 'An error occurred opening the export file for posting',
+        'discussions' => 'DISCUSSIONS'
+    );
+    my %js_lt = &Apache::lonlocal::texthash(
         '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'
     );
+    &js_escape(\%js_lt);
 
     my $currdisp = $lt{'allposts'};
     my $currmark = $lt{'onmark'};
@@ -451,12 +450,12 @@ imscp_v1p1.xsd http://www.imsglobal.org/
            prevparm = "&previous="+previous
        }
        if (caller == 'studentdelete') {
-           if (confirm("$lt{'aysu'}\\n$lt{'dpwn'},\\n$lt{'bwco'}")) {
+           if (confirm("$js_lt{'aysu'}\\n$js_lt{'dpwn'},\\n$js_lt{'bwco'}")) {
                document.location.href = "/adm/feedback?hide="+symbparm+prevparm+groupparm
            }
        } else {
            if (caller == 'seeiddelete') {
-               if (confirm("$lt{'aysu'}\\n$lt{'depo'}")) {
+               if (confirm("$js_lt{'aysu'}\\n$js_lt{'depo'}")) {
                    document.location.href = "/adm/feedback?deldisc="+symbparm+prevparm+groupparm
                }
            }
@@ -467,23 +466,23 @@ imscp_v1p1.xsd http://www.imsglobal.org/
                          "\n".'<table width="100%" class="LC_discussion">';
             $discussion .= &action_links_bar($colspan,$ressymb,$visible,
                                              $newpostsflag,$group,
-                                             $prevread,$markondisp);
+                                             $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='.$escsymb;
+                $discussion.="\n".'<tr><td bgcolor="#CCCCCC" colspan="'.$colspan.'">';
+                my $href = '/adm/feedback?allposts=1&amp;symb='.$escsymb;
                 if ($newpostsflag) {
-                    $discussion .= '&amp;previous='.$prevread;
+                    $href .= '&amp;previous='.$prevread;
                 }
-		$discussion .= &group_args($group);
-                $discussion .= '">'.&mt('Show all posts').'</a> '.&mt('to display').' '.
-                         $numhidden.' ';
+		$href .= &group_args($group);
                 if ($showunmark) {
-                    $discussion .= &mt('posts previously marked read');
+                    $discussion .= &mt('[_1]Show all posts[_2] to display [quant,_3,post] previously marked read',
+                                       '<a href="'.$href.'">','</a>',$numhidden);
                 } else {
-                    $discussion .= &mt('previously viewed posts');
+                    $discussion .= &mt('[_1]Show all posts[_2] to display [quant,_3,post] previously viewed',
+                                       '<a href="'.$href.'">','</a>',$numhidden);
                 }
                 $discussion .= '<br/></td></tr>';
             }
@@ -517,7 +516,9 @@ imscp_v1p1.xsd http://www.imsglobal.org/
         my $currdepth = 0;
         my $firstidx = $alldiscussion{$showposts[0]};
         foreach my $post (@showposts) {
-            unless (($sortposts eq 'thread') || (($sortposts eq '') && ($env{'environment.threadeddiscussion'})) || ($outputtarget eq 'export')) {
+            unless (($sortposts eq 'thread') || 
+                    (($sortposts eq '') && (!$env{'environment.unthreadeddiscussion'})) || 
+                    ($outputtarget eq 'export')) {
                 $alldiscussion{$post} = $post;
             }
             unless ( ($notshown{$alldiscussion{$post}} eq '1') || ($shown{$alldiscussion{$post}} == 0) ) {
@@ -564,7 +565,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
                     my $postingfile;
                     my $postingfilename = $tempexport.'/'.$postfilename;
                     if ($postingfile = Apache::File->new('>'.$postingfilename)) {
-                        print $postingfile '<html><head><title>Discussion Post</title></head><body>'.
+                        print $postingfile '<html><head><title>'.&mt('Discussion Post').'</title></head><body>'.
                                            $imsitems{$alldiscussion{$post}}{'title'}.' '.
                                            $imsitems{$alldiscussion{$post}}{'sender'}.
                                            $imsitems{$alldiscussion{$post}}{'timestamp'}.'<br /><br />'.
@@ -671,7 +672,7 @@ END
 END
             $discussion .= &action_links_bar($colspan,$ressymb,$visible,
                                              $newpostsflag,$group,
-                                             $prevread,$markondisp);
+                                             $prevread,$markondisp,$seehidden);
             $discussion .= "</table></form>\n";
         } 
         if ($outputtarget eq 'export') {
@@ -695,22 +696,34 @@ END
 
 #Create zip file in prtspool
 
-                    my $imszipfile = '/prtspool/'.
-                    $env{'user.name'}.'_'.$env{'user.domain'}.'_'.
-                         time.'_'.rand(1000000000).'.zip';
-                    my $cwd = &getcwd(); 
-                    my $imszip = '/home/httpd/'.$imszipfile;
-                    chdir $tempexport;
-                    open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
-                    close(OUTPUT);
-                    chdir $cwd;
-                    $discussion .= &mt('Download the zip file from [_1]Discussion Posting Archive','<a href="'.$imszipfile.'">').'</a><br />';
-                    if ($copyresult) {
-                        $discussion .= &mt('The following errors occurred during export').' - <br />'.$copyresult;
+                    if (($env{'user.name'} =~ /^$match_username$/)
+                        && ($env{'user.domain'} =~ /^$match_domain$/)) {
+                        my $now = time();
+                        my $imszipfile = '/prtspool/'.
+                                      join('_',$env{'user.name'},$env{'user.domain'},$now).
+                                      '_'.rand(1000000000).'.zip';
+                        my $zip = Archive::Zip->new();
+                        $zip->addTree($tempexport);
+                        my $imszip = '/home/httpd/'.$imszipfile;
+                        if ($zip->writeToFileNamed($imszip) == AZ_OK) {
+                            $discussion .= &mt('Download the zip file from [_1]Discussion Posting Archive[_2]',
+                                           '<a href="'.$imszipfile.'">','</a>').'<br />';
+                        } else {
+                            $discussion .=  &mt('Failed to create zip file').'<br />';
+                        }
+                        if ($copyresult) {
+                            $discussion .= '<span class="LC_error">'.
+                                           &mt('The following errors occurred during export:').
+                                           '</span><br />'.$copyresult;
+                        }
+                    } else {
+                        $discussion .= '<p class="LC_error">'.
+                                       &mt('Unfortunately you will not be able to retrieve an archive of the discussion posts at this time, because there was a problem creating the zip file.').'</p>';
                     }
                 }
             } else {
-                $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 />';
+                $discussion .= '<p class="LC_error">'.
+                               &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.').'</p>';
             }
             return $discussion;
         }
@@ -788,10 +801,42 @@ END
     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;
+   my $link='/adm/feedback?inhibitmenu=yes&amp;modal=yes&amp;'.$cmd.'='.&escape($ressymb).':::'.$item;
    if ($flag) { $link .= '&amp;previous='.$prev; }
    if ($adds) { $link .= $adds; }
    my $width=600;
@@ -810,7 +855,7 @@ sub send_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>',
+                    '" /><span class="LC_menubuttons_inline_text">'.&mt('Post Discussion').'</span>',
                     'replydisc').
            '</span>';
 }
@@ -821,14 +866,15 @@ sub send_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>',
+                    '" /><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) = @_;
+    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">';
@@ -861,7 +907,7 @@ sub action_links_bar {
     }
     $discussion .= &group_args($group);
     $discussion .= '">'.&mt('Export').'</a>';
-    if (&Apache::lonnet::allowed('rin',$env{'request.course.id'})) {
+    if ($seehidden) {
         $discussion .= '&nbsp;&nbsp;';
         $discussion .='<a href="/adm/feedback?undeleteall='.$escsymb;
         if ($newpostsflag) {
@@ -895,7 +941,7 @@ sub postingform_display {
         $currnewattach,$currdelold,$group,$crstype) = @_;
     my $newattachmsg;
     my %lt = &Apache::lonlocal::texthash(
-              'note' => 'Note: in anonymous discussion, your name is visible only to course faculty',
+             'note' => 'Note: in anonymous discussion, your name is visible only to course faculty',
              'title' => 'Title',
              'podi' => 'Post Discussion',
              'poan' => 'Post Anonymous Discussion',
@@ -968,7 +1014,7 @@ ENDDISCUSS
 }
 
 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,$canvote,$prevread,$sortposts,$ressymb,$readkey,$showunmark,$showonlyunread,$totposters,$rolefilter,$sectionpick,$grouppick,$classgroups,$statusfilter,$toggkey,$outputtarget,$anonhash,$anoncnt,$group) = @_;
+    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;
@@ -1025,15 +1071,16 @@ sub build_posting_display {
                      &filter_regexp($rolefilter,$sectionpick,$statusfilter);
             $rolematch = $roleregexp.':'.$secregexp.':'.$statusregexp;
         }
+        my %votestyle;
         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}) && (!$seeid)) || ($deletions{$idx}) || (!$contrib{$idx.':message'})) {
+                unless ((($hiddens{$idx}) && (!$seehidden)) || ($deletions{$idx}) || (!$contrib{$idx.':message'})) {
+                    push(@theselikes,$likes{$symb.':'.$idx.':likes'});
                     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;
@@ -1070,6 +1117,29 @@ sub build_posting_display {
             $twoplus=$ave+2.*$stddev;
             $oneminus=$ave-$stddev;
             $twominus=$ave-2.*$stddev;
+            if ($#theselikes>1) {
+                foreach my $class ('twoplus','oneplus','zero','oneminus','twominus') {
+                    my $fontstyle = $env{'course.'.$env{'request.course.id'}.'.discussion_post_fonts_'.$class};
+                    if ($fontstyle ne '') {
+                        my ($size,$weight,$style,$other) = split(/,/,$fontstyle);
+                        if ($size ne '') {
+                            $votestyle{$class} .= 'font-size: '.$size.';';
+                        }
+                        if ($weight ne '') {
+                            $votestyle{$class} .= 'font-weight: '.$weight.';';
+                        }
+                        if ($style ne '') {
+                            $votestyle{$class} .= 'font-style: '.$style.';';
+                        }
+                        if ($other ne '') {
+                            $votestyle{$class} .= $other;
+                        }
+                        if ($votestyle{$class} ne '') {
+                            $votestyle{$class} = 'style="'.$votestyle{$class}.'"';
+                        }
+                    }
+                }
+            }
         }
 #
 # This is now the real loop. Go through all entries, pick up what we need
@@ -1088,7 +1158,8 @@ sub build_posting_display {
 	    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;
@@ -1108,7 +1179,7 @@ sub build_posting_display {
 	    } else {
 		$$replies[$$depth[$idx]]=1;
 	    }
-            unless ((($hiddens{$idx}) && (!$seeid)) || ($deletions{$idx})) {
+            unless ((($hiddens{$idx}) && (!$seehidden)) || ($deletions{$idx})) {
 		$$visible++;
                 if ($contrib{$idx.':history'}) {
                     if ($contrib{$idx.':history'} =~ /:/) {
@@ -1133,7 +1204,7 @@ sub build_posting_display {
 		    $$anonhash{$key}=&mt('Anonymous').' '.$anoncnt;
 		}
                 my ($message,$subject,$vgrlink,$ctlink);
-                &get_post_contents(\%contrib,$idx,$seeid,$outputtarget,\%messages,\%subjects,\%allattachments,\%attachtxt,$imsfiles,\$screenname,\$plainname,\$showaboutme,$numoldver);
+                &get_post_contents(\%contrib,$idx,$seeid,$seehidden,$outputtarget,\%messages,\%subjects,\%allattachments,\%attachtxt,$imsfiles,\$screenname,\$plainname,\$showaboutme,$numoldver);
 
 
 # Set up for sorting by subject
@@ -1222,23 +1293,23 @@ sub build_posting_display {
                                 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 ($seeid) {
+                                         &discussion_link($ressymb,&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>';
                                         }
                                     }
                                 }
-			        if ($seeid) {
+			        if ($seehidden) {
 			            if ($hiddens{$idx}) {
                                         unless ($studenthidden) {
  		                           $sender.=' '.
-                                            &discussion_link($symb,&mt('Make Visible'),'unhide',$idx,$$newpostsflag,$prevread,&group_args($group));
+                                            &discussion_link($ressymb,&mt('Make Visible'),'unhide',$idx,$$newpostsflag,$prevread,&group_args($group));
                                         }
 			            } else {
                                         $sender.=' '.
-                                         &discussion_link($symb,&mt('Hide'),'hide',$idx,$$newpostsflag,$prevread,&group_args($group));
+                                         &discussion_link($ressymb,&mt('Hide'),'hide',$idx,$$newpostsflag,$prevread,&group_args($group));
 			            }
                                     my $grpargs = &group_args($group);
 			            $sender.= 
@@ -1277,13 +1348,13 @@ sub build_posting_display {
                                 if (($group ne '') && 
                                     (&check_group_priv($group,'pgd') eq 'ok')) {
                                      $sender.=' '.
-                                         &discussion_link($symb,&mt('Reply'),'replydisc',$idx,$$newpostsflag,$prevread,&group_args($group));
+                                         &discussion_link($ressymb,&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);
+                                         &discussion_link($ressymb,&mt('Reply'),'replydisc',$idx,$$newpostsflag,$prevread);
                                 }
                             }
 		            if ($viewgrades) {
@@ -1301,7 +1372,8 @@ sub build_posting_display {
                 }
                 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;
@@ -1403,44 +1475,58 @@ sub build_posting_display {
                                 $$discussionitems[$idx].='&nbsp;&nbsp;'.$ctlink;
                             }
                             my $thislikes=$likes{$symb.':'.$idx.':likes'};
-                            my $likesize="100";
+                            my $likestyle;
                             if ($seeid || $canvote) {
 # Figure out size based on likes
+                                my $class = 'zero';
                                 my $thislikes=$likes{$symb.':'.$idx.':likes'};
                                 if ($thislikes>$twoplus) {
-                                    $likesize="200";
+                                    $class = 'twoplus';
                                 } elsif ($thislikes>$oneplus) {
-                                    $likesize="150";
+                                    $class = 'oneplus';
                                 }
                                 if ($thislikes<$twominus) {
-                                    $likesize="50";
+                                    $class = 'twominus';
                                 } elsif ($thislikes<$oneminus) {
-                                    $likesize="75";
+                                    $class = 'oneminus';
                                 }
+                                $likestyle = $votestyle{$class};
                             }
 # Actually glue in the message itself
                             $$discussionitems[$idx].= '<br /><blockquote>'.
-                                    "<div style='font-size:$likesize%'>".
+                                    "<div $likestyle>".
                                     $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 (($uname eq $env{'user.name'}) && ($udom eq $env{'user.domain'})) {
-                                    my $novote = &mt('No voting for your own posts');
+                                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.');
+                                    }
+                                    &html_escape(\$novote);
                                     $$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"));
+                                        $$discussionitems[$idx].='&nbsp;'.&discussion_link($ressymb,'<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"));
+                                        $$discussionitems[$idx].='&nbsp;'.&discussion_link($ressymb,'<img border="0" src="/res/adm/pages/thumbsdown.png" alt="'.&mt('Unlike').'" />','unlike',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Unlike this posting"));
                                     }
                                 }
                             }
@@ -1456,9 +1542,9 @@ sub build_posting_display {
                             if ($contrib{$idx.':history'}) {
                                 my @postversions = ();
                                 $$discussionitems[$idx] .= '&nbsp;&nbsp;'.&mt('This post has been edited by the author.');
-                                if ($seeid) {
+                                if ($seehidden) {
                                     $$discussionitems[$idx] .= '&nbsp;&nbsp;'.
-                                         &discussion_link($symb,&mt('Display all versions'),'allversions',$idx,$$newpostsflag,$prevread,&group_args($group));
+                                         &discussion_link($ressymb,&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/:/) {
@@ -1542,13 +1628,13 @@ sub filter_regexp {
 
 
 sub get_post_contents {
-    my ($contrib,$idx,$seeid,$type,$messages,$subjects,$allattachments,$attachtxt,$imsfiles,$screenname,$plainname,$showaboutme,$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) {
+       unless($seehidden) {
            $discussion=&mt('You do not have privileges to view all versions of posts.').' '.&mt('Please select a different role.');
            return $discussion;
        } 
@@ -1763,6 +1849,7 @@ 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'});
@@ -1771,36 +1858,25 @@ END
                   $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;
               }
-              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};
-              }
-              if ($idx > 0) {
-                  my %subversions = ();
-                  &get_post_versions(\%subversions,$contrib{$idx.':subject'},1,$numoldver);
-                  $subject = &mt('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);
+                  $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'};
               }
@@ -1836,6 +1912,7 @@ END
   my $latexHelp=&Apache::loncommon::helpLatexCheatsheet(undef,undef,1,($env{'form.modal'}?'popup':0));
   my $send=&mt('Send');
   my $alert = &mt('Please select a feedback type.');
+  &js_escape(\$alert);
   my $js= <<END;
 <script type="text/javascript">
 //<!--
@@ -1892,7 +1969,7 @@ END
 
   my %onload = ('onload' => 'window.focus();setposttype();');
   my %parms=('add_entries' => \%onload);
-  if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum }
+  if ($env{'form.modal'} ne 'yes') { $parms{'bread_crumbs'} = $brcrum; }
   my $start_page=
       &Apache::loncommon::start_page('Resource Feedback and Discussion',$js,\%parms);
 
@@ -1901,7 +1978,11 @@ END
       unless (&contains_block_html($quote)) {
           &newline_to_br(\$quote);
       }
-      $quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($quote).'</blockquote>';
+        $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'}) {
@@ -1929,24 +2010,27 @@ END
   }
   $r->print(<<END);
 $options
+<br />
+END
+$r->print(&Apache::lonhtmlcommon::start_pick_box());
+$r->print(<<END);
 $quote
 <p>
 $textareaheader
 </p>
-<br>
 <p>
 $latexHelp
 </p>
 <p>
 END
 
-    $r->print(&Apache::lonhtmlcommon::start_pick_box());
+    
     $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" '.
+    $r->print('<textarea name="comment" id="comment" cols="55" rows="10" '.
               $textareaclass.'>'.$comment.
               '</textarea>');
     $r->print(&Apache::lonhtmlcommon::row_closure(1));
@@ -1984,10 +2068,8 @@ END
         $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>
 </form>
 END
     if ($env{'form.editdisc'} || $env{'form.replydisc'}) {
@@ -2002,7 +2084,6 @@ END
             $attachnum += @currnewattach;
         }
         my $blockblog = &Apache::loncommon::blocking_status('blogs');
-        $r->print(&generate_attachments_button($postidx,$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,$numoldver,'',$blockblog));
         if ($attachnum > 0) {
             if (@currnewattach > 0) {
                 $newattachmsg .= '<br /><b>'.&mt('New attachments').'</b><br />';
@@ -2022,9 +2103,10 @@ END
                 $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::loncommon::end_page());
@@ -2064,6 +2146,11 @@ sub print_display_options {
         'yhni' => 'You have not indicated that you wish to change any of the discussion settings',
         'ywbr' => 'You will be returned to the previous page if you click OK.'
     );
+    my %js_lt = &Apache::lonlocal::texthash(
+        'yhni' => 'You have not indicated that you wish to change any of the discussion settings',
+        'ywbr' => 'You will be returned to the previous page if you click OK.'
+    );
+    &js_escape(\%js_lt);
 
     my $dispchangeA = $lt{'unread'};
     my $dispchangeB = $lt{'unmark'};
@@ -2157,7 +2244,7 @@ function setDisp() {
     if (chktotal > 0) { 
         document.modifydisp.submit()
     } else {
-        if(confirm("$lt{'yhni'}. \\n$lt{'ywbr'}"))      {
+        if(confirm("$js_lt{'yhni'}. \\n$js_lt{'ywbr'}"))      {
             if (prev > 0) {
                 location.href = "$feedurl?previous=$previous"
             } else {
@@ -2465,24 +2552,11 @@ 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;
     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);
-    if (($group ne '') &&
-        ($ressymb =~ m|^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$|)) {
-        if (&check_group_priv($group,'dgp') eq 'ok') {
-            $seeid = 1;
-        }
-    } else {
-        $seeid=&Apache::lonnet::allowed('rin',$crs);
-    }
+    my $seehidden = &can_see_hidden('',$ressymb,$feedurl,$group,$cdom,$cnum);
     my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
                                          $cdom,$cnum);
     my %namesort = ();
@@ -2498,7 +2572,7 @@ sub print_showposters {
         for (my $idx=1;$idx<=$contrib{'version'};$idx++) {
             my $hidden=($contrib{'hidden'}=~/\.$idx\./);
             my $deleted=($contrib{'deleted'}=~/\.$idx\./);
-            unless ((($hidden) && (!$seeid)) || ($deleted)) {
+            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'};
@@ -2523,14 +2597,14 @@ sub print_showposters {
                     }
                 }
             }
-        }
+        }       
     }
 
     my $start_page = &Apache::loncommon::start_page('Discussion options');
     my $table_start =&Apache::loncommon::start_data_table();
     $r->print(<<END);
 $start_page
- <form name="pickpostersform" method="post">
+ <form name="pickpostersform" method="post" action="">
  <br />
     $table_start
       <tr>
@@ -2646,7 +2720,7 @@ sub fail_redirect {
 					    'only_body' => 1,}));
   $r->print(<<ENDFAILREDIR);
 <img align="right" src="$logo" />
-<b>$lt{'sorr'}</b>
+<p class="LC_warning">$lt{'sorr'}</p>
 ENDFAILREDIR
   $r->print(&Apache::loncommon::end_page());
 }
@@ -3188,7 +3262,8 @@ sub getdiscussionrecords {
 
 sub getdiscussionstats {
     my %record=&getdiscussionrecords(@_);
-    return ($record{'subnumber'},$record{'points'},$record{'totallikes'},$record{'totalvotes'});
+    my $totalvotes = $record{'totallikes'} + $record{'totalunlikes'};
+    return ($record{'subnumber'},$record{'points'},$record{'totallikes'},$totalvotes);
 }
 
 # Calculate discussion karma
@@ -3252,23 +3327,20 @@ sub storediscussionpoints {
 # Store discussion "likes"
 
 sub storediscussionlikes {
-    my ($likes,$uname,$udom,$course)=@_;
-    unless ($likes) { $likes=0; }
-    if ($likes>0) { $likes=1; }
-    if ($likes<0) { $likes=-1; }
+    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 $totalvotes=$record{'totalvotes'};
-    $totallikes+=$likes;
-    $totalvotes++;
+    my $totalunlikes=$record{'totalunlikes'};
+    $totallikes += $chglikes;
+    $totalunlikes += $chgunlikes;
     my %newrecord=('likes_user'   => $env{'user.name'},
                    'likes_domain' => $env{'user.domain'},
-                   'likes' => $likes,
-                   'totallikes' => $totallikes,
-                   'totalvotes' => $totalvotes);
+                   'totallikes'   => $totallikes,
+                   'totalunlikes' => $totalunlikes,
+                   'context'      => $context);
     my $status=&Apache::lonnet::cstore(\%newrecord,'_discussion',$course,$udom,$uname);
     if ($status eq 'ok') {
         &updatekarma($uname,$udom,$course);
@@ -3440,7 +3512,7 @@ END
     my $brcrum = [{'href' => '',
                    'text' => 'Discussion Post Attachments'}];
     my %parms=('only_body' => 1);
-    if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum }
+    if ($env{'form.modal'} ne 'yes') { $parms{'bread_crumbs'} = $brcrum; }
 
     my $start_page = 
 	&Apache::loncommon::start_page('Discussion Post Attachments',$js,\%parms);
@@ -3467,7 +3539,7 @@ END
 $start_page
 $toolarge
 <form name="modattachments" method="post" enctype="multipart/form-data" action="/adm/feedback?attach=$symb">
- <br />
+
  <h1>$lt{'clic'}</h1>
 END
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
@@ -3804,6 +3876,9 @@ sub handler {
   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
          ['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,
@@ -3855,28 +3930,18 @@ sub handler {
                      'text' => 'Discussion Post Versions'}];
       
       my %parms=();
-      if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum }
+      if ($env{'form.modal'} ne 'yes') { $parms{'bread_crumbs'} = $brcrum; }
 
       $r->print(&Apache::loncommon::start_page('Discussion Post Versions',undef,\%parms));
 
-      my $crs='/'.$env{'request.course.id'};
-      if ($env{'request.course.sec'}) {
-          $crs.='_'.$env{'request.course.sec'};
-      }
-      $crs=~s|_|/|g;
-      my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-      my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
       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 (($group ne '') && (($ressymb =~ m|^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$|))) {
-          if (&check_group_priv($group,'dgp') eq 'ok') {
-              $seeid = 1;
-          }
-      } else {
-          $seeid = &Apache::lonnet::allowed('rin',$crs);
+      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 = ();
@@ -3885,9 +3950,8 @@ sub handler {
           my %imsfiles = ();
           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,\$showaboutme));
+                                               $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;
@@ -3939,8 +4003,6 @@ sub handler {
       my $feedurl = '/adm/navmaps';
       if ($env{'form.navurl'}) { $feedurl .= '?'.$env{'form.navurl'}; }
       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 discussion boards with unread discussion postings.'
       );       
       foreach my $res (@resources) {
@@ -3949,7 +4011,10 @@ sub handler {
           my $lastkey = $ressymb.'_lastread';
           $discinfo{$lastkey} = $env{'form.navtime'};
       }
-      my $textline = "<b>$lt{'mnpa'} $numitems $lt{'robb'}</b>";
+      my $textline = '<b>'.
+                     &mt('Marked "New" posts as read in a total of [_1] resources/discussion boards.',
+                         $numitems).
+                     '</b>';
       if ($numitems > 0) {
           &Apache::lonnet::put('nohist_'.$env{'request.course.id'}.'_discuss',
 			     \%discinfo,$env{'user.domain'},$env{'user.name'});
@@ -4025,37 +4090,32 @@ ENDREDIR
       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 $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'} && !$seeid && !(&editing_allowed($env{'form.hide'},$group))) {
-          &redirect_back($r,$feedurl,&mt('Deletion not permitted').'<br />',                 '0','0','','',$env{'form.previous'},'','','','',
-                 undef,undef,$group,);
+      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'};
 
       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;
       }
       if ($env{'form.hide'}) {
@@ -4064,16 +4124,46 @@ ENDREDIR
           ($changelast,$newlast) = &get_discussion_info($idx,%contrib);
           if ($changelast) {
               &Apache::lonnet::put('discussiontimes',{$symb => $newlast},
-                     $env{'course.'.$env{'request.course.id'}.'.domain'},
-                     $env{'course.'.$env{'request.course.id'}.'.num'});
+                                   $cdom,$cnum);
           }
       }
-      &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'},undef,undef,undef,
+      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'})) {
@@ -4091,23 +4181,30 @@ ENDREDIR
           }
           if (&discussion_vote_available($status,$realsymb)) {
               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 $ownpost;
               if (($contrib{$idx.':sendername'} eq $env{'user.name'}) && 
                   ($contrib{$idx.':senderdomain'} eq $env{'user.domain'})) {
-                  $result = &mt("Vote not registered. No voting for your own posts.");
+                  $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',
-                                  $env{'course.'.$env{'request.course.id'}.'.domain'},
-                                  $env{'course.'.$env{'request.course.id'}.'.num'},
-                                  '^'.$prefix);
+                  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'};
@@ -4128,11 +4225,13 @@ ENDREDIR
 # 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') {
@@ -4147,6 +4246,7 @@ ENDREDIR
                           $alreadyflag=1;
                       } elsif ($userlikes) {
                           delete($likes{$prefix.'likers'}{$thisuser});
+                          $votetype = 'switch';
                           $likescount--;
                       } else {
                           if (ref($likes{$prefix.'unlikers'}) eq 'HASH') {
@@ -4169,16 +4269,34 @@ ENDREDIR
                                    $prefix.'likers'   => $likes{$prefix.'likers'},
                                    $prefix.'unlikers' => $likes{$prefix.'unlikers'});
 # Store data in db-file "disclikes"
-                      if (&Apache::lonnet::put('disclikes',
-                                               \%newhash,
-                                               $env{'course.'.$env{'request.course.id'}.'.domain'},
-                                               $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {
+                      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'}) {
-                              &storediscussionlikes(1,$contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'});
+                              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 {
-                             &storediscussionlikes(-1,$contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'});
+                              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 {
@@ -4199,12 +4317,16 @@ ENDREDIR
       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') {
+      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::put('environment',{'threadeddiscussion' => 'on'});
 	  &Apache::lonnet::appenv({'environment.threadeddiscussion' => 'on'});
-      } else {
- 	  &Apache::lonnet::del('environment',['threadeddiscussion']);
-	  &Apache::lonnet::delenv('environment.threadeddiscussion');
+	  &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'},undef,undef,undef,
@@ -4214,20 +4336,51 @@ ENDREDIR
 # --------------------------------------------------------------- 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},
-                   $env{'course.'.$env{'request.course.id'}.'.domain'},                   $env{'course.'.$env{'request.course.id'}.'.num'});
+                               $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'},undef,undef,undef,
+
+      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'}) {
@@ -4255,8 +4408,7 @@ 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,
@@ -4273,6 +4425,7 @@ ENDREDIR
           $mode='problem';
           $status=$Apache::inputtags::status[-1];
       }
+       
       my $discussion = &list_discussion($mode,$status,$symb); 
       my $start_page = 
 	  &Apache::loncommon::start_page('Resource Feedback and Discussion');
@@ -4285,16 +4438,54 @@ ENDREDIR
       &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 (&Apache::lonnet::allowed('rin',$env{'request.course.id'})) {
-           if (&Apache::lonnet::store({'deleted' => ''},$symb,$env{'request.course.id'},
-                     $env{'course.'.$env{'request.course.id'}.'.domain'},
-                     $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {
-               $r->print(&Apache::lonhtmlcommon::confirm_success(&mt("Undeleted all entries")));
-           } else {
-               $r->print(&Apache::lonhtmlcommon::confirm_success(&mt("Failed to undelete entries"),1));
-           }
-           $r->print("<br /><a href='$feedurl'>".&mt("Return and reload")."</a>");
+      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/\.$//;
+          my $confirm_msg;
+          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');
+                  }
+                  $confirm_msg = &Apache::lonhtmlcommon::confirm_success(&mt("Undeleted all entries"));
+              } else {
+                  $confirm_msg = &Apache::lonhtmlcommon::confirm_success(&mt("Failed to undelete entries"),1);
+              }
+          } else {
+              $confirm_msg = &Apache::lonhtmlcommon::confirm_success(&mt("No entries to undelete"),1);
+          }
+          $r->print(
+              '<br />'
+             .&Apache::loncommon::confirmwrapper($confirm_msg)
+             .&Apache::lonhtmlcommon::actionbox(
+                  ["<a href='$feedurl'>".&mt("Return and reload")."</a>"])
+          );
       }
       $r->print(&Apache::loncommon::end_page());
       return OK;
@@ -4493,6 +4684,7 @@ sub wrap_symb {
     }
     return $ressymb;
 }
+
 sub dewrapper {
     my ($feedurl)=@_;
     if ($$feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
@@ -4652,6 +4844,10 @@ None
 
 =item list_discussion()
 
+=item can_see_hidden()
+
+=item discussion_link()
+
 =item send_feedback_link()
 
 =item send_message_link()