--- loncom/interface/lonaboutme.pm	2023/05/13 20:36:27	1.165
+++ loncom/interface/lonaboutme.pm	2025/03/16 21:04:09	1.171
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Personal Information Page
 #
-# $Id: lonaboutme.pm,v 1.165 2023/05/13 20:36:27 raeburn Exp $
+# $Id: lonaboutme.pm,v 1.171 2025/03/16 21:04:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -147,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);
@@ -226,7 +226,9 @@ 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'}) &&
+            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();
@@ -239,6 +241,7 @@ sub handler {
                     &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",
@@ -355,12 +358,13 @@ sub handler {
         }
 
         if ($allowed) {
+            my $labeltext = &HTML::Entities::encode(&mt('Choose photo file'),'"&<>');
             $r->print(
                 '<form name="UploadPhoto" method="post" enctype="multipart/form-data" action="">'.
                 '<h3>'.&mt('Upload a Photo').'</h3>'.
                 '<p class="LC_info">'.
                 &mt('LON-CAPA will automatically scale your uploaded file so the image will not exceed a width of 400px and a height of 500px.').'</p>'.
-                '<input type="file" name="uploaddoc" size="50" />'.
+                '<input type="file" name="uploaddoc" size="50" aria-label="'.$labeltext.'" />'.
                 '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
                 '<input type="hidden" name="popup" value="'.$env{'form.popup'}.'" />'.
                 '</form>');
@@ -385,9 +389,9 @@ sub handler {
 
         if ($target ne 'tex') { #Begin Print RSS and portfiles
             &print_portfiles_link($r,$is_course);
-            if (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') {
+            if (&Apache::lonrss::advertisefeeds($cnum,$cdom,'','','',1) ne '') {
                 &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box');
-                $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom));
+                $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,'','','',1));
                 &Apache::lontemplate::print_end_template($r);
             }
 
@@ -404,6 +408,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'}
@@ -633,10 +640,14 @@ 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);
+        &Apache::lonnet::get_portfile_permissions($cdom,$cnum);
     my %access_controls =
-    &Apache::lonnet::get_access_controls($current_permissions);
+        &Apache::lonnet::get_access_controls($current_permissions);
     my $portaccess;
     if ($mode eq 'showlink') {
         $portaccess = 'both';
@@ -691,10 +702,11 @@ 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,$clientip,
-                                                 $access_info->{$filename});
+                                                 $access_info->{$filename},\$usercanshare);
         if ($portaccess eq 'both') {
             if (($access_status ne 'ok') &&
                 ($access_status !~  /^[^:]+:guest_/)) {