--- loncom/interface/lonfeedback.pm 2012/05/01 15:56:16 1.290.2.7.2.5 +++ loncom/interface/lonfeedback.pm 2012/03/15 12:45:21 1.340 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.290.2.7.2.5 2012/05/01 15:56:16 raeburn Exp $ +# $Id: lonfeedback.pm,v 1.340 2012/03/15 12:45:21 goltermann Exp $ # # Copyright Michigan State University Board of Trustees # @@ -58,15 +58,15 @@ sub discussion_open { return 1; } # It was not explicitly open, check if the problem is available. -# If the problem is not available, close the discussion +# 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; + !($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER' + || $status eq 'OPEN')) { + return 0; } # The problem is available, but check if the instructor explictly closed discussion if (defined($close) && $close ne '' && $close < time) { - return 0; + return 0; } return 1; } @@ -82,26 +82,6 @@ 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,$group)=@_; unless ($ressymb) { $ressymb=&Apache::lonnet::symbread(); } @@ -155,7 +135,7 @@ sub list_discussion { $crs=~s/\_/\//g; my $encsymb=&Apache::lonenc::check_encrypt($ressymb); my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs) - && ($ressymb=~/\.(problem|exam|quiz|assess|survey|form|task)$/)); + && ($ressymb=~/$LONCAPA::assess_re/)); my %usernamesort = (); my %namesort =(); @@ -277,14 +257,14 @@ sub list_discussion { $visit ++; my $seeid; - if (&Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) { - $seeid = 1; + 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); } - 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=(); @@ -301,17 +281,12 @@ sub list_discussion { my $maxdepth=0; my %anonhash=(); my $anoncnt=0; - my $target=''; - unless ($env{'browser.interface'} eq 'textual' || - $env{'environment.remote'} eq 'off' ) { - $target='target="LONcom"'; - } my $now = time; $discinfo{$visitkey} = $visit; &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,$target,$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,$prevread,$sortposts,$encsymb,$readkey,$showunmark,$showonlyunread,$totposters,\@rolefilter,\@sectionpick,\@grouppick,$classgroups,$statusfilter,$toggkey,$outputtarget,\%anonhash,$anoncnt,$group); my $discussion=''; my $manifestfile; @@ -321,10 +296,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', @@ -445,7 +418,6 @@ imscp_v1p1.xsd http://www.imsglobal.org/ } } else { my $colspan=$maxdepth+1; -#JW $discussion.= &Apache::lonhtmlcommon::scripttag(qq| function verifydelete (caller,symb,idx,newflag,previous,groupparm) { var symbparm = symb+':::'+idx @@ -467,10 +439,10 @@ imscp_v1p1.xsd http://www.imsglobal.org/ } |); $discussion.='
'. - "\n".''; + "\n".'
'; $discussion .= &action_links_bar($colspan,$ressymb,$visible, $newpostsflag,$group, - $prevread,$markondisp,$seehidden); + $prevread,$markondisp); my $escsymb=&escape($ressymb); my $numhidden = keys(%notshown); if ($numhidden > 0) { @@ -530,7 +502,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/ my $thisdepth=$depth[$alldiscussion{$post}]; if ($outputtarget ne 'tex' && $outputtarget ne 'export') { for (1..$thisdepth) { - $discussion.=''; + $discussion.=''; } } my $colspan=$maxdepth-$thisdepth+1; @@ -588,17 +560,12 @@ imscp_v1p1.xsd http://www.imsglobal.org/ unless ($outputtarget eq 'tex' || $outputtarget eq 'export') { my $colspan=$maxdepth+1; $discussion .= < -
        - + +
+ - END if ($sortposts) { @@ -630,7 +591,7 @@ END my %status_types = (); &sort_filter_names(\%sort_types,\%role_types,\%status_types,$crstype); - $discussion .= ''; } + $discussion .= ''; + } if ($dischash{$toggkey}) { my $storebutton = &mt('Save read/unread changes'); @@ -684,10 +646,8 @@ END END $discussion .= &action_links_bar($colspan,$ressymb,$visible, $newpostsflag,$group, - $prevread,$markondisp,$seehidden); - $discussion .= " -
- - - - - - - - -
- $lt{'cuse'}:  + + $lt{'cuse'}:  END if ($newpostsflag) { $discussion .= @@ -615,13 +582,7 @@ END } } $discussion .= <  - $lt{'chgt'}? -
+   $lt{'chgt'} 		'.&mt('Sorted by').': '.$sort_types{$sortposts}.'
'; + $discussion .= '		'.&mt('Sorted by').': '.$sort_types{$sortposts}.'
'; if (defined($env{'form.totposters'})) { $discussion .= &mt('Posts by').':'; if ($totposters > 0) { @@ -665,8 +626,9 @@ END if ($filterchoice) { $discussion .= ''.&mt('Filters').': '.$filterchoice; } - $discussion .= '
-

