--- loncom/interface/lonfeedback.pm 2023/09/15 23:02:08 1.370.2.7 +++ loncom/interface/lonfeedback.pm 2017/12/18 22:36:52 1.377 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.370.2.7 2023/09/15 23:02:08 raeburn Exp $ +# $Id: lonfeedback.pm,v 1.377 2017/12/18 22:36:52 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -674,7 +674,7 @@ END $newpostsflag,$group, $prevread,$markondisp,$seehidden); $discussion .= "\n"; - } + } if ($outputtarget eq 'export') { if ($manifestok) { while ($currdepth > 0) { @@ -960,9 +960,14 @@ sub postingform_display { } } } + my $postanon; + if (&Apache::lonnet::allowed('pac',$env{'request.course.id'}. + ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) { + $postanon = ''; + } $postingform .= (< - +$postanon @@ -1776,11 +1781,14 @@ sub mail_screen { my %lt = &Apache::lonlocal::texthash( 'myqu' => 'Question/comment/feedback:', + 'title' => 'Title', 'reta' => 'Retained attachments', 'atta' => 'Attachment', ); - if ($env{'form.editdisc'} || $env{'form.replydisc'}){ - $lt{'myqu'} = &mt('Post Discussion'); + if($env{'form.editdisc'} || $env{'form.replydisc'}){ + %lt = &Apache::lonlocal::texthash( + 'myqu' => 'Post Discussion', + ); } my $restitle = &get_resource_title($caller_symb,$feedurl); my $quote=''; @@ -2055,8 +2063,8 @@ END } else { $r->print(< -$lt{'atta'} $attachmaxtext: - +$lt{'atta'} $attachmaxtext: +

