--- loncom/interface/portfolio.pm 2019/08/13 03:09:48 1.254.2.4 +++ loncom/interface/portfolio.pm 2023/12/28 18:14:07 1.268 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.254.2.4 2019/08/13 03:09:48 raeburn Exp $ +# $Id: portfolio.pm,v 1.268 2023/12/28 18:14:07 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -237,7 +237,7 @@ sub display_directory_line { if ($lock_info) { my %anchor_fields = ('lockinfo' => $fullpath); if ($versions) { # hold the folder open - my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($fullpath); + my ($fname,$version,$extension) = &Apache::lonnet::file_name_version_ext($fullpath); $fname =~ s|^/||; $anchor_fields{'showversions'} = $fname.'.'.$extension; } @@ -267,13 +267,16 @@ sub display_directory_line { sub display_directory { my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload, - $can_modify,$can_delete,$can_setacl)=@_; + $can_modify,$can_delete,$can_setacl,$can_viewacl)=@_; my $iconpath= $r->dir_config('lonIconsURL') . "/"; my $select_mode; my $checked_files; my $port_path = &get_port_path(); my ($uname,$udom) = &get_name_dom($group); - my $access_admin_text = &mt('View Status'); + my $access_admin_text; + if ($can_viewacl) { + $access_admin_text = &mt('View Status'); + } if ($can_setacl) { $access_admin_text = &mt('View/Change Status'); } @@ -370,7 +373,7 @@ sub display_directory { } (@{$dir_list})) { my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$dir_line,16); $filename =~ s/\s+$//; - my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename); + my ($fname,$version,$extension) = &Apache::lonnet::file_name_version_ext($filename); if ($version) { my $fullpath = &prepend_group($current_path.$fname.'.'.$extension); push(@{ $versioned{$fullpath} }, @@ -383,7 +386,7 @@ sub display_directory { my $zerobyte; foreach my $dir_line (@dir_lines) { my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line; - my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename); + my ($fname,$version,$extension) = &Apache::lonnet::file_name_version_ext($filename); if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) { my $version_flag; my $show_versions; @@ -487,6 +490,7 @@ sub display_directory { my $cond_access = 0; foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) { my ($num,$scope,$end,$start) = &unpack_acc_key($key); + next if ($scope eq 'ip'); if (($now > $start) && (!$end || $end > $now)) { if ($scope eq 'public') { $pub_access = 1; @@ -514,7 +518,7 @@ sub display_directory { } } &display_directory_line($r,$select_mode, $filename, $mtime, $size, $css_class, $line, - \%access_controls, $curr_access,$now, $version_flag, $href_location, + \%access_controls, $curr_access, $now, $version_flag, $href_location, $url, $current_path, $access_admin_text); if ($show_versions) { foreach my $dir_line (@{ $versioned{$fullpath} }) { @@ -887,7 +891,7 @@ sub access_for_renamed { } sub display_access { - my ($r,$url,$group,$can_setacl,$port_path,$action) = @_; + my ($r,$url,$group,$can_setacl,$can_viewacl,$port_path,$action) = @_; my ($uname,$udom) = &get_name_dom($group); my $file_name = $env{'form.currentpath'}.$env{'form.access'}; $file_name = &prepend_group($file_name); @@ -897,6 +901,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 +915,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.").'
    '; } @@ -936,13 +942,21 @@ sub display_access { 'cancel' => &mt('Return to directory'), }; &close_form($r,$url,$button_text); - } else { + } elsif ($can_viewacl) { $r->print($header); if ($aclcount) { $r->print($info); } &view_access_settings($r,$url,$access_controls{$file_name},$aclcount); + } else { + $r->print($header); + $r->print(&mt('You do not have sufficient privileges to view access controls').'
    '); } + my %anchor_fields = ( + 'currentpath' => $env{'form.currentpath'} + ); + $r->print('
    '.&make_anchor($url, \%anchor_fields, &mt('Return to directory'))); + return; } sub explain_conditionals { @@ -992,9 +1006,9 @@ sub build_access_summary { domains => 'Conditional: domain-based', users => 'Conditional: user-based', course => 'Conditional: course/community-based', - ip => 'Conditional: IP-based', + userip => 'Conditional: IP-based', ); - my @allscopes = ('public','guest','domains','users','course','ip'); + my @allscopes = ('public','guest','domains','users','course','userip'); foreach my $scope (@allscopes) { if ((!(exists($todisplay{$scope}))) || (ref($todisplay{$scope}) ne 'HASH')) { next; @@ -1071,8 +1085,8 @@ sub build_access_summary { } elsif ($scope eq 'users') { my $curr_user_list = &sort_users($content->{'users'}); $r->print(&mt('Users: ').$curr_user_list); - } elsif ($scope eq 'ip') { - my $curr_ips_list = &sort_ips($content->{'ip'}); + } elsif ($scope eq 'userip') { + my $curr_ips_list = &sort_ips($content->{'userip'}); $r->print(&mt('IP(s):').' '.$curr_ips_list); } else { $r->print(' '); @@ -1182,7 +1196,7 @@ sub update_access { my $totalnew = 0; my $status = 'new'; my ($firstitem,$lastitem); - my @types = ('course','domains','users','ip'); + my @types = ('course','domains','users','userip'); foreach my $newitem (@types) { $allnew += $env{'form.new'.$newitem}; } @@ -1194,7 +1208,7 @@ sub update_access { course => 'course/community', domains => 'domain', users => 'user', - ip => 'IP', + userip => 'IP', ); foreach my $newitem (@types) { next if ($env{'form.new'.$newitem} <= 0); @@ -1298,7 +1312,7 @@ sub build_access_record { 'udom' => $udom }); } - } elsif ($scope eq 'ip') { + } elsif ($scope eq 'userip') { my $ipslist = $env{'form.ips_'.$num}; $ipslist =~ s/\s+//sg; my %ipshash = map { ($_,1) } (split(/,/,$ipslist)); @@ -1369,7 +1383,7 @@ sub access_setting_table { push(@domains,$key); } elsif ($scope eq 'users') { push(@users,$key); - } elsif ($scope eq 'ip') { + } elsif ($scope eq 'userip') { push(@ips,$key); } } @@ -1431,7 +1445,7 @@ sub standard_settings { my $numconditionals = 0; my $conditionstext; my %cond_status; - foreach my $scope ('domains','users','course','ip') { + foreach my $scope ('domains','users','course','userip') { $numconditionals += $acl_count->{$scope}; if ($acl_count->{$scope} > 0) { if ($conditionstext ne 'Active') { @@ -1478,7 +1492,7 @@ sub condition_setting { $r->print(''); &access_element($r,'course',$acl_count,$courses,$access_controls,$now,$then); $r->print(' '); - &access_element($r,'ip',$acl_count,$ips,$access_controls,$now,$then); + &access_element($r,'userip',$acl_count,$ips,$access_controls,$now,$then); $r->print(''); } @@ -1499,7 +1513,7 @@ sub access_element { domains => 'Domain', users => 'User', course => 'Course/Community', - ip => 'IP', + userip => 'IP', ); $r->print('

    '.&mt($typetext{$type}.'-based conditional access:').' '); if ($$acl_count{$type}) { @@ -1524,7 +1538,7 @@ sub display_access_row { } elsif ($type eq 'users') { $showtype = &mt('Users'); $infotype = 'User'; - } elsif ($type eq 'ip') { + } elsif ($type eq 'userip') { $showtype = &mt('IP-based'); $infotype = 'IP'; } @@ -1552,7 +1566,7 @@ sub display_access_row { $then); } elsif ($type eq 'users') { &users_row($r,$status,$key,$access_controls,$now,$then); - } elsif ($type eq 'ip') { + } elsif ($type eq 'userip') { &ips_row($r,$status,$key,$access_controls,$now,$then); } $r->print(&Apache::loncommon::end_data_table_row()); @@ -1735,11 +1749,11 @@ sub users_row { sub ips_row { my ($r,$status,$item,$access_controls,$now,$then) = @_; my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then, - 'ip'); + 'userip'); my $curr_ips_list; if ($status eq 'old') { my $content = $$access_controls{$item}; - $curr_ips_list = &sort_ips($content->{'ip'}); + $curr_ips_list = &sort_ips($content->{'userip'}); } $r->print(''.&actionbox($status,$num,$scope).''.&mt('Format for IP controls').'
    '. &mt('[_1] or [_2] or [_3] or [_4] or [_5]','35.8.*','35.8.3.[34-56]', @@ -1758,7 +1772,7 @@ sub additional_item { $showtype = 'domain'; } elsif ($type eq 'users') { $showtype = 'user'; - } elsif ($type eq 'ip') { + } elsif ($type eq 'userip') { $showtype = 'IP'; } return @@ -1772,7 +1786,7 @@ sub actionbox { my $output = '