--- loncom/interface/lonfeedback.pm 2022/01/18 16:55:30 1.388 +++ loncom/interface/lonfeedback.pm 2023/09/15 23:00:16 1.393 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.388 2022/01/18 16:55:30 raeburn Exp $ +# $Id: lonfeedback.pm,v 1.393 2023/09/15 23:00:16 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1312,9 +1312,8 @@ sub build_posting_display { @{$$usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}}} = ("$idx"); } # Set up for sorting by last name, then first name - my %names = &Apache::lonnet::get('environment', - ['firstname','lastname'],$contrib{$idx.':senderdomain'}, - ,$contrib{$idx.':sendername'}); + my %names = &Apache::loncommon::getnames($contrib{$idx.':sendername'}, + $contrib{$idx.':senderdomain'}); my $lastname = $names{'lastname'}; my $firstname = $names{'firstname'}; if ($lastname eq '') { @@ -1694,9 +1693,8 @@ 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'); + $$showaboutme = &Apache::loncommon::aboutme_on($$contrib{$idx.':sendername'}, + $$contrib{$idx.':senderdomain'}); my $sender = $$plainname; if ($$showaboutme) { $sender = &Apache::loncommon::aboutmewrapper( @@ -2763,7 +2761,7 @@ sub fail_redirect { my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif'); my %parms=('only_body' => 1); if ($delay !~ /^\d+(|\.\d+)$/) { - $delay = 0; + $delay = 2; } if ($env{'form.modal'}) { my $onload = 'document.forms.reldt.submit()'; @@ -2793,7 +2791,7 @@ ENDFAILREDIR sub redirect_back { my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$blog,$status,$previous,$sort, - $rolefilter,$statusfilter,$sectionpick,$grouppick,$numpicks,$group,$toolarge) = @_; + $rolefilter,$statusfilter,$sectionpick,$grouppick,$numpicks,$group,$toolarge,$delay) = @_; my $sorttag = ''; my $roletag = ''; my $statustag = ''; @@ -2892,11 +2890,20 @@ 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}; } else { - $parms{'redirect'}=[0,$feedurl]; + $parms{'redirect'}=[$delay,$feedurl]; } my $start_page= &Apache::loncommon::start_page('Feedback sent',undef,\%parms); @@ -3161,9 +3168,17 @@ sub feedback_available { } sub send_msg { - my ($title,$feedurl,$email,$citations,$attachmenturl,$symb,%to)=@_; + my ($title,$feedurl,$email,$citations,$attachmenturl,$symb,$clientip,%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'); } @@ -3177,7 +3192,8 @@ sub send_msg { } else { unless (&Apache::lonmsg::user_normal_msg($user,$domain, $title.' ['.$restitle.']',$email,$citations,$feedurl, - $attachmenturl,undef,undef,$symb,$restitle)=~/ok/) { + $attachmenturl,undef,undef,$symb,$restitle,undef, + undef,undef,undef,$senthide)=~/ok/) { $status.='
'.&mt('Error sending message to').' '.$key.'
'; } else { $sendsomething++; @@ -3185,6 +3201,24 @@ 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). + '
'; + } + } # Records of number of feedback messages are kept under the "symb" called "_feedback" # There are two entries within the framework of a course: @@ -3202,7 +3236,7 @@ sub send_msg { } } } - return ($status,$sendsomething); + return ($status,$sendsomething,$delay); } # Routine to get the complete feedback records @@ -4700,7 +4734,7 @@ ENDREDIR if ($options) { &mail_screen($r,$feedurl,$options,$symb,$attachmax{'text'}); } else { - &fail_redirect($r,$feedurl,1); + &fail_redirect($r,$feedurl,2); } return OK; } @@ -4719,7 +4753,7 @@ ENDREDIR my $usersymb = &Apache::lonenc::check_encrypt($symb); my $useranswer= &Apache::loncommon::get_student_answers( - $usersymb,$env{'user.name'},$env{'user.domain'}, + $symb,$env{'user.name'},$env{'user.domain'}, $env{'request.course.id'}); &Apache::lonnet::delenv('allowed.vgr'); # Get attachments, if any, and not too large @@ -4766,9 +4800,10 @@ ENDREDIR my ($typestyle,%to) = &Apache::lonmsg::decide_receiver($feedurl); # Actually send mail - my ($status,$numsent)=&send_msg(&clear_out_html($env{'form.subject'}), - $feedurl,$email,$citations, - $attachmenturl,$usersymb,%to); + 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); # Discussion? Store that. my $numpost=0; @@ -4804,7 +4839,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); + undef,undef,undef,undef,undef,undef,$group,$toolarge,$delay); } return OK; }