--- loncom/interface/lonfeedback.pm 2012/03/15 15:02:59 1.342
+++ loncom/interface/lonfeedback.pm 2012/03/16 02:59:01 1.346
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.342 2012/03/15 15:02:59 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.346 2012/03/16 02:59:01 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1333,14 +1333,15 @@ 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 ($env{'form.totposters'} ne '') {
if ($totposters == 0) {
@@ -1424,15 +1425,23 @@ sub build_posting_display {
'';
if ($canvote) {
# Put in the like and unlike buttons
- if ($userlikes{$idx}) {
- $$discussionitems[$idx].='';
+ if (($uname eq $env{'user.name'}) && ($udom eq $env{'user.domain'})) {
+ my $novote = &mt('No voting for your own posts');
+ $$discussionitems[$idx].=
+ ''.
+ '
'.
+ '
';
} else {
- $$discussionitems[$idx].=' '.&discussion_link($symb,'
','like',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Like this posting"));
- }
- if ($userunlikes{$idx}) {
- $$discussionitems[$idx].='
';
- } else {
- $$discussionitems[$idx].=' '.&discussion_link($symb,'
','unlike',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Unlike this posting"));
+ if ($userlikes{$idx}) {
+ $$discussionitems[$idx].='
';
+ } else {
+ $$discussionitems[$idx].=' '.&discussion_link($symb,'
','like',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Like this posting"));
+ }
+ if ($userunlikes{$idx}) {
+ $$discussionitems[$idx].='
';
+ } else {
+ $$discussionitems[$idx].=' '.&discussion_link($symb,'
','unlike',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Unlike this posting"));
+ }
}
}
if ($seeid || $canvote) {
@@ -1931,15 +1940,17 @@ $latexHelp
END -$r->print(&Apache::lonhtmlcommon::start_pick_box()); -$r->print(&Apache::lonhtmlcommon::row_title(&mt('Subject'))); -$r->print('
'); -$r->print(&Apache::lonhtmlcommon::row_closure()); -$r->print(&Apache::lonhtmlcommon::row_title(&mt('Message'))); -$r->print(''); -$r->print(&Apache::lonhtmlcommon::row_closure(1)); -$r->print(&Apache::lonhtmlcommon::end_pick_box()); + $r->print(&Apache::lonhtmlcommon::start_pick_box()); + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Subject'))); + $r->print(''); + $r->print(&Apache::lonhtmlcommon::row_closure()); + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Message'))); + $r->print(''); + $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'}) { @@ -3798,7 +3809,7 @@ sub handler { num => 131072, ); if ($env{'form.editdisc'}) { - if (!(&editing_allowed($env{'form.editdisc'},$env{'form.group'}))) { + 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); @@ -3858,7 +3869,6 @@ sub handler { my ($symb,$idx)=split(/\:\:\:/,$env{'form.allversions'}); ($symb)=&get_feedurl_and_clean_symb($symb); my $ressymb = &wrap_symb($symb); - my $group = $env{'form.group'}; 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') { @@ -4023,7 +4033,7 @@ ENDREDIR $crs=~s/\_/\//g; my $seeid=&Apache::lonnet::allowed('rin',$crs); - if ($env{'form.hide'} && !$seeid && !(&editing_allowed($env{'form.hide'},$env{'form.group'}))) { + if ($env{'form.hide'} && !$seeid && !(&editing_allowed($env{'form.hide'},$group))) { &redirect_back($r,$feedurl,&mt('Deletion not permitted').'