\n"; + $prevread,$markondisp); + $discussion .= "
\n"; } if ($outputtarget eq 'export') { if ($manifestok) { @@ -748,8 +708,8 @@ END } } if ((&discussion_open($status)) && ($outputtarget ne 'tex')) { - if (($group ne '') && ($mode eq 'board')) { - if ((&check_group_priv($group,'pgd') eq 'ok') && + 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, @@ -761,10 +721,10 @@ END 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); + $discussion.= + &postingform_display($mode,$ressymb,$now,$subject, + $comment,$outputtarget,$attachnum, + $currnewattach,$currdelold,'',$crstype); } else { $discussion.= ''. &mt('This discussion is closed.').''; @@ -781,21 +741,15 @@ END &Apache::lonnet::allowed('pch', $env{'request.course.id'}. ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) { - $discussion.= &send_feedback_link($ressymb,$target); + $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 .= ' '.&mt('(Posting and voting closed for [_1] roles)', - &Apache::lonnet::plaintext('st',$crstype)); - } else { - $discussion .= ' '.&mt('(Closed for [_1] roles)', - &Apache::lonnet::plaintext('st',$crstype)); - } + $discussion .= ' '.&mt('(Closed for [_1] roles)', + &Apache::lonnet::plaintext('st',$crstype)); } } - } else { + } else { $discussion.= ''.&mt('This discussion is closed.').''; } $discussion.= &send_message_link($ressymb).''; @@ -803,76 +757,49 @@ 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 = ''; - return $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 .= '&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,$target) = @_; - my $output = ''. - ' '. - ''.&mt('Post Discussion').''; - return $output; + my ($ressymb) = @_; + return ''. + &discussion_link($ressymb, + ''.&mt('Post Discussion').'', + 'replydisc'). + ''; } sub send_message_link { my ($ressymb) = @_; my $output = ''. - ' '.&mt('Send Feedback').''; + &discussion_link($ressymb, + ''.&mt('Send Feedback').'', + 'sendmessageonly'). + ''; return $output; } sub action_links_bar { - my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp, - $seehidden) = @_; - my $discussion = '
'. - ''. + my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp) = @_; + my $discussion = ''. + ''; } if ($discussoptions) { - $discussoptions='

' - .' '.&mt('Discussion Contributions').'

'.&Apache::lonhtmlcommon::coursepreflink(&mt('Discussion Settings'),'discussion').'

' - .$discussoptions; + $discussoptions=''. + ''; } - return $msgoptions.$discussoptions; + return &Apache::loncommon::start_data_table().$msgoptions.$discussoptions.&Apache::loncommon::end_data_table(); } sub resource_output { @@ -2944,8 +2841,8 @@ sub clear_out_html { #

#

'. + ''. ''; @@ -959,9 +888,9 @@ sub postingform_display { -
+$lt{'note'}
-$lt{'title'}: 