END } @@ -2067,7 +2075,7 @@ END $r->print(''); } $r->print(< +

END @@ -2703,46 +2711,29 @@ sub get_post_attachments { $$attachments{'0'}{'filename'} = $attachmenturls; $$attachments{'0'}{'0'} = 'n'; } + return; } sub fail_redirect { - my ($r,$feedurl,$delay) = @_; + my ($r,$feedurl) = @_; if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' }; my %lt = &Apache::lonlocal::texthash( 'sorr' => 'Sorry, no recipients ...', ); my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif'); - my %parms=('only_body' => 1); - if ($delay !~ /^\d+(|\.\d+)$/) { - $delay = 2; - } - if ($env{'form.modal'}) { - my $onload = 'document.forms.reldt.submit()'; - if ($delay) { - my $js_delay = int(1000 * $delay); - $onload = "setTimeout(function(){ - document.forms.reldt.submit(); - },$js_delay);"; - } - $parms{'add_entries'}={'onload' => $onload}; - } else { - $parms{'redirect'}=[$delay,$feedurl]; - } - $r->print(&Apache::loncommon::start_page('Feedback not sent',undef,\%parms)); - my $windowname = 'loncapaclient'; + $r->print(&Apache::loncommon::start_page('Feedback not sent',undef, + {'redirect' => [2,$feedurl], + 'only_body' => 1,})); $r->print(<

$lt{'sorr'}

-
-
ENDFAILREDIR $r->print(&Apache::loncommon::end_page()); } sub redirect_back { - my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$blog,$status,$previous,$sort, - $rolefilter,$statusfilter,$sectionpick,$grouppick,$numpicks,$group,$toolarge,$delay) = @_; + my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$blog,$status,$previous,$sort,$rolefilter,$statusfilter,$sectionpick,$grouppick,$numpicks,$group,$toolarge) = @_; my $sorttag = ''; my $roletag = ''; my $statustag = ''; @@ -2841,20 +2832,10 @@ sub redirect_back { &Apache::lonenc::check_encrypt(\$feedurl); my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif'); my %parms=('only_body' => 1); - if ($delay !~ /^\d+(|\.\d+)$/) { - $delay = 0; - } if ($env{'form.modal'}) { - my $onload = 'document.forms.reldt.submit()'; - if ($delay) { - my $js_delay = int(1000 * $delay); - $onload = "setTimeout(function(){ - document.forms.reldt.submit(); - },$js_delay);"; - } - $parms{'add_entries'}={'onload' => $onload}; + $parms{'add_entries'}={'onLoad' => 'document.forms.reldt.submit()'}; } else { - $parms{'redirect'}=[$delay,$feedurl]; + $parms{'redirect'}=[0,$feedurl]; } my $start_page= &Apache::loncommon::start_page('Feedback sent',undef,\%parms); @@ -2882,59 +2863,39 @@ ENDREDIR } sub no_redirect_back { - my ($r,$feedurl,$delay) = @_; + my ($r,$feedurl) = @_; my $nofeed=&mt('Sorry, no feedback possible on this resource ...'); - my $form_for_modal; - my %parms=('only_body' => 1, - 'bgcolor' => '#FFFFFF',); - if ($delay !~ /^\d+(|\.\d+)$/) { - $delay = 0; - } - if ($env{'form.modal'}) { - if (($feedurl !~ m{^/adm/feedback}) && ($feedurl ne '')) { - my $onload = 'document.forms.reldt.submit()'; - if ($delay) { - my $js_delay = int(1000 * $delay); - $onload = "setTimeout(function(){ - document.forms.reldt.submit(); - },$js_delay);"; - } - $parms{'add_entries'}={'onload' => $onload}; - my $windowname = 'loncapaclient'; - $form_for_modal = < - -ENDFORM - } - } else { - if (($feedurl !~ m{^/adm/feedback}) && ($feedurl ne '')) { - $parms{'redirect'}=[$delay,$feedurl]; - } + + my %onload; + + my %body_options = ('only_body' => 1, + 'bgcolor' => '#FFFFFF', + 'add_entries' => \%onload,); + + if ($feedurl !~ m{^/adm/feedback}) { + $body_options{'redirect'} = [2,$feedurl]; } my $start_page= &Apache::loncommon::start_page('Feedback not sent',undef, - \%parms); - + \%body_options); + my $end_page = &Apache::loncommon::end_page(); + &Apache::lonenc::check_encrypt(\$feedurl); my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif'); $r->print (< $nofeed
-$form_for_modal $end_page ENDNOREDIRTWO } sub screen_header { my ($feedurl,$symb,$group) = @_; - my %default = &Apache::lonlocal::texthash ( - question => 'Question about resource content', - comment => 'Question/Comment/Feedback about course content', - policy => 'Question/Comment/Feedback about course policy', - ); + my $crscontent = &mt('Question/Comment/Feedback about course content'); + my $crspolicy = &mt('Question/Comment/Feedback about course policy'); my $contribdisc = &mt('Contribution to course discussion of resource'); my $anoncontrib = &mt('Anonymous contribution to course discussion of resource'); my $namevis = &mt('name only visible to course faculty'); @@ -2942,8 +2903,8 @@ sub screen_header { if ($env{'request.course.id'}) { $crstype = &Apache::loncommon::course_type(); if ($crstype eq 'Community') { - $default{'comment'} = &mt('Question/Comment/Feedback about community content'); - $default{'policy'} = &mt('Question/Comment/Feedback about community policy'); + $crscontent = &mt('Question/Comment/Feedback about community content'); + $crspolicy = &mt('Question/Comment/Feedback about community policy'); $contribdisc = &mt('Contribution to community discussion of resource'); $anoncontrib = &mt('Anonymous contribution to community discussion of resource'); $namevis = &mt('name only visible to community facilitators'); @@ -2951,76 +2912,58 @@ sub screen_header { } my $msgoptions=''; my $discussoptions=''; - my $checkradio = ''; - my $blockblog; - my (%fdbkoptions,%discoptions); unless (($env{'form.replydisc'}) || ($env{'form.editdisc'})) { - if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/) && ($env{'user.adv'})) { - $fdbkoptions{'author'} = 1; - } - if (&feedback_available(1)) { - $fdbkoptions{'question'} = 1; - } - if (&feedback_available(0,1)) { - $fdbkoptions{'course'} = 1; - } - if (&feedback_available(0,0,1)) { - $fdbkoptions{'policy'} = 1; - } + if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/) && ($env{'user.adv'})) { + $msgoptions= + '
'; + } + my %optionhash=(); + foreach my $type ('question','comment','policy') { + $optionhash{$type}=$env{'course.'.$env{'request.course.id'}.'.'.$type.'.email.text'}; + } + 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); - if (!$blocked && &discussion_open(undef,$realsymb) && - (&Apache::lonnet::allowed('pch', - $env{'request.course.id'}. - ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')) || + if (!$blocked && &discussion_open(undef,$realsymb) && + (&Apache::lonnet::allowed('pch', + $env{'request.course.id'}. + ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')) || (($group ne '') && ($symb =~ m{^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$}) && (&check_group_priv($group,'pgd') eq 'ok')))) { - $discoptions{'nonanon'} = 1; - $discoptions{'anon'} = 1; - $blockblog = &Apache::loncommon::blocking_status('blogs'); - } - } - my $total = scalar(keys(%fdbkoptions)) + scalar(keys(%discoptions)); - return if (!$total); - if ($total == 1) { - $checkradio = ' checked="checked"'; - } - if (keys(%fdbkoptions)) { - if ($fdbkoptions{'author'}) { - $msgoptions = - '
'; - } - foreach my $item ('question','comment','policy') { - my $type = $item; - if ($item eq 'comment') { - $type = 'course'; - } - my $optionhash=$env{'course.'.$env{'request.course.id'}.'.'.$item.'.email.text'}; - if ($fdbkoptions{$type}) { - $msgoptions .= - '
'; - } - } - } - if (keys(%discoptions)) { - if ($discoptions{'nonanon'}) { $discussoptions=''; - } - if ($discoptions{'anon'}) { - $discussoptions .= '
'. - ''.&mt('Change Screenname').''; - } - if (!$blockblog) { - $discussoptions.= &add_blog_checkbox($crstype); + ''; + if (&Apache::lonnet::allowed('pac',$env{'request.course.id'}. + ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) { + $discussoptions .= '
'. + ''.&mt('Change Screenname').''; + } + my $blockblog = &Apache::loncommon::blocking_status('blogs'); + if (!$blockblog) { + $discussoptions.= &add_blog_checkbox($crstype); + } } } if ($msgoptions) { @@ -3108,17 +3051,9 @@ sub feedback_available { } sub send_msg { - my ($title,$feedurl,$email,$citations,$attachmenturl,$symb,$clientip,%to)=@_; + my ($title,$feedurl,$email,$citations,$attachmenturl,$symb,%to)=@_; my $status=''; my $sendsomething=0; - my $delay; - my $senthide; - my %setters; - my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) = - &Apache::loncommon::blockcheck(\%setters,'com',$clientip); - if ($by_ip) { - $senthide = 1; - } my $restitle = &get_resource_title($symb,$feedurl); if ($title=~/^Error/) { $title=&mt('Feedback').': '.$title; } unless ($title=~/\w/) { $title=&mt('Feedback'); } @@ -3132,8 +3067,7 @@ sub send_msg { } else { unless (&Apache::lonmsg::user_normal_msg($user,$domain, $title.' ['.$restitle.']',$email,$citations,$feedurl, - $attachmenturl,undef,undef,$symb,$restitle,undef, - undef,undef,undef,$senthide)=~/ok/) { + $attachmenturl,undef,undef,$symb,$restitle)=~/ok/) { $status.='
'.&mt('Error sending message to').' '.$key.'
'; } else { $sendsomething++; @@ -3141,24 +3075,6 @@ sub send_msg { } } } - if ($sendsomething && $senthide) { - if ($by_ip) { - my $showdom = &Apache::lonnet::domain($blockdom); - if ($showdom eq '') { - $showdom = $blockdom; - } - $delay = 4; - $status.='
'.&mt("Message content of feedback you send to instructor(s) from your current IP address: [_1] will be unavailable in your 'Sent' folder.",$clientip). - '
  • '. - &mt('This does not affect delivery of feedback to your instructor(s).'). - '
  • '. - &mt('Note: some types of communication functionality are blocked for certain IP address(es).'). - '
  • '. - &mt('This restriction was set by an administrator in the [_1] LON-CAPA domain.', - $showdom). - '

'; - } - } # Records of number of feedback messages are kept under the "symb" called "_feedback" # There are two entries within the framework of a course: @@ -3176,7 +3092,7 @@ sub send_msg { } } } - return ($status,$sendsomething,$delay); + return ($status,$sendsomething); } # Routine to get the complete feedback records @@ -3266,7 +3182,7 @@ sub adddiscuss { if (($symb) && ($email)) { my $now = time; if ($env{'form.editdisc'}) { - $contrib{'ip'}=&Apache::lonnet::get_requestor_ip(); + $contrib{'ip'}=$ENV{'REMOTE_ADDR'}; $contrib{'host'}=$Apache::lonnet::perlvar{'lonHostID'}; $contrib{'timestamp'} = $now; $contrib{'history'} = ''; @@ -3600,7 +3516,7 @@ sub modify_attachments { document.modattachments.action = document.modattachments.origpage.value; document.modattachments.submit(); } - + END @@ -3643,8 +3559,8 @@ END $r->print(''.$subject.''); $r->print(&Apache::lonhtmlcommon::row_closure()); $r->print(&Apache::lonhtmlcommon::row_title($lt{'adda'})); - $r->print('' - .'' + $r->print('' + .'' .' '.$attachmaxtext); if(($idx)||(ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)){ @@ -3987,9 +3903,8 @@ sub handler { my $symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0]; my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb); my $feedurl=&Apache::lonnet::clutter($url); - &redirect_back($r,$feedurl,&mt('Editing not permitted').'
', - '0','0','','',$env{'form.previous'},undef,undef,undef, - undef,undef,undef,$group); + &redirect_back($r,$feedurl,&mt('Editing not permitted').'
', '0','0','','',$env{'form.previous'},undef,undef,undef, + undef,undef,undef,$group); return OK; } } @@ -4196,7 +4111,7 @@ ENDREDIR unless (($seehidden) || (&editing_allowed($env{'form.hide'},$group))) { &redirect_back($r,$feedurl,&mt('Hiding not permitted').'
', '0','0','','',$env{'form.previous'},'','','','', - undef,undef,$group); + undef,undef,$group,); return OK; } @@ -4628,12 +4543,6 @@ ENDREDIR $r->internal_redirect('/adm/ambiguous'); return OK; } - if ($feedurl eq '') { - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - &no_redirect_back($r); - return OK; - } # Go ahead with feedback, no ambiguous reference unless ( ( @@ -4648,7 +4557,7 @@ ENDREDIR $r->send_http_header; # Unable to give feedback &Apache::lonenc::check_encrypt(\$feedurl); - &no_redirect_back($r,$feedurl,2); + &no_redirect_back($r,$feedurl); return OK; } # --------------------------------------------------- Print login screen header @@ -4668,7 +4577,7 @@ ENDREDIR if ($options) { &mail_screen($r,$feedurl,$options,$symb,$attachmax{'text'}); } else { - &fail_redirect($r,$feedurl,2); + &fail_redirect($r,$feedurl); } return OK; } @@ -4687,7 +4596,7 @@ ENDREDIR my $usersymb = &Apache::lonenc::check_encrypt($symb); my $useranswer= &Apache::loncommon::get_student_answers( - $symb,$env{'user.name'},$env{'user.domain'}, + $usersymb,$env{'user.name'},$env{'user.domain'}, $env{'request.course.id'}); &Apache::lonnet::delenv('allowed.vgr'); # Get attachments, if any, and not too large @@ -4734,10 +4643,9 @@ ENDREDIR my ($typestyle,%to) = &Apache::lonmsg::decide_receiver($feedurl); # Actually send mail - my $clientip = &Apache::lonnet::get_requestor_ip($r); - my ($status,$numsent,$delay)=&send_msg(&clear_out_html($env{'form.subject'}), - $feedurl,$email,$citations, - $attachmenturl,$usersymb,$clientip,%to); + my ($status,$numsent)=&send_msg(&clear_out_html($env{'form.subject'}), + $feedurl,$email,$citations, + $attachmenturl,$usersymb,%to); # Discussion? Store that. my $numpost=0; @@ -4745,7 +4653,11 @@ ENDREDIR && $env{'form.discuss'} !~ /^(?:author|question|course|policy)/) || $env{'form.anondiscuss'} ne '') { my $subject = &clear_out_html($env{'form.subject'}); - my $anonmode=($env{'form.discuss'} eq 'anon' || $env{'form.anondiscuss'} ); + my $anonmode; + if (&Apache::lonnet::allowed('pac',$env{'request.course.id'}. + ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) { + $anonmode=($env{'form.discuss'} eq 'anon' || $env{'form.anondiscuss'} ); + } $typestyle.=&adddiscuss($symb,$message,$anonmode,$attachmenturl, $subject,$group); $numpost++; @@ -4768,8 +4680,7 @@ ENDREDIR } # Receipt screen and redirect back to where came from - &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$blog,$status,$env{'form.previous'}, - undef,undef,undef,undef,undef,undef,$group,$toolarge,$delay); + &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$blog,$status,$env{'form.previous'},undef,undef,undef,undef,undef,undef,$group,$toolarge); } return OK; }