--- loncom/interface/lonaboutme.pm	2014/01/28 16:22:30	1.156
+++ loncom/interface/lonaboutme.pm	2023/12/28 15:57:27	1.168
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Personal Information Page
 #
-# $Id: lonaboutme.pm,v 1.156 2014/01/28 16:22:30 bisitz Exp $
+# $Id: lonaboutme.pm,v 1.168 2023/12/28 15:57:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -83,6 +83,8 @@ use Apache::lonrss();
 use Apache::lonlocal;
 use Apache::lonmsgdisplay();
 use Apache::lontemplate;
+use Apache::longroup;
+use Apache::lonhtmlcommon();
 use HTML::Entities();
 use Image::Magick;
 
@@ -107,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);
             }
@@ -140,7 +147,7 @@ sub handler {
 # ------------------------------------------------------------ Get Query String
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                         ['forceedit','forcestudent','todocs',
-                         'register','popup','folderpath','title']);
+                         'register','popup','folderpath','title','only_body']);
 # ----------------------------------------------- Available Portfolio file display
     if (($target ne 'tex') && ($action eq 'portfolio')) {
         &display_portfolio_header($r,$is_course);
@@ -152,7 +159,7 @@ sub handler {
                 '</ul>');
         } 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 {
@@ -219,17 +226,22 @@ sub handler {
         if ($env{'form.popup'}) { # Don't show breadcrumbs in popup window 
             $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/)) {
+            if (($env{'form.only_body'}) && ($env{'request.course.id'})) {
+                $args->{'only_body'} = 1;
+            } elsif (($env{'request.course.id'}) &&
+                ($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') {
                     $args->{'bread_crumbs'} = $brcrum;
+                    $args->{'bread_crumbs_nomenu'} = 1;
                 }
             } else {
                 $args->{'bread_crumbs'} = [{href=>"/adm/$cdom/$cnum/aboutme",
@@ -239,6 +251,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. 
 
@@ -384,6 +407,9 @@ sub handler {
         if ($target ne 'tex') {$r->print('<br />');} else {$r->print('\\\\');}
     } else {
         $r->print('<p class="LC_info">'.&mt('No personal information provided').'.</p>');
+        if ($target ne 'tex') {
+            &print_portfiles_link($r,$is_course);
+        }
     }
 
     if ($env{'request.course.id'}
@@ -400,7 +426,7 @@ sub handler {
 
         } else {
             $r->print('\\\\\textbf{'.&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'}\\\\'.&mt('Shared by course faculty and staff').'\\\\\\\\');
-            &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom, 'tex');
+            &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom,$target);
         }
     }
     if ($target ne 'tex') {
@@ -613,6 +639,10 @@ sub portfolio_files {
                        withoutpass => 0,
                        both        => 0,
                      };
+    unless (($is_course) ||
+            (&Apache::lonnet::usertools_access($cnum,$cdom,'portaccess',undef,'tools'))) {
+        return $filecounts;
+    }
     my $current_permissions =
     &Apache::lonnet::get_portfile_permissions($cdom,$cnum);
     my %access_controls =
@@ -630,9 +660,12 @@ sub portfolio_files {
     my $diroutput;
     if ($is_course) {
         my %files_by_group;
+        my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
         foreach my $filename (sort(keys(%access_controls))) {
             my ($group,$path) = split('/',$filename,2);
-            $files_by_group{$group}{$path} = $access_controls{$filename};
+            if (exists($curr_groups{$group})) {
+                $files_by_group{$group}{$path} = $access_controls{$filename};
+            }
         }
         foreach my $group (sort(keys(%files_by_group))) {
             my %fileshash;
@@ -667,9 +700,12 @@ sub portfolio_files {
 sub build_hierarchy {
     my ($r,$cdom,$cnum,$portaccess,$is_course,$filecounts,$mode,$access_info,
         $allfileshash,$group) = @_;
+    my $clientip = &Apache::lonnet::get_requestor_ip($r);
+    my $usercanshare = &Apache::lonnet::usertools_access($cnum,$cdom,'portaccess',undef,'tools');
     foreach my $filename (sort(keys(%{$access_info}))) {
         my $access_status =
-           &Apache::lonnet::get_portfolio_access($cdom,$cnum,$filename,$group,$$access_info{$filename});
+           &Apache::lonnet::get_portfolio_access($cdom,$cnum,$filename,$group,$clientip,
+                                                 $access_info->{$filename},\$usercanshare);
         if ($portaccess eq 'both') {
             if (($access_status ne 'ok') &&
                 ($access_status !~  /^[^:]+:guest_/)) {
@@ -787,10 +823,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'};