+$lt{'title'}: 
ENDDISCUSS if ($env{'form.origpage'}) { @@ -985,22 +914,22 @@ ENDDISCUSS } $postingform .= "\n"; $postingform .= &generate_attachments_button('',$attachnum,$ressymb, - $now,$currnewattach, - $currdelold,'',$mode, - $blockblog); + $now,$currnewattach, + $currdelold,'',$mode, + $blockblog); if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) { $newattachmsg = '
'.$lt{'newa'}.'
'; if (@{$currnewattach} > 1) { - $newattachmsg .= '
    '; - foreach my $item (@{$currnewattach}) { + $newattachmsg .= '
      '; + foreach my $item (@{$currnewattach}) { $item =~ m#.*/([^/]+)$#; $newattachmsg .= '
    1. '.$1.'
      2. '."\n"; - } - $newattachmsg .= '
    '."\n"; - } else { - $$currnewattach[0] =~ m#.*/([^/]+)$#; - $newattachmsg .= ''.$1.'
    '."\n"; - } + } + $newattachmsg .= '
'."\n"; + } else { + $$currnewattach[0] =~ m#.*/([^/]+)$#; + $newattachmsg .= ''.$1.'
'."\n"; + } } $postingform .= $newattachmsg; $postingform .= &generate_preview_button(); @@ -1008,7 +937,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,$seehidden,$canvote,$prevread,$sortposts,$ressymb,$target,$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,$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; @@ -1018,20 +947,14 @@ sub build_posting_display { 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); # And these are the likes/unlikes - my $thisuser=$env{'user.name'}.':'.$env{'user.domain'}; - if ($seeid || $canvote) { - %likes=&Apache::lonnet::dump('disclikes', + my %likes=&Apache::lonnet::dump('disclikes', $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'}, '^'.$symb.':'); + my $thisuser=$env{'user.name'}.':'.$env{'user.domain'}; # Array with likes to figure out averages, etc. - @theselikes=(); -# Hashes containing likes and unlikes for this user. - %userlikes=(); - %userunlikes=(); - } + my @theselikes=(); # 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'}:'')); @@ -1039,6 +962,7 @@ sub build_posting_display { 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'}; @@ -1052,6 +976,7 @@ sub build_posting_display { $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') { @@ -1063,59 +988,46 @@ sub build_posting_display { &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; - } - } - } - } + 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'})) { + push(@theselikes,$likes{$symb.':'.$idx.':likes'}); } -# 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); + } +# 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; - } + my $oneplus=$ave+$stddev; + my $twoplus=$ave+2.*$stddev; + my $oneminus=$ave-$stddev; + my $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; @@ -1144,7 +1056,7 @@ sub build_posting_display { } else { $$replies[$$depth[$idx]]=1; } - unless ((($hiddens{$idx}) && (!$seehidden)) || ($deletions{$idx})) { + unless ((($hiddens{$idx}) && (!$seeid)) || ($deletions{$idx})) { $$visible++; if ($contrib{$idx.':history'}) { if ($contrib{$idx.':history'} =~ /:/) { @@ -1159,7 +1071,7 @@ sub build_posting_display { my %subjects = (); my %attachtxt = (); my %allattachments = (); - my ($screenname,$plainname,$showaboutme); + my ($screenname,$plainname); 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. @@ -1169,7 +1081,7 @@ sub build_posting_display { $$anonhash{$key}=&mt('Anonymous').' '.$anoncnt; } my ($message,$subject,$vgrlink,$ctlink); - &get_post_contents(\%contrib,$idx,$seeid,$seehidden,$outputtarget,\%messages,\%subjects,\%allattachments,\%attachtxt,$imsfiles,\$screenname,\$plainname,\$showaboutme,$numoldver); + &get_post_contents(\%contrib,$idx,$seeid,$outputtarget,\%messages,\%subjects,\%allattachments,\%attachtxt,$imsfiles,\$screenname,\$plainname,$numoldver); # Set up for sorting by subject @@ -1199,18 +1111,12 @@ sub build_posting_display { } } 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=&Apache::loncommon::aboutmewrapper( + $plainname, + $contrib{$idx.':sendername'}, + $contrib{$idx.':senderdomain'}).' ('. + $contrib{$idx.':sendername'}.':'. + $contrib{$idx.':senderdomain'}.')'; $sender = ''.$sender.''; if ($contrib{$idx.':anonymous'}) { $sender.=' ['.$$anonhash{$key}.'] '. @@ -1249,41 +1155,32 @@ sub build_posting_display { @{$$namesort{$lastname}{$firstname}} = ("$idx"); } if ($outputtarget ne 'tex') { +# Add karma stars + my $karma=&userkarma($contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'}); + for (my $i=1;$i<=$karma;$i++) { + $sender.=''.&mt('Contributor Kudos').''; + } +# 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.=' '.&mt('Edit').''; - - unless ($seehidden) { + $sender.=' '. + &discussion_link($symb,&mt('Edit'),'editdisc',$idx,$$newpostsflag,$prevread,&group_args($group)); + unless ($seeid) { my $grpargs = &group_args($group); $sender.=" '; } } } - if ($seehidden) { + if ($seeid) { if ($hiddens{$idx}) { unless ($studenthidden) { - $sender.=' '.&mt('Make Visible').''; + $sender.=' '. + &discussion_link($symb,&mt('Make Visible'),'unhide',$idx,$$newpostsflag,$prevread,&group_args($group)); } } else { - $sender.=' '.&mt('Hide').''; + $sender.=' '. + &discussion_link($symb,&mt('Hide'),'hide',$idx,$$newpostsflag,$prevread,&group_args($group)); } my $grpargs = &group_args($group); $sender.= @@ -1291,7 +1188,7 @@ sub build_posting_display { $sender .= &mt('Delete').''; } } - } else { + } else { if ($screenname) { $sender=''.$screenname.''; } else { @@ -1318,33 +1215,24 @@ sub build_posting_display { } } if ($outputtarget ne 'tex') { - if (&discussion_open($status)) { + if (&discussion_open($status)) { if (($group ne '') && (&check_group_priv($group,'pgd') eq 'ok')) { - $sender.=' '.&mt('Reply').''; + $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.=' '.&mt('Reply').''; + $sender.=' '. + &discussion_link($symb,&mt('Reply'),'replydisc',$idx,$$newpostsflag,$prevread); } } - if ($viewgrades) { + if ($viewgrades) { $vgrlink=&Apache::loncommon::submlink(&mt('Submissions'), $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$ressymb); } - if ($$dischash{$readkey}=~/\.$idx\./) { + if ($$dischash{$readkey}=~/\.$idx\./) { $ctlink = ''; } else { $ctlink = ''; @@ -1387,15 +1275,14 @@ 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 - $uname = $contrib{$idx.':sendername'}; - $udom = $contrib{$idx.':senderdomain'}; + my $uname = $contrib{$idx.':sendername'}; + my $udom = $contrib{$idx.':senderdomain'}; my $poster = $uname.':'.$udom; if ($env{'form.totposters'} ne '') { if ($totposters == 0) { @@ -1446,90 +1333,58 @@ sub build_posting_display { unless ($$notshown{$idx} == 1) { if ($prevread > 0 && $prevread <= $posttime) { $$newitem{$idx} = 1; - $$discussionitems[$idx] .= ' -
'; my $escsymb=&escape($ressymb); if ($visible) { @@ -887,13 +814,15 @@ sub action_links_bar { $discussion .= '&previous='.$prevread; } $discussion .= &group_args($group); - $discussion .='">'.&mt('Chronological View').'   - '.&mt('Chronological View').'  '; + + my $otherviewurl='/adm/feedback?cmd=sortfilter&symb='.$escsymb.'&inhibitmenu=yes&modal=yes'; if ($newpostsflag) { - $discussion .= '&previous='.$prevread; + $otherviewurl .= '&previous='.$prevread; } - $discussion .= &group_args($group); - $discussion .='">'.&mt('Sorting/Filtering options').''.(' ' x2); + $otherviewurl .= &group_args($group); + $discussion .= &Apache::loncommon::modal_link($otherviewurl,&mt('Other Views ...'),800,340); + $discussion .= '
'; } $discussion .=''.&mt('Export').''; - if ($seehidden) { + if (&Apache::lonnet::allowed('rin',$env{'request.course.id'})) { $discussion .= '  '; $discussion .=''. - &mt('Preferences on what is marked as NEW'). + &mt('My general preferences on what is marked as NEW'). '
'.&mt('Mark NEW posts no longer new').'
- '; + $$discussionitems[$idx] .= ''.&mt('NEW').'  '; } else { $$newitem{$idx} = 0; - $$discussionitems[$idx] .= ' -
'.&mt('NEW').' 
- '; } - $$discussionitems[$idx] .= ''; + &Apache::lonlocal::locallocaltime($posttime).')'; if ($$dischash{$toggkey}) { - $$discussionitems[$idx].=''; + $$discussionitems[$idx].='  '.$ctlink; } - 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"; - } + my $thislikes=$likes{$symb.':'.$idx.':likes'}; + my $likesize="100"; + 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].= '
   '. - ''.$subject.'  '. + $$discussionitems[$idx] .= ''.$subject.'  '. $sender.' '.$vgrlink.' ('. - &Apache::lonlocal::locallocaltime($posttime).')  '. - $ctlink.'
