--- loncom/interface/portfolio.pm 2024/12/29 21:44:16 1.254.2.7 +++ loncom/interface/portfolio.pm 2015/06/18 20:19:06 1.256 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.254.2.7 2024/12/29 21:44:16 raeburn Exp $ +# $Id: portfolio.pm,v 1.256 2015/06/18 20:19:06 musolffc Exp $ # # Copyright Michigan State University Board of Trustees # @@ -121,8 +121,8 @@ END .'
' .''.$lt{'upload_label'}.'' .$groupitem - .'' - .'' + .'' + .'' .'' .'' .'' @@ -203,8 +203,7 @@ sub display_portfolio_usage { .$helpitem .'' .'
' - .&Apache::lonhtmlcommon::display_usage($current_disk_usage, - $disk_quota,'portfolio') + .&Apache::lonhtmlcommon::display_usage($current_disk_usage,$disk_quota) .'
'); } @@ -237,7 +236,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,7 +266,7 @@ 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,$caller)=@_; + $can_modify,$can_delete,$can_setacl)=@_; my $iconpath= $r->dir_config('lonIconsURL') . "/"; my $select_mode; my $checked_files; @@ -311,15 +310,6 @@ sub display_directory { &mt('Using the portfolio file list')) .'

' ); - my ($acl_helpfile,$acl_helplink); - if ($caller eq 'coursegrp_portfolio') { - $acl_helpfile = 'Portfolio ShareFile Group'; - } elsif ($can_setacl) { - $acl_helpfile = 'Portfolio ShareFile'; - } - if ($acl_helpfile) { - $acl_helplink = &Apache::loncommon::help_open_topic($acl_helpfile); - } $r->print(&Apache::loncommon::start_data_table() .&Apache::loncommon::start_data_table_header_row() .''.&mt('Actions'). &Apache::loncommon::help_open_topic('Portfolio FileAction').'' @@ -329,7 +319,7 @@ sub display_directory { .''.&mt('Size').'' .''.&mt('Last Modified').'' .' ' - .''.&mt('Current Access Status').$acl_helplink.'' + .''.&mt('Current Access Status').&Apache::loncommon::help_open_topic('Portfolio ShareFile').'' .&Apache::loncommon::end_data_table_header_row()); } @@ -379,7 +369,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} }, @@ -392,7 +382,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; @@ -918,13 +908,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()."/adm/$udom/$uname/aboutme/portfolio.
    "; + &mt('A listing of files viewable without log-in is available at: ')."".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/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()."/adm/$udom/$uname/aboutme
    "; + $info .= "
    ".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/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.").'
    '; } @@ -1082,7 +1072,7 @@ sub build_access_summary { $r->print(&mt('Users: ').$curr_user_list); } elsif ($scope eq 'ip') { my $curr_ips_list = &sort_ips($content->{'ip'}); - $r->print(&mt('IP(s):').' '.$curr_ips_list); + $r->print(&mt('IP(s): ').$curr_ips_list); } else { $r->print(' '); } @@ -2558,15 +2548,13 @@ sub coursegrp_portfolio_header { } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/$cdom/$cnum/$env{'form.group'}/smppg?ref=$env{'form.ref'}", - text=>&mt('Group').": $grp_desc", - title=>&mt("Go to group's home page"), - no_mt=>1}, + text=>"$ucgpterm: $grp_desc", + title=>"Go to group's home page"}, {href=>"/adm/coursegrp_portfolio?".&group_args(), text=>"Group Portfolio", title=>"Display group portfolio"}); my $output = &Apache::lonhtmlcommon::breadcrumbs( - &mt('Group portfolio files - [_1]',$grp_desc), - undef,undef,undef,undef,1); + &mt('[_1] portfolio files - [_2]',$gpterm,$grp_desc)); return $output; } @@ -2583,7 +2571,7 @@ sub get_quota { } else { $disk_quota = &Apache::loncommon::get_user_quota($env{'user.name'}, $env{'user.domain'}); #expressed in MB - $disk_quota = 1024 * $disk_quota; # convert from MB to kB + $disk_quota = 1000 * $disk_quota; # convert from MB to kB } return $disk_quota; } @@ -2626,45 +2614,6 @@ sub free_space { return $free_space; } -sub valid_container { - my ($uname,$udom,$group) = @_; - my $container_prefix; - if ($group ne '') { - $container_prefix = "/uploaded/$udom/$uname/groups/$group/portfolio"; - } else { - $container_prefix = "/uploaded/$udom/$uname/portfolio"; - } - if ($env{'form.currentpath'}) { - $container_prefix .= $env{'form.currentpath'}; - } else { - $container_prefix .= '/'; - } - if ($env{'form.container'} =~ m{^\Q$container_prefix\E(.+)$}) { - my $filename = $1; - if ($filename eq &Apache::lonnet::clean_filename($filename)) { - return 1; - } - } - return; -} - -sub invalid_parms { - my ($r,$url,$currentpath) = @_; - my $escpath = &HTML::Entities::encode($currentpath,'&<>"'); - my $rtnlink = ''.&mt('Return to directory').''; - $r->print('

    '.&mt('Action disallowed').'

    '); - $r->print(&mt('Some of the data included with this request were invalid')); - $r->print('
    '.$rtnlink); - return; -} - sub handler { # this handles file management my $r = shift; @@ -2754,7 +2703,7 @@ sub handler { my $js = ''; - + if ($env{"form.mode"} eq 'selectfile'){ $r->print(&Apache::loncommon::start_page($title, $js, {'only_body' => 1})); @@ -2778,9 +2727,8 @@ 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',$clientip,$uname,$udom); + &Apache::loncommon::blocking_status('port',$uname,$udom); if ($blocked) { my $evade_block; # If portfolio display is in a window popped up from a "Select Portfolio Files" @@ -2815,21 +2763,6 @@ sub handler { return OK; } } - if (($env{'form.currentpath'}) && ($env{'form.currentpath'} ne '/')) { - my $clean_currentpath = '/'.&Apache::loncommon::clean_path($env{'form.currentpath'}).'/'; - unless ($env{'form.currentpath'} eq $clean_currentpath) { - &invalid_parms($r,$url); - $r->print(&Apache::loncommon::end_page()); - return OK; - } - } - if ($env{'form.container'}) { - unless (&valid_container($uname,$udom,$group)) { - &invalid_parms($r,$url,$env{'form.currentpath'}); - $r->print(&Apache::loncommon::end_page()); - return OK; - } - } if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){ $r->print( '

    ' @@ -3000,8 +2933,7 @@ sub handler { &display_common($r,$url,$current_path,$is_empty,$dirlistref, $can_upload,$group); &display_directory($r,$url,$current_path,$is_empty,$dirlistref,$group, - $can_upload,$can_modify,$can_delete,$can_setacl, - $caller); + $can_upload,$can_modify,$can_delete,$can_setacl); } $r->print(&Apache::loncommon::end_page()); return OK;