--- loncom/interface/portfolio.pm 2019/08/07 16:08:04 1.260 +++ loncom/interface/portfolio.pm 2022/09/18 22:33:45 1.266 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.260 2019/08/07 16:08:04 raeburn Exp $ +# $Id: portfolio.pm,v 1.266 2022/09/18 22:33:45 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -122,7 +122,7 @@ END .''.$lt{'upload_label'}.'' .$groupitem .'' - .'' + .'' .'' .'' .'' @@ -897,6 +897,8 @@ sub display_access { my $aclcount = keys(%access_controls); my ($header,$info); if ($action eq 'chgaccess') { + my $uhome = &Apache::lonnet::homeserver($uname,$udom); + my $prefix = &Apache::lonnet::url_prefix($r,$udom,$uhome,'web'); $header = '

' .&mt('Allowing others to retrieve file: [_1]' @@ -909,13 +911,13 @@ sub display_access { $info .= '
  • '.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.'); $info .= '
  • '.&explain_conditionals(); $info .= '
  • '. - &mt('A listing of files viewable without log-in is available at: ')."".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme/portfolio.
    "; + &mt('A listing of files viewable without log-in is available at: ')."$prefix/adm/$udom/$uname/aboutme/portfolio.
    "; if ($group eq '') { $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:"); } else { $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on the course information page:"); } - $info .= "
    ".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme
    "; + $info .= "
    $prefix/adm/$udom/$uname/aboutme
    "; if ($group ne '') { $info .= &mt("Users with course editing rights may add a 'Group Portfolio' item using the Course Editor (Collaboration tab), to provide access to viewable group portfolio files.").'
    '; } @@ -2549,13 +2551,15 @@ sub coursegrp_portfolio_header { } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/$cdom/$cnum/$env{'form.group'}/smppg?ref=$env{'form.ref'}", - text=>"$ucgpterm: $grp_desc", - title=>"Go to group's home page"}, + text=>&mt('Group').": $grp_desc", + title=>&mt("Go to group's home page"), + no_mt=>1}, {href=>"/adm/coursegrp_portfolio?".&group_args(), text=>"Group Portfolio", title=>"Display group portfolio"}); my $output = &Apache::lonhtmlcommon::breadcrumbs( - &mt('[_1] portfolio files - [_2]',$gpterm,$grp_desc)); + &mt('Group portfolio files - [_1]',$grp_desc), + undef,undef,undef,undef,1); return $output; } @@ -2767,8 +2771,9 @@ sub handler { } $r->rflush(); # Check if access to portfolio is blocked by one or more blocking events in courses. + my $clientip = &Apache::lonnet::get_requestor_ip($r); my ($blocked,$blocktext) = - &Apache::loncommon::blocking_status('port',$uname,$udom); + &Apache::loncommon::blocking_status('port',$clientip,$uname,$udom); if ($blocked) { my $evade_block; # If portfolio display is in a window popped up from a "Select Portfolio Files"