'. + $$discussionitems[$idx].= '
'. "
". $message. '
'; - 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].= - ''. - ''.$novote.' '. - ''.$novote.''; - } else { - if ($userlikes{$idx}) { - $$discussionitems[$idx].=''.&mt('You like this posting').''; - } else { - $$discussionitems[$idx].=' '.&discussion_link($symb,''.&mt('Like').'','like',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Like this posting")); - } - if ($userunlikes{$idx}) { - $$discussionitems[$idx].=''.&mt('You unlike this posting').''; - } else { - $$discussionitems[$idx].=' '.&discussion_link($symb,''.&mt('Unlike').'','unlike',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Unlike this posting")); - } - } + unless ($likes{$symb.':'.$idx.':likers'}=~/\,\Q$thisuser\E\,/) { + $$discussionitems[$idx].=' '.&discussion_link($symb,''.&mt('Like').'','like',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Like this posting")); + } else { + $$discussionitems[$idx].=''.&mt('You like this posting').''; } - if ($seeid || $canvote) { - my $thislikes=$likes{$symb.':'.$idx.':likes'}; - if ($thislikes>0) { - $$discussionitems[$idx].=' ('.&mt("[_1] likes",$thislikes).')'; - } elsif ($thislikes<0) { - $$discussionitems[$idx].=' ('.&mt("[_1] unlikes",abs($thislikes)).')'; - } + unless ($likes{$symb.':'.$idx.':unlikers'}=~/\,\Q$thisuser\E\,/) { + $$discussionitems[$idx].=' '.&discussion_link($symb,''.&mt('Unlike').'',,'unlike',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Unlike this posting")); + } else { + $$discussionitems[$idx].=''.&mt('You unlike this posting').''; + } + my $thislikes=$likes{$symb.':'.$idx.':likes'}; + if ($thislikes>0) { + $$discussionitems[$idx].=' ('.&mt("[_1] likes",$thislikes).')'; + } elsif ($thislikes<0) { + $$discussionitems[$idx].=' ('.&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 ($seehidden) { - $$discussionitems[$idx] .= '  '.&mt('Display all versions').''; + $$discussionitems[$idx] .= '  '.&mt('This post has been edited by the author.'); + if ($seeid) { + $$discussionitems[$idx] .= '  '. + &discussion_link($symb,&mt('Display all versions'),'allversions',$idx,$$newpostsflag,$prevread,&group_args($group)); } $$discussionitems[$idx].='
'.&mt('Earlier version(s) were posted on: '); if ($contrib{$idx.':history'} =~ m/:/) { @@ -1542,12 +1397,19 @@ sub build_posting_display { $$discussionitems[$idx] .= ''.$version.'. - '.&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 { @@ -1606,13 +1468,13 @@ sub filter_regexp { sub get_post_contents { - my ($contrib,$idx,$seeid,$seehidden,$type,$messages,$subjects,$allattachments,$attachtxt,$imsfiles,$screenname,$plainname,$showaboutme,$numver) = @_; + my ($contrib,$idx,$seeid,$type,$messages,$subjects,$allattachments,$attachtxt,$imsfiles,$screenname,$plainname,$numver) = @_; my $discussion = ''; my $start=$numver; my $end=$numver + 1; %{$$imsfiles{$idx}}=(); if ($type eq 'allversions') { - unless($seehidden) { + unless($seeid) { $discussion=&mt('You do not have privileges to view all versions of posts.').' '.&mt('Please select a different role.'); return $discussion; } @@ -1624,20 +1486,13 @@ sub get_post_contents { $$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( + + my $sender=&Apache::loncommon::aboutmewrapper( $$plainname, $$contrib{$idx.':sendername'}, - $$contrib{$idx.':senderdomain'}); - } - if ($seeid) { - $sender .= ' ('.$$contrib{$idx.':sendername'}.':'. - $$contrib{$idx.':senderdomain'}.')'; - } + $$contrib{$idx.':senderdomain'}).' ('. + $$contrib{$idx.':sendername'}.':'. + $$contrib{$idx.':senderdomain'}.')'; my $attachmenturls = $$contrib{$idx.':attachmenturl'}; my @postversions = (); if ($type eq 'allversions' || $type eq 'export') { @@ -1753,11 +1608,16 @@ sub mail_screen { } my %lt = &Apache::lonlocal::texthash( - 'myqu' => 'My question/comment/feedback:', + '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 = ''; @@ -1822,7 +1682,6 @@ 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'}); @@ -1831,25 +1690,36 @@ END $numoldver = 1; } } - if ($idx > 0) { - my (%msgversions,%subversions,$htmldecode); - $htmldecode = 0; - if ($env{'form.replydisc'}) { - $htmldecode = 1; + if ($env{'form.replydisc'}) { + if ($contrib{$idx.':history'}) { + if ($contrib{$idx.':history'} =~ /:/) { + my @oldversions = split(/:/,$contrib{$idx.':history'}); + $numoldver = @oldversions; + } else { + $numoldver = 1; + } } - &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'}) { + if ($idx > 0) { + my %msgversions = (); + &get_post_versions(\%msgversions,$contrib{$idx.':message'},0,$numoldver); $quote = $msgversions{$numoldver}; - $subject = &HTML::Entities::encode(&mt('Re: ').$subject,'<>&"'); - } else { - $comment = $msgversions{$numoldver}; } - } - if ($env{'form.editdisc'}) { + 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); + $comment = $msgversions{$numoldver}; + my %subversions = (); + &get_post_versions(\%subversions,$contrib{$idx.':subject'},0,$numoldver); + $subject = $subversions{$numoldver}; + } if (defined($contrib{$idx.':replyto'})) { $parentmsg = $contrib{$idx.':replyto'}; } @@ -1882,7 +1752,7 @@ END $comment = &unescape($env{'form.comment'}); &process_attachments(\@currnewattach,\@currdelold,\@keepold); } - my $latexHelp=&Apache::loncommon::helpLatexCheatsheet(undef,undef,1); + 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.'); my $js= < '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, - {'add_entries' => \%onload, - 'bread_crumbs' => $brcrum,}); + &Apache::loncommon::start_page('Resource Feedback and Discussion',$js,\%parms); if ($quote ne '') { $quote = &HTML::Entities::decode($quote); @@ -1952,14 +1822,19 @@ END } $quote='
'.&Apache::lontexconvert::msgtexconverted($quote).'
'; } - + my $header=''; + unless ($env{'form.modal'}) { + $header="

