--- loncom/interface/lonaboutme.pm 2020/12/18 15:23:02 1.159 +++ loncom/interface/lonaboutme.pm 2023/05/13 20:36:27 1.165 @@ -1,7 +1,7 @@ # The LearningOnline Network # Personal Information Page # -# $Id: lonaboutme.pm,v 1.159 2020/12/18 15:23:02 raeburn Exp $ +# $Id: lonaboutme.pm,v 1.165 2023/05/13 20:36:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -84,6 +84,7 @@ use Apache::lonlocal; use Apache::lonmsgdisplay(); use Apache::lontemplate; use Apache::longroup; +use Apache::lonhtmlcommon(); use HTML::Entities(); use Image::Magick; @@ -108,10 +109,15 @@ sub handler { $is_course = &Apache::lonnet::is_course($cdom,$cnum); } + my $clientip = &Apache::lonnet::get_requestor_ip($r); my $candisplay = 1; if (!$is_course) { if ($action ne 'portfolio') { - $candisplay = &Apache::lonnet::usertools_access($cnum,$cdom,'aboutme'); + if (($env{'user.name'} eq $cnum) && ($env{'user.domain'} eq $cdom)) { + $candisplay = &Apache::lonnet::usertools_access($cnum,$cdom,'aboutme'); + } else { + $candisplay = &Apache::loncommon::aboutme_on($cnum,$cdom); + } if ((!$candisplay) && ($env{'request.course.id'})) { $candisplay = &aboutme_access($cnum,$cdom); } @@ -153,7 +159,7 @@ sub handler { ''); } else { my ($blocked,$blocktext) = - &Apache::loncommon::blocking_status('port',$cnum,$cdom); + &Apache::loncommon::blocking_status('port',$clientip,$cnum,$cdom); if (!$blocked) { &display_portfolio_files($r,$is_course); } else { @@ -221,12 +227,14 @@ sub handler { $args->{'no_nav_bar'} = 1; } elsif (!$env{'form.register'}) { #Don't show breadcrumbs twice, when this page is part of course content and you call it if (($env{'request.course.id'}) && - ($env{'form.folderpath'} =~ /^supplemental/)) { + ($env{'form.folderpath'} =~ /^supplemental/)) { + &Apache::loncommon::validate_folderpath(1,'',$coursenum,$coursedomain); my $crstype = &Apache::loncommon::course_type(); my $title = $env{'form.title'}; if ($title eq '') { $title = &mt('Personal Information Page'); } + $title = &HTML::Entities::encode($title,'\'"<>&'); my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); if (ref($brcrum) eq 'ARRAY') { @@ -240,6 +248,17 @@ sub handler { my $start_page = &Apache::loncommon::start_page('Personal Information Page',$rss_link,$args); $r->print($start_page); } + my ($blocked,$blocktext) = + &Apache::loncommon::blocking_status('about',$clientip,$cnum,$cdom); + if ($blocked) { + if ($target eq 'tex') { + $r->print('\noindent{\large\textbf{'.&mt('No user personal information page available').'}}\\\\\\\\'); + } else { + $r->print($blocktext); + } + $r->print(&Apache::loncommon::end_page()); + return OK; + } #----------------Print Privacy note (edit mode) or last modified date. @@ -793,10 +812,8 @@ sub parse_directory { sub aboutme_access { my ($uname,$udom) = @_; my $privcheck = $env{'request.course.id'}; - my $sec; if ($env{'request.course.sec'} ne '') { - $sec = $env{'request.course.sec'}; - $privcheck .= '/'.$sec; + $privcheck .= '/'.$env{'request.course.sec'}; } my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};