$restitle

"; + } $r->print(<$restitle +

$lt{'myqu'}

+$header
$prevtag + END if ($env{'form.replydisc'}) { $r->print(<print(< +$options $quote -

$lt{'myqu'} +

$textareaheader

+

$latexHelp

-$lt{'title'}:

-

-

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()); + if ( ($env{'form.editdisc'}) || ($env{'form.replydisc'}) ) { if ($env{'form.origpage'}) { foreach my $attach (@currnewattach) { @@ -2407,7 +2290,7 @@ END $start_page $lt{'diso'}
$lt{'prca'} -

+
@@ -2472,7 +2355,8 @@ $start_page
$lt{'soor'}

-
+ + @@ -2498,11 +2382,24 @@ 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); - my $seehidden = &can_see_hidden('',$ressymb,$feedurl,$group,$cdom,$cnum); + 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 %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'}, $cdom,$cnum); my %namesort = (); @@ -2518,7 +2415,7 @@ sub print_showposters { for (my $idx=1;$idx<=$contrib{'version'};$idx++) { my $hidden=($contrib{'hidden'}=~/\.$idx\./); my $deleted=($contrib{'deleted'}=~/\.$idx\./); - unless ((($hidden) && (!$seehidden)) || ($deleted)) { + unless ((($hidden) && (!$seeid)) || ($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'}; @@ -2584,6 +2481,7 @@ END $r->print(< + @@ -2769,16 +2667,14 @@ sub redirect_back { } &Apache::lonenc::check_encrypt(\$feedurl); my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif'); - my %onload; - if ($env{'environment.remote'} ne 'off') { - $onload{'onload'} = - "if (window.name!='loncapaclient') { this.document.reldt.submit(); self.window.close(); }"; + my %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, - {'redirect' => [0,$feedurl], - 'only_body' => 1, - 'add_entries' => \%onload}); + &Apache::loncommon::start_page('Feedback sent',undef,\%parms); my $end_page = &Apache::loncommon::end_page(); $r->print(< 1, 'bgcolor' => '#FFFFFF', @@ -2859,8 +2751,8 @@ sub screen_header { unless (($env{'form.replydisc'}) || ($env{'form.editdisc'})) { if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/) && ($env{'user.adv'})) { $msgoptions= - '

'; + '
'; } my %optionhash=(); foreach my $type ('question','comment','policy') { @@ -2868,31 +2760,36 @@ sub screen_header { } if (&feedback_available(1)) { $msgoptions.= - '

'; + '
'; } if (&feedback_available(0,1)) { $msgoptions.= - '

'; + '
'; } if (&feedback_available(0,0,1)) { $msgoptions.= - '

'; + '
'; } } 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); + my $realsymb = $symb; + if ($symb=~/^bulletin___/) { + my $filename=(&Apache::lonnet::decode_symb($symb))[2]; + $filename=~s|^adm/wrapper/||; + $realsymb=&Apache::lonnet::symbread($filename); + } if (!$blocked && &discussion_open(undef,$realsymb) && (&Apache::lonnet::allowed('pch', - $env{'request.course.id'}. - ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')) || + $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='
' + .'
'.&mt('Send Feedback').'
'.&Apache::lonhtmlcommon::coursepreflink(&mt('Feedback Settings'),'feedback').'		'.$msgoptions.'
' + .'
'.&mt('Discussion Contributions').'
'.&Apache::lonhtmlcommon::coursepreflink(&mt('Discussion Settings'),'discussion').'		'.$discussoptions.'
%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, PRE=>1, DIV=>1, IMG=>1, - M=>1, CHEM=>1, ALGEBRA=>1, SUB=>1, SUP=>1, SPAN=>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); } @@ -3016,21 +2913,57 @@ sub send_msg { } } - - 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.='
'.&mt('Not registered').'
'; - } +# 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.='
'.&mt('Not registered').'
'; + } + } } - 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 { @@ -3051,20 +2984,25 @@ sub storefeedbacklikes { return &Apache::lonnet::cstore(\%newrecord,'_feedback',$course,$udom,$uname); } + sub adddiscuss { my ($symb,$email,$anon,$attachmenturl,$subject,$group)=@_; my $status=''; - my $realsymb = &get_realsymb($symb); + my $realsymb; + if ($symb=~/^bulletin___/) { + my $filename=(&Apache::lonnet::decode_symb($symb))[2]; + $filename=~s|^adm/wrapper/||; + $realsymb=&Apache::lonnet::symbread($filename); + } my ($cnum,$cdom); if ($env{'request.course.id'}) { $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; } - my $realsymb; if (&discussion_open(undef,$realsymb) && - (&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') && + (&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, @@ -3161,6 +3099,7 @@ sub adddiscuss { return $status.'
'; } + # Routine to get the complete discussion records sub getdiscussionrecords { @@ -3176,13 +3115,12 @@ sub getdiscussionrecords { sub getdiscussionstats { my %record=&getdiscussionrecords(@_); - my $totalvotes = $record{'totallikes'} + $record{'totalunlikes'}; - return ($record{'subnumber'},$record{'points'},$record{'totallikes'},$totalvotes); + return ($record{'subnumber'},$record{'points'},$record{'totallikes'},$record{'totalvotes'}); } # Calculate discussion karma -sub calcdiscussionkarma { +sub calcdiscussionkarma { my ($subs,$pts,$likes,$votes)=&getdiscussionstats(@_); my $karma=0; if ($votes>0) { @@ -3241,20 +3179,23 @@ sub storediscussionpoints { # Store discussion "likes" sub storediscussionlikes { - my ($chglikes,$chgunlikes,$uname,$udom,$course,$context)=@_; + 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=&getdiscussionrecords($uname,$udom,$course); my $totallikes=$record{'totallikes'}; - my $totalunlikes=$record{'totalunlikes'}; - $totallikes += $chglikes; - $totalunlikes += $chgunlikes; + my $totalvotes=$record{'totalvotes'}; + $totallikes+=$likes; + $totalvotes++; my %newrecord=('likes_user' => $env{'user.name'}, 'likes_domain' => $env{'user.domain'}, - 'totallikes' => $totallikes, - 'totalunlikes' => $totalunlikes, - 'context' => $context); + 'likes' => $likes, + 'totallikes' => $totallikes, + 'totalvotes' => $totalvotes); my $status=&Apache::lonnet::cstore(\%newrecord,'_discussion',$course,$udom,$uname); if ($status eq 'ok') { &updatekarma($uname,$udom,$course); @@ -3407,11 +3348,11 @@ sub modify_attachments { my %lt = &Apache::lonlocal::texthash( 'subj' => 'Subject', - 'thfo' => 'The following attachments were part of the most recent saved version of this posting.', '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.', + 'adda' => 'Add a new attachment to this post', 'stch' => 'Save Changes', + 'clic' => 'Add/remove attachments', ); my $js = < @@ -3425,9 +3366,11 @@ 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, - {'bread_crumbs' => $brcrum,}); + &Apache::loncommon::start_page('Discussion Post Attachments',$js,\%parms); my $orig_subject = &unescape($env{'form.subject'}); my $subject=&clear_out_html($orig_subject); @@ -3452,44 +3395,43 @@ $start_page $toolarge

-
- - - - - - - - -
- Subject: $subject

+

$lt{'clic'}

END - if ($idx) { - if ($attachmenturls) { - my @currold = keys(%currattach); - if (@currold > 0) { - $r->print($lt{'thfo'}.'
'.$lt{'chth'}.'
'."\n"); - foreach my $id (@currold) { - my $attachurl = &HTML::Entities::decode($attachments{$id}{'filename'}); - $attachurl =~ m#/([^/]+)$#; - $r->print('
'."\n"); + $r->print(&Apache::lonhtmlcommon::start_pick_box()); + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Subject'))); + $r->print(''.$subject.''); + $r->print(&Apache::lonhtmlcommon::row_closure()); + $r->print(&Apache::lonhtmlcommon::row_title($lt{'adda'})); + $r->print(' '.$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'}.'
'.$lt{'chth'}.'
'."\n"); + foreach my $id (@currold) { + my $attachurl = &HTML::Entities::decode($attachments{$id}{'filename'}); + $attachurl =~ m#/([^/]+)$#; + $r->print('
'."\n"); + } + $r->print("
"); } - $r->print("
"); } } - } - if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) { - $r->print($lt{'thef'}.'
'.$lt{'chth'}.'
'."\n"); - foreach my $attach (@{$currnewattach}) { - $attach =~ m#/([^/]+)$#; - $r->print('
'."\n"); + if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) { + $r->print($lt{'chth'}.'
'."\n"); + foreach my $attach (@{$currnewattach}) { + $attach =~ m#/([^/]+)$#; + $r->print('
'."\n"); + } } - $r->print("
"); } + $r->print(&Apache::lonhtmlcommon::row_closure(1)); + $r->print(&Apache::lonhtmlcommon::end_pick_box()); $r->print(<
- $lt{'adda'} -
$attachmaxtext
@@ -3547,12 +3489,12 @@ sub generate_attachments_button { my $origpage = $ENV{'REQUEST_URI'}; my $att=$attachnum.' '.&mt("attachments"); my %lt = &Apache::lonlocal::texthash( - 'clic' => 'Click to add/remove attachments', + 'clic' => 'Add/remove attachments', ); my $response = (< -$lt{'clic'}: ', - '0','0','','',$env{'form.previous'},'','','','', - undef,undef,$group,); + 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'},$env{'form.group'}))) { + &redirect_back($r,$feedurl,&mt('Deletion not permitted').'
', '0','0','','',$env{'form.previous'},'','','','', + undef,undef,$group,); return OK; } my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'}, - $cdom,$cnum); + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}); my $currenthidden=$contrib{'hidden'}; my $currentstudenthidden=$contrib{'studenthidden'}; if ($env{'form.hide'}) { $currenthidden.='.'.$idx.'.'; - unless ($seehidden) { + unless ($seeid) { $currentstudenthidden.='.'.$idx.'.'; } } else { $currenthidden=~s/\.$idx\.//g; } my %newhash=('hidden' => $currenthidden); - if ( ($env{'form.hide'}) && (!$seehidden) ) { + if ( ($env{'form.hide'}) && (!$seeid) ) { $newhash{'studenthidden'} = $currentstudenthidden; } if ($env{'form.hide'}) { @@ -4039,46 +3993,16 @@ ENDREDIR ($changelast,$newlast) = &get_discussion_info($idx,%contrib); if ($changelast) { &Apache::lonnet::put('discussiontimes',{$symb => $newlast}, - $cdom,$cnum); + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}); } } - 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); + &Apache::lonnet::store(\%newhash,$symb,$env{'request.course.id'}, + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}); - } - $result = &mt('Changed discussion status'); - } else { - $result = &mt('Discussion status unchanged'); - } - &redirect_back($r,$feedurl,$result.'
','0','0','','', - $env{'form.previous'},undef,undef,undef, + &redirect_back($r,$feedurl,&mt('Changed discussion status').'
', + '0','0','','',$env{'form.previous'},undef,undef,undef, undef,undef,undef,$group); return OK; } elsif (($env{'form.like'}) || ($env{'form.unlike'})) { @@ -4086,145 +4010,71 @@ ENDREDIR 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; - } - } + my $prefix=$symb.':'.$idx.':'; + my %contrib=&Apache::lonnet::dump('disclikes', + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}, + '^'.$prefix); +# Get all who like or unlike this + my $currentlikers=$contrib{$prefix.'likers'}; + my $currentunlikers=$contrib{$prefix.'unlikers'}; # Get the current "likes" count - my $likescount=$likes{$prefix.'likes'}; + my $likes=$contrib{$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--; - } - } +# Users cannot like a post twice, or unlike it twice. They can change their mind, though + my $alreadyflag=0; + my $thisuser=$env{'user.name'}.':'.$env{'user.domain'}; + if ($env{'form.like'}) { + if ($currentlikers=~/\,\Q$thisuser\E\,/) { + $alreadyflag=1; + } else { + if ($currentunlikers=~/\,\Q$thisuser\E\,/) { + $currentunlikers=~s/\,\Q$thisuser\E\,//g; + } else { + $currentlikers.=','.$thisuser.','; + } + $likes++; + } + } else { + if ($currentunlikers=~/\,\Q$thisuser\E\,/) { + $alreadyflag=1; + } else { + if ($currentlikers=~/\,\Q$thisuser\E\,/) { + $currentlikers=~s/\,\Q$thisuser\E\,//g; + } else { + $currentunlikers.=','.$thisuser.','; + } + $likes--; + } + } + my $result; # $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'}); + unless ($alreadyflag) { + my %newhash=($prefix.'likes' => $likes, + $prefix.'likers' => $currentlikers, + $prefix.'unlikers' => $currentunlikers); # Store data in db-file "disclikes" - if (&Apache::lonnet::put('disclikes',\%newhash,$cdom,$cnum) eq 'ok') { + if (&Apache::lonnet::put('disclikes', + \%newhash, + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}) 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"); - } - } + if ($env{'form.like'}) { + &storediscussionlikes(1,$contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'}); + $result=&mt("Registered 'Like'"); + } else { + &storediscussionlikes(-1,$contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'}); + $result=&mt("Registered 'Unlike'"); } } else { - $result=&mt('Voting unavailable for this discussion'); +# Oops, something went wrong + $result=&mt("Failed to register vote"); } - } else { - $result=&mt('Invalid post number'); } &redirect_back($r,$feedurl,$result.'
', '0','0','','',$env{'form.previous'},undef,undef,undef, @@ -4247,50 +4097,20 @@ 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').'
', - '0','0','','',$env{'form.previous'},'','','','', - undef,undef,$group); - return OK; - } my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'}, - $cdom,$cnum); + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}); my ($changelast,$newlast) = &get_discussion_info($idx,%contrib); if ($changelast) { &Apache::lonnet::put('discussiontimes',{$symb => $newlast}, - $cdom,$cnum); + $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'}); } my %newhash=('deleted' => $contrib{'deleted'}.".$idx."); - - 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.'
','0','0','','', - $env{'form.previous'},undef,undef,undef, + &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').'
', + '0','0','','',$env{'form.previous'},undef,undef,undef, undef,undef,undef,$group); return OK; } elsif ($env{'form.preview'}) { @@ -4318,7 +4138,8 @@ ENDREDIR my $idx = $env{'form.idx'}; if ($idx) { my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'}, - $cdom,$cnum); + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}); $attachmenturls = $contrib{$idx.':attachmenturl'}; } &modify_attachments($r,\@currnewattach,\@currdelold,$symb,$idx, @@ -4331,7 +4152,7 @@ ENDREDIR my $mode='board'; my $status='OPEN'; my $previous=$env{'form.previous'}; - if ($feedurl =~ /\.(problem|exam|quiz|assess|survey|form|library|task)$/) { + if ($feedurl =~ /$LONCAPA::assess_re/) { $mode='problem'; $status=$Apache::inputtags::status[-1]; } @@ -4342,52 +4163,21 @@ ENDREDIR &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("
".&mt("Return and reload").""); + 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("
".&mt("Return and reload").""); } $r->print(&Apache::loncommon::end_page()); return OK; @@ -4405,7 +4195,9 @@ ENDREDIR } elsif ($env{'form.editdisc'}) { $symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0]; } elsif ($env{'form.origpage'}) { - $symb=""; + $symb=""; + } elsif ($env{'form.sendmessageonly'}) { + $symb=(split(/\:\:\:/,$env{'form.sendmessageonly'}))[0]; } else { $symb=&Apache::lonnet::symbread($feedurl); } @@ -4420,7 +4212,7 @@ ENDREDIR &dewrapper(\$feedurl); } my $goahead=1; - if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form|task)$/) { + if ($feedurl=~/$LONCAPA::assess_re/) { unless ($symb) { $goahead=0; } } if (!$goahead) { @@ -4519,7 +4311,6 @@ ENDREDIR $override = 1; } my $message=&clear_out_html($env{'form.comment'},$override); - # Assemble email my ($email,$citations)=&assemble_email($message,$prevattempts, @@ -4585,7 +4376,6 @@ sub wrap_symb { } return $ressymb; } - sub dewrapper { my ($feedurl)=@_; if ($$feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) { @@ -4739,16 +4529,8 @@ None =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()