--- loncom/interface/portfolio.pm 2008/12/05 10:23:56 1.200 +++ loncom/interface/portfolio.pm 2020/09/08 23:54:40 1.262 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.200 2008/12/05 10:23:56 bisitz Exp $ +# $Id: portfolio.pm,v 1.262 2020/09/08 23:54:40 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,7 +38,7 @@ use Apache::lonnet; use Apache::longroup; use Apache::lonhtmlcommon; use HTML::Entities; -use LONCAPA; +use LONCAPA qw(:DEFAULT :match); sub group_args { my $output; @@ -63,7 +63,7 @@ sub group_form_data { return $output; } -# receives a file name and path stub from username/userfiles/portfolio/ +# receives a filename and path stub from username/userfiles/portfolio/ # returns an anchor tag consisting encoding filename and currentpath sub make_anchor { my ($url, $anchor_fields, $inner_text) = @_; @@ -80,7 +80,7 @@ sub make_anchor { my $dirptr=16384; sub display_common { - my ($r,$url,$current_path,$is_empty,$dir_list,$can_upload)=@_; + my ($r,$url,$current_path,$is_empty,$dir_list,$can_upload,$group)=@_; my $namespace = &get_namespace(); my $port_path = &get_port_path(); if ($can_upload) { @@ -88,42 +88,44 @@ sub display_common { my $iconpath= $r->dir_config('lonIconsURL') . "/"; my %lt=&Apache::lonlocal::texthash( - 'upload' => 'Upload', - 'upload_label' => 'Upload file to current directory', - 'createdir' => 'Create Subdirectory', - 'createdir_label' => - 'Create subdirectory in current directory', - 'parse' => 'If HTML file, upload embedded images/multimedia/css/linked files' - ); + 'upload' => 'Upload', + 'upload_label' => 'Upload file to current directory', + 'createdir' => 'Create Subdirectory', + 'createdir_label' => 'Create subdirectory in current directory', + 'parse' => 'Upload embedded images/multimedia/css/linked files if HTML file', + ); my $escuri = &HTML::Entities::encode($r->uri,'&<>"'); my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles'); my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory'); - - # FIXME: This line should be deleted once Portfolio uses breadcrumbs - $r->print(&Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio'))); - + my $help_portfolio = &Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio')); + $r->print(&display_portfolio_usage($group,$help_portfolio)); my $parse_check; if (!&suppress_embed_prompt()) { $parse_check = <<"END";
- END } - $r->print('
'); + # Find space available before uploading + my $free_space = &free_space($group); + # Upload File $r->print('
' .'
' .'
' .''.$lt{'upload_label'}.'' .$groupitem - .'' + .'' + .'' .'' .'' + .'' .'' .'' .'' @@ -138,9 +140,10 @@ END .'' .'
' .''.$lt{'createdir_label'}.'' - .''.$groupitem + .''.$groupitem .'' .'' + .'' .'' .'' .'' @@ -149,7 +152,6 @@ END .'' .'
' ); - $r->print('
'); } # end "if can_upload" my @tree = split (/\//,$current_path); @@ -157,9 +159,11 @@ END 'selectfile' => $port_path, 'currentpath' => '/', 'mode' => $env{"form.mode"}, + 'symb' => $env{"form.symb"}, 'fieldname' => $env{"form.fieldname"}, 'continue' => $env{"form.continue"} ); + $r->print('
'); $r->print(''.&make_anchor($url,\%anchor_fields,$port_path).'/'); if (@tree > 1){ my $newCurrentPath = '/'; @@ -169,6 +173,7 @@ END 'selectfile' => $tree[$i], 'currentpath' => $newCurrentPath, 'mode' => $env{"form.mode"}, + 'symb' => $env{"form.symb"}, 'fieldname' => $env{"form.fieldname"}, 'continue' => $env{"form.continue"} ); @@ -178,13 +183,31 @@ END $r->print(''); $r->print(&Apache::loncommon::help_open_topic('Portfolio ChangeDirectory')); &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path); - $r->print('
print('">'. &Apache::lonhtmlcommon::select_recent($namespace,'currentpath', 'this.form.submit();')); $r->print("
"); } +sub display_portfolio_usage { + my ($group,$helpitem) = @_; + my $disk_quota = &get_quota($group); + my $getpropath = 1; + my $portfolio_root = &get_portfolio_root(); + my ($uname,$udom) = &get_name_dom($group); + my $current_disk_usage = + &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath); + return &Apache::loncommon::head_subbox( + '
' + .$helpitem + .'
' + .'
' + .&Apache::lonhtmlcommon::display_usage($current_disk_usage, + $disk_quota,'portfolio') + .'
'); +} + sub display_directory_line { my ($r,$select_mode, $filename, $mtime, $size, $css_class, $line, $access_controls, $curr_access, $now, $version_flag, @@ -195,7 +218,7 @@ sub display_directory_line { $r->print($line); # contains first two cells of table my $lock_info; if ($version_flag) { # versioned can't be versioned, so TRUE when root file - $r->print(''); + $r->print(''); $r->print(''.$version_flag.''); } else { # this is a graded or handed back file my ($user,$domain) = &get_name_dom($env{'form.group'}); @@ -214,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; } @@ -246,7 +269,6 @@ sub display_directory { my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload, $can_modify,$can_delete,$can_setacl)=@_; my $iconpath= $r->dir_config('lonIconsURL') . "/"; - my $display_out; my $select_mode; my $checked_files; my $port_path = &get_port_path(); @@ -263,30 +285,17 @@ sub display_directory { my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group); my $now = time; if ($env{"form.mode"} eq 'selectfile') { - &select_files($r); - $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'}); - $select_mode = 'true'; - } - if ($is_empty && ($current_path ne '/') && $can_delete) { - $display_out = '
'. - &group_form_data(). - ''. - '

'. - ''. - '

'. - ''. - ''. - '
'; - - $r->print($display_out); - return; + &select_files($r,$dir_list); + $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'}); + $select_mode = 'true'; } if ($select_mode eq 'true') { $r->print('
'); $r->print(&Apache::loncommon::start_data_table() .&Apache::loncommon::start_data_table_header_row() .''.&mt('Select').'' - .'  ' + .' ' + .' ' .''.&mt('Name').'' .''.&mt('Size').'' .''.&mt('Last Modified').'' @@ -295,12 +304,18 @@ sub display_directory { ); } else { $r->print(''); - $r->print(&Apache::loncommon::help_open_topic('Portfolio FileList', - &mt('Using the portfolio file list'))); + $r->print( + '

' + .&Apache::loncommon::help_open_topic( + 'Portfolio FileList', + &mt('Using the portfolio file list')) + .'

' + ); $r->print(&Apache::loncommon::start_data_table() .&Apache::loncommon::start_data_table_header_row() .''.&mt('Actions'). &Apache::loncommon::help_open_topic('Portfolio FileAction').'' - .'  ' + .' ' + .' ' .''.&mt('Name').&Apache::loncommon::help_open_topic('Portfolio OpenFile').'' .''.&mt('Size').'' .''.&mt('Last Modified').'' @@ -308,32 +323,67 @@ sub display_directory { .''.&mt('Current Access Status').&Apache::loncommon::help_open_topic('Portfolio ShareFile').'' .&Apache::loncommon::end_data_table_header_row()); } + + # Empty directory? + if ($is_empty && ($current_path ne '/') && $can_delete) { + my $cols = ($select_mode eq 'true') ? 7 : 9; + # Empty message + $r->print( + &Apache::loncommon::start_data_table_row() + .'' + .'

' + .&mt('This directory is empty.') + .'

' + .'' + .&Apache::loncommon::end_data_table_row() + .&Apache::loncommon::end_data_table() + .'
' + ); + # Delete button + $r->print( + '
'. + &group_form_data(). + ''. + '

'. + ''. + '

'. + ''. + ''. + '
' + ); + # Directory is empty, so nothing else to display + return; + } + $r->print("\n".&group_form_data()."\n"); my $href_location="/uploaded/$udom/$uname/$port_path".$current_path; my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path; my @dir_lines; my %versioned; - foreach my $dir_line (sort - { - my ($afile)=split('&',$a,2); - my ($bfile)=split('&',$b,2); - return (lc($afile) cmp lc($bfile)); - } (@$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); - if ($version) { - my $fullpath = &prepend_group($current_path.$fname.'.'.$extension); - push(@{ $versioned{$fullpath} }, - [$filename,$dom,$testdir,$size,$mtime,$obs,]); - } else { - push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]); - } + if (ref($dir_list) eq 'ARRAY') { + foreach my $dir_line (sort + { + my ($afile)=split('&',$a,2); + my ($bfile)=split('&',$b,2); + return (lc($afile) cmp lc($bfile)); + } (@{$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::lonnet::file_name_version_ext($filename); + if ($version) { + my $fullpath = &prepend_group($current_path.$fname.'.'.$extension); + push(@{ $versioned{$fullpath} }, + [$filename,$dom,$testdir,$size,$mtime,$obs,]); + } else { + push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]); + } + } } + 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; @@ -373,12 +423,13 @@ sub display_directory { $colspan_fill=' colspan="4"'; } $r->print(''); - $r->print(''.&mt('closed folder').'' + $r->print(''.&mt('closed folder').'' .''.&mt('Go to ...').''); my %anchor_fields = ( 'selectfile' => $filename.'/', 'currentpath' => $current_path.$filename.'/', 'mode' => $env{"form.mode"}, + 'symb' => $env{"form.symb"}, 'fieldname' => $env{"form.fieldname"}, 'continue' => $env{"form.continue"} ); @@ -390,11 +441,16 @@ sub display_directory { my $css_class = 'LC_browser_file'; my $line; if ($select_mode eq 'true') { - $line=' 0) { + $line=''; } if ($can_modify) { - my $cat=''.&mt('Catalog Information'). - ''; + my $cat=''.&mt('Metadata').''; my %anchor_fields = ( 'rename' => $filename, currentpath => $current_path @@ -475,13 +530,18 @@ sub display_directory { } } if ($select_mode eq 'true') { - $r->print(&Apache::loncommon::end_data_table().' + $r->print(&Apache::loncommon::end_data_table()); + if ($zerobyte) { + $r->print('

'.&mt('[quant,_1,file] in list not selectable as file size is 0 bytes.',$zerobyte).'

'); + } + $r->print(' +


- +

'); @@ -557,17 +617,19 @@ sub display_file { } sub done { - my ($message,$url)=@_; - unless (defined $message) { - $message='Done'; + my ($linktext,$url)=@_; + unless (defined($linktext)) { + $linktext='Return to directory'; } my %anchor_fields = ( 'showversions' => $env{'form.showversions'}, 'currentpath' => $env{'form.currentpath'}, 'fieldname' => $env{'form.fieldname'}, + 'symb' => $env{'form.symb'}, 'mode' => $env{'form.mode'} ); - my $result = '

'.&make_anchor($url,\%anchor_fields,&mt($message)).'

'; + my $result = &Apache::lonhtmlcommon::actionbox( + [&make_anchor($url,\%anchor_fields,&mt($linktext))]); return $result; } @@ -579,15 +641,19 @@ sub delete { my @files=&Apache::loncommon::get_env_multiple('form.selectfile'); my ($uname,$udom) = &get_name_dom($group); if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') { - $r->print(&mt('The file is locked and cannot be deleted.').'
'); - $r->print(&done('Back',$url)); + $r->print( + '

' + .&mt('The file is locked and cannot be deleted.') + .'

' + .&done(undef,$url) + ); } else { if (scalar(@files)) { &open_form($r,$url); $r->print('

'.&mt('Delete [_1]?',&display_file(undef,\@files)).'

'); &close_form($r,$url); } else { - $r->print("No file was checked to delete.
"); + $r->print('

'.&mt('No file was checked to delete.').'

'); $r->print(&done(undef,$url)); } } @@ -601,18 +667,21 @@ sub delete_confirmed { my $port_path = &get_port_path(); my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom, $uname); + my @msg; foreach my $delete_file (@files) { - $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path. - $env{'form.currentpath'}. - $delete_file); + $result = + &Apache::lonnet::removeuserfile( + $uname,$udom,$port_path. + $env{'form.currentpath'}. + $delete_file); if ($result ne 'ok') { - $r->print('' - .&mt('An error occurred ([_1]) while trying to delete [_2].' - ,$result,&display_file(undef, $delete_file)) - .'

'); - } else { - $r->print(&mt('File: [_1] deleted.', - &display_file(undef,$delete_file))); + push(@msg, &Apache::lonhtmlcommon::confirm_success( + &mt('An error occurred ([_1]) while trying to delete [_2].' + ,$result,&display_file(undef, $delete_file)),1)); + } else { + push(@msg, &Apache::lonhtmlcommon::confirm_success( + &mt('File: [_1] deleted.' + ,&display_file(undef,$delete_file)))); my $file_name = $env{'form.currentpath'}.$delete_file; $file_name = &prepend_group($file_name); my %access_controls = @@ -628,23 +697,24 @@ sub delete_confirmed { &Apache::lonnet::modify_access_controls($file_name,\%changes, $udom,$uname); if ($outcome ne 'ok') { - $r->print('
'.&mt("An error occurred ([_1]) while ". - "trying to delete access controls for the file.",$outcome). - '

'); + push(@msg, &Apache::lonhtmlcommon::confirm_success( + &mt('An error occurred ([_1]) while '. + 'trying to delete access controls for the file.',$outcome),1)); } else { if ($deloutcome eq 'ok') { - $r->print('
'.&mt('Access controls also deleted for the file.').'

'); + push(@msg, &mt('Access controls also deleted for the file.')); # FIXME: Does the user really need this message? } else { - $r->print(''.'
'. - &mt("An error occurred ([_1]) while ". - "trying to delete access controls for the file.",$deloutcome). - '

'); + push(@msg, &Apache::lonhtmlcommon::confirm_success( + &mt('An error occurred ([_1]) while '. + 'trying to delete access controls for the file.' + ,$deloutcome),1)); } } } } } } + $r->print(&Apache::loncommon::confirmwrapper(join('
',@msg))); $r->print(&done(undef,$url)); } @@ -664,12 +734,15 @@ sub delete_dir_confirmed { my $port_path = &get_port_path(); my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path. $directory_name); - + if ($result ne 'ok') { - $r->print('' - .&mt('An error occurred (dir) ([_1]) while trying to delete [_2].' - ,$result,$directory_name) - .'
'); + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('An error occurred (dir) ([_1]) while trying to delete [_2].' + ,$result,$directory_name),1))); + $r->print(&done(undef,$url)); + return; } else { # now remove from recent &Apache::lonhtmlcommon::remove_recent($namespace,[$directory_name.'/']); @@ -680,6 +753,10 @@ sub delete_dir_confirmed { } $env{'form.currentpath'} = $directory_name; } + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('Directory successfully deleted')))); $r->print(&done(undef,$url)); } @@ -689,12 +766,16 @@ sub rename { my ($uname,$udom) = &get_name_dom($group); $file_name = &prepend_group($file_name); if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') { - $r->print("The file is locked and cannot be renamed.
"); + $r->print( + '

' + .&mt('The file is locked and cannot be renamed.') + .'

' + ); $r->print(&done(undef,$url)); } else { &open_form($r,$url); $r->print('

'.&mt('Rename [_1] to [_2]?', &display_file() - , '').'

'); + , '').'

'); &close_form($r,$url); } } @@ -704,13 +785,32 @@ sub rename_confirmed { my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'}); my ($uname,$udom) = &get_name_dom($group); my $port_path = &get_port_path(); + + # Display warning in case of filename cleaning has changed the filename + if ($filenewname ne $env{'form.filenewname'}) { + $r->print( + '

' + .&mt('Invalid characters') + .'
' + .&mt('The new filename was changed from [_1] to [_2].' + ,''.&display_file('',$env{'form.filenewname'}).'' + ,''.&display_file('',$filenewname).'') + .'

' + ); + + } + + # Filename empty? if ($filenewname eq '') { - $r->print(''. - &mt("Error: no valid filename was provided to rename to."). - '
'); - $r->print(&done(undef,$url)); - return; + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('Error: no valid filename was provided to rename to.'),1))); + $r->print(&done(undef,$url)); + return; } + + # Rename the file my $chg_access; my $result= &Apache::lonnet::renameuserfile($uname,$udom, @@ -719,18 +819,20 @@ sub rename_confirmed { if ($result eq 'ok') { $chg_access = &access_for_renamed($filenewname,$group,$udom,$uname); } else { - $r->print(''. - &mt('An error occurred ([_1]) while trying to rename [_2] to [_3].' - ,$result,&display_file(),&display_file('',$filenewname)) - .'
'); + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('An error occurred ([_1]) while trying to rename [_2] to [_3].' + ,$result,&display_file(),&display_file('',$filenewname)) + ,1))); + $r->print(&done(undef,$url)); return; } - if ($filenewname ne $env{'form.filenewname'}) { - $r->print(&mt("The new file name was changed from:
[_1] to [_2]", - ''.&display_file('',$env{'form.filenewname'}).'', - ''.&display_file('',$filenewname).'')); - } $r->print($chg_access); + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('File successfully renamed')))); $r->print(&done(undef,$url)); } @@ -795,21 +897,27 @@ sub display_access { my $aclcount = keys(%access_controls); my ($header,$info); if ($action eq 'chgaccess') { - $header = '

'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'

'; + $header = + '

' + .&mt('Allowing others to retrieve file: [_1]' + ,'' + .$port_path.$env{'form.currentpath'}.$env{'form.access'} + .'') + .'

'; $info .= &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.'); $info .= '
'. - &mt('A listing of files viewable without log-in is available at: ')."http://$ENV{'SERVER_NAME'}/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 .= "
http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme
"; + $info .= "
".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme
"; if ($group ne '') { - $info .= &mt("Users with privileges to edit course contents may add a course information page to a course using the 'Course Info' button in DOCS").'
'; + $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.").'
'; } } else { $header = '

'.&mt('Conditional access controls for file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'

'. @@ -839,9 +947,11 @@ sub display_access { sub explain_conditionals { return - &mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'
'."\n". - &mt('The conditions can include affiliation with a particular course, or a user account in a specific domain.').'
'."\n". - &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.'); + &mt('Conditional files are accessible to users who satisfy the conditions you set.').'
'; } sub view_access_settings { @@ -881,9 +991,10 @@ sub build_access_summary { guest => 'Passphrase-protected', domains => 'Conditional: domain-based', users => 'Conditional: user-based', - course => 'Conditional: course-based', + course => 'Conditional: course/community-based', + ip => 'Conditional: IP-based', ); - my @allscopes = ('public','guest','domains','users','course'); + my @allscopes = ('public','guest','domains','users','course','ip'); foreach my $scope (@allscopes) { if ((!(exists($todisplay{$scope}))) || (ref($todisplay{$scope}) ne 'HASH')) { next; @@ -898,19 +1009,24 @@ sub build_access_summary { $showstart = &mt('Deleted'); $showend = $showstart; } else { - $showstart = localtime($start); + $showstart = &Apache::lonlocal::locallocaltime($start); if ($end == 0) { $showend = &mt('No end date'); } else { - $showend = localtime($end); + $showend = &Apache::lonlocal::locallocaltime($end); } } $r->print(''.&mt($scope_desc{$scope})); + my $crstype; if ($scope eq 'course') { if ($chg ne 'delete') { my $cid = $content->{'domain'}.'_'.$content->{'number'}; my %course_description = &Apache::lonnet::coursedescription($cid); $r->print('
('.$course_description{'description'}.')'); + $crstype = 'Course'; + if ($course_description{'type'} ne '') { + $crstype = $course_description{'type'}; + } } } $r->print(''.&mt('Start: ').$showstart. @@ -930,8 +1046,6 @@ sub build_access_summary { foreach my $item ('role','access','section','group') { $r->print(''); if ($item eq 'role') { - my $ucscope = $scope; - $ucscope =~ s/^(\w)/uc($1)/e; my $role_output; foreach my $role (@{$content->{'roles'}{$id}{$item}}) { if ($role eq 'all') { @@ -939,7 +1053,7 @@ sub build_access_summary { } elsif ($role =~ /^cr/) { $role_output .= (split('/',$role))[3].','; } else { - $role_output .= &Apache::lonnet::plaintext($role,$ucscope).','; + $role_output .= &Apache::lonnet::plaintext($role,$crstype).','; } } $role_output =~ s/,$//; @@ -957,6 +1071,9 @@ 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'}); + $r->print(&mt('IP(s):').' '.$curr_ips_list); } else { $r->print(' '); } @@ -997,8 +1114,8 @@ sub update_access { } } my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'}; - $r->print('

'.&mt('Allowing others to retrieve file: [_1]', - $port_path.$file_name).'

'."\n"); + $r->print('

'.&mt('Allowing others to retrieve file: [_1]', + ''.$port_path.$file_name.'').'

'."\n"); $file_name = &prepend_group($file_name); my ($uname,$udom) = &get_name_dom($group); my ($errors,$outcome,$deloutcome,$new_values,$translation); @@ -1065,26 +1182,38 @@ sub update_access { my $totalnew = 0; my $status = 'new'; my ($firstitem,$lastitem); - foreach my $newitem ('course','domains','users') { + my @types = ('course','domains','users','ip'); + foreach my $newitem (@types) { $allnew += $env{'form.new'.$newitem}; } if ($allnew > 0) { my $now = time; my $then = $now + (60*60*24*180); # six months approx. &open_form($r,$url); - foreach my $newitem ('course','domains','users') { - if ($env{'form.new'.$newitem} > 0) { - $r->print('
'.&mt('Add new [_1]-based access control for portfolio file: [_2]',&mt($newitem),$env{'form.currentpath'}.$env{'form.selectfile'}).'

'); - $firstitem = $totalnew; - $lastitem = $totalnew + $env{'form.new'.$newitem}; - $totalnew = $lastitem; - my @numbers; - for (my $i=$firstitem; $i<$lastitem; $i++) { - push (@numbers,$i); - } - &display_access_row($r,$status,$newitem,\@numbers, - $access_controls{$file_name},$now,$then); + my %showtypes = ( + course => 'course/community', + domains => 'domain', + users => 'user', + ip => 'IP', + ); + foreach my $newitem (@types) { + next if ($env{'form.new'.$newitem} <= 0); + $r->print( + '

' + .&mt('Add new [_1]'.$showtypes{$newitem}.'-based[_2] access control for portfolio file: [_3]', + '','', + '' + .$env{'form.currentpath'}.$env{'form.selectfile'}.'') + .'

'); + $firstitem = $totalnew; + $lastitem = $totalnew + $env{'form.new'.$newitem}; + $totalnew = $lastitem; + my @numbers; + for (my $i=$firstitem; $i<$lastitem; $i++) { + push(@numbers,$i); } + &display_access_row($r,$status,$newitem,\@numbers, + $access_controls{$file_name},$now,$then); } &close_form($r,$url); } else { @@ -1092,9 +1221,11 @@ sub update_access { 'currentpath' => $env{'form.currentpath'}, 'access' => $env{'form.selectfile'} ); - $r->print('
'.&make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file'))); + my @actions; + push(@actions, &make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file'))); delete $anchor_fields{'access'}; - $r->print('     '.&make_anchor($url,\%anchor_fields,&mt('Return to directory'))); + push(@actions, &make_anchor($url,\%anchor_fields,&mt('Return to directory'))); + $r->print('
'.&Apache::lonhtmlcommon::actionbox(\@actions)); } return; } @@ -1167,6 +1298,13 @@ sub build_access_record { 'udom' => $udom }); } + } elsif ($scope eq 'ip') { + my $ipslist = $env{'form.ips_'.$num}; + $ipslist =~ s/\s+//sg; + my %ipshash = map { ($_,1) } (split(/,/,$ipslist)); + foreach my $ip (keys(%ipshash)) { + push(@{$record->{'ip'}},$ip); + } } return $record; } @@ -1192,6 +1330,13 @@ sub sort_users { return $curr_user_list; } +sub sort_ips { + my ($ips) = @_; + if (ref($ips) eq 'ARRAY') { + return join(",\n",sort(@{$ips})); + } +} + sub access_setting_table { my ($r,$url,$filename,$access_controls,$action) = @_; my ($public,$publictext); @@ -1201,6 +1346,7 @@ sub access_setting_table { my @courses = (); my @domains = (); my @users = (); + my @ips = (); my $now = time; my $then = $now + (60*60*24*180); # six months approx. my ($num,$scope,$publicnum,$guestnum); @@ -1223,6 +1369,8 @@ sub access_setting_table { push(@domains,$key); } elsif ($scope eq 'users') { push(@users,$key); + } elsif ($scope eq 'ip') { + push(@ips,$key); } } $acl_count{$scope} ++; @@ -1234,7 +1382,7 @@ sub access_setting_table { $guesttext,$access_controls,%conditionals); } else { &condition_setting($r,$access_controls,$now,$then,\%acl_count, - \@domains,\@users,\@courses); + \@domains,\@users,\@courses,\@ips); } $r->print(''); } @@ -1279,14 +1427,14 @@ sub standard_settings { $r->print(&Apache::loncommon::end_data_table_row()); $r->print(&Apache::loncommon::end_data_table()); $r->print(' '. - ''); + ''); my $numconditionals = 0; my $conditionstext; my %cond_status; - foreach my $scope ('domains','users','course') { + foreach my $scope ('domains','users','course','ip') { $numconditionals += $acl_count->{$scope}; if ($acl_count->{$scope} > 0) { - if ($conditionstext ne 'Active') { + if ($conditionstext ne 'Active') { foreach my $key (keys(%{$conditionals{$scope}})) { $conditionstext = &acl_status($start->{$key},$end->{$key},$now); if ($conditionstext eq 'Active') { @@ -1317,24 +1465,20 @@ sub standard_settings { &build_access_summary($r,$count,$chg,%conditionals); $r->print(&Apache::loncommon::end_data_table()); } else { - $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt('based on domain, username, or course affiliation.')); + $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt("based on domain, username, course/community affiliation or user's IP address.")); } } sub condition_setting { - my ($r,$access_controls,$now,$then,$acl_count,$domains,$users,$courses) = @_; + my ($r,$access_controls,$now,$then,$acl_count,$domains,$users,$courses,$ips) = @_; $r->print(''); &access_element($r,'domains',$acl_count,$domains,$access_controls,$now,$then); $r->print(' '); &access_element($r,'users',$acl_count,$users,$access_controls,$now,$then); - $r->print(''); - if ($acl_count->{course} > 0) { - $r->print(''); - } else { - $r->print(''); - } + $r->print(''); &access_element($r,'course',$acl_count,$courses,$access_controls,$now,$then); - $r->print(''); + $r->print(' '); + &access_element($r,'ip',$acl_count,$ips,$access_controls,$now,$then); $r->print(''); } @@ -1351,17 +1495,15 @@ sub acl_status { sub access_element { my ($r,$type,$acl_count,$items,$access_controls,$now,$then) = @_; - my $title = $type; - $title =~ s/s$//; - $title =~ s/^(\w)/uc($1)/e; - $r->print('

'.&mt('[_1]-based conditional access: ',&mt($title))); + my %typetext = ( + domains => 'Domain', + users => 'User', + course => 'Course/Community', + ip => 'IP', + ); + $r->print('

'.&mt($typetext{$type}.'-based conditional access:').' '); if ($$acl_count{$type}) { - $r->print($$acl_count{$type}.' '); - if ($$acl_count{$type} > 1) { - $r->print(&mt('conditions')); - } else { - $r->print(&mt('condition')); - } + $r->print(&mt('[quant,_1,condition]',$$acl_count{$type})); } else { $r->print(&mt('Off')); } @@ -1372,17 +1514,29 @@ sub access_element { sub display_access_row { my ($r,$status,$type,$items,$access_controls,$now,$then) = @_; + my ($showtype, $infotype); + if ($type eq 'course') { + $showtype = &mt('Courses/Communities'); + $infotype = 'Course/Community'; + } elsif ($type eq 'domains') { + $showtype = &mt('Domains'); + $infotype = 'Domain'; + } elsif ($type eq 'users') { + $showtype = &mt('Users'); + $infotype = 'User'; + } elsif ($type eq 'ip') { + $showtype = &mt('IP-based'); + $infotype = 'IP'; + } if (@{$items} > 0) { my @all_doms; my $colspan = 3; - my $uctype = $type; - $uctype =~ s/^(\w)/uc($1)/e; $r->print(&Apache::loncommon::start_data_table()); $r->print(&Apache::loncommon::start_data_table_header_row()); - $r->print(''.&mt('Action?').''.&mt($uctype).''. + $r->print(''.&mt('Action?').''.$showtype.''. &mt('Dates available').''); if ($type eq 'course' && $status eq 'old') { - $r->print(''.&mt('Allowed [_1] member affiliations',$type). + $r->print(''.&mt('Allowed course/community affiliations'). ''); $colspan ++; } elsif ($type eq 'domains') { @@ -1398,6 +1552,8 @@ sub display_access_row { $then); } elsif ($type eq 'users') { &users_row($r,$status,$key,$access_controls,$now,$then); + } elsif ($type eq 'ip') { + &ips_row($r,$status,$key,$access_controls,$now,$then); } $r->print(&Apache::loncommon::end_data_table_row()); } @@ -1409,8 +1565,12 @@ sub display_access_row { } $r->print(&Apache::loncommon::end_data_table()); } else { - $r->print(&mt('No [_1]-based conditions defined.',&mt($type)).'
' - .&additional_item($type)); + $r->print( + '

' + .&mt('No '.$infotype.'-based conditions defined') + .'

' + .&additional_item($type) + ); } return; } @@ -1418,6 +1578,7 @@ sub display_access_row { sub course_js { return qq| |; } @@ -1471,17 +1633,20 @@ sub course_row { } my $js = &Apache::loncommon::coursebrowser_javascript($defdom) .&course_js(); - my $uctype = $type; - $uctype =~ s/^(\w)/uc($1)/e; + my $showtype = &mt('Course/Community'); + my $crstype = 'Course'; my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then, $type); $r->print(''.$js.&actionbox($status,$num,$scope).''); if ($status eq 'old') { my $cid = $content->{'domain'}.'_'.$content->{'number'}; my %course_description = &Apache::lonnet::coursedescription($cid); + if ($course_description{'type'} ne '') { + $crstype = $course_description{'type'}; + } $r->print(''.$course_description{'description'}.''); } elsif ($status eq 'new') { - $r->print(''.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,$num.'_1',undef,$uctype).'  '); + $r->print(''.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,$num.'_1',undef,$showtype).'  '); } $r->print(''.&dateboxes($num,$start,$end)); my $newrole_id = 1; @@ -1499,19 +1664,19 @@ sub course_row { $max_id = $role_id; } $max_id ++; - my $role_selects = &role_selectors($num,$role_id,$type,$content,'display'); + my $role_selects = &role_selectors($num,$role_id,$crstype,$content,'display'); $r->print('
'.$role_selects.''); } $r->print(''); } $r->print('
'.&mt('Add a roles-based condition'). - ' {'domain'}','$content->{'number'}', - '$uctype'".')" value="" />'); + '$showtype'".')" value="" />'); $newrole_id = $max_id; } else { - $r->print(''); + $r->print(''); } $r->print(&add_course_role($num,$newrole_id)); $r->print(''); @@ -1532,14 +1697,14 @@ sub domains_row { my ($r,$status,$item,$all_doms,$access_controls,$now,$then) = @_; my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then, 'domains'); - my $dom_select = ''. ' '; if ($status eq 'old') { my $content = $$access_controls{$item}; foreach my $dom (@{$all_doms}) { if ((@{$content->{'dom'}} > 0) && (grep(/^\Q$dom\E$/,@{$content->{'dom'}}))) { - $dom_select .= ''; } else { $dom_select .= ''; @@ -1567,10 +1732,39 @@ sub users_row { $r->print(''.&actionbox($status,$num,$scope).''.&mt("Format for users' username:domain information:").'
sparty:msu,illini:uiuc ... etc.
'.&dateboxes($num,$start,$end).''); } +sub ips_row { + my ($r,$status,$item,$access_controls,$now,$then) = @_; + my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then, + 'ip'); + my $curr_ips_list; + if ($status eq 'old') { + my $content = $$access_controls{$item}; + $curr_ips_list = &sort_ips($content->{'ip'}); + } + $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]', + '*.msu.edu','35.8.3.34','somehostname.pa.msu.edu').'
'. + &mt('Use a comma to separate different ranges.').'
'. + ''. + ''.&dateboxes($num,$start,$end).''); +} + sub additional_item { my ($type) = @_; - my $output = &mt('Add new [_1] condition(s)?',&mt($type)).' '.&mt('Number to add: ').''; - return $output; + my $showtype; + if ($type eq 'course') { + $showtype = 'course/community'; + } elsif ($type eq 'domains') { + $showtype = 'domain'; + } elsif ($type eq 'users') { + $showtype = 'user'; + } elsif ($type eq 'ip') { + $showtype = 'IP'; + } + return + &mt('Add new '.$showtype.'-based condition(s)?') + .' '.&mt('Number to add: ') + .''; } sub actionbox { @@ -1578,7 +1772,7 @@ sub actionbox { my $output = ''; + $output .= ''; return $output; } @@ -1640,10 +1834,12 @@ sub role_selectors { $cdom = $env{'form.cdom'}; $cnum = $env{'form.cnum'}; } - my $uctype = $type; - $uctype =~ s/^(\w)/uc($1)/e; + my $crstype = 'Course'; + if ($cnum =~ /^$match_community$/) { + $crstype = 'Community' + } my ($sections,$groups,$allroles,$rolehash,$accesshash) = - &Apache::loncommon::get_secgrprole_info($cdom,$cnum,1,$uctype); + &Apache::loncommon::get_secgrprole_info($cdom,$cnum,1,$crstype); if (!@{$sections}) { @{$sections} = ('none'); } else { @@ -1676,12 +1872,12 @@ sub role_selectors { 'group' => $groups, ); foreach my $item ('role','access','section','group') { - $output .= ''."\n"; foreach my $entry (@{$allitems{$item}}) { if ($caller eq 'display') { if ((@{$$content{'roles'}{$role_id}{$item}} > 0) && (grep(/^\Q$entry\E$/,@{$$content{'roles'}{$role_id}{$item}}))) { - $output .= ' '; next; } @@ -1738,19 +1934,45 @@ function getIndexByName(item) { END_SCRIPT - $r->print(&mt('Select roles, course status, section(s) and group(s) for users who will be able to access the portfolio file.')); - $r->print('
'.$role_selects.'
'.&mt('Roles').''.&mt('[_1] status',$type).''.&mt('Sections').''.&mt('Groups').'

'); + $r->print( + '

' + .&mt('Select roles, '.lc($type).' status, section(s) and group(s) for users' + .' who will be able to access the portfolio file.') + .'

' + ); + $r->print( + '' + .'' + .'' + .'' + .'' + .'' + .''.$role_selects.'' + .'
'.&mt('Roles').''.&mt("$type status").''.&mt('Sections').''.&mt('Groups').'

' + .'' + ); return; } sub select_files { - my ($r) = @_; + my ($r,$dir_list) = @_; if ($env{'form.continue'} eq 'true') { # here we update the selections for the currentpath # eventually, have to handle removing those not checked, but . . . my @items=&Apache::loncommon::get_env_multiple('form.checkfile'); if (scalar(@items)){ - &Apache::lonnet::save_selected_files($env{'user.name'}, $env{'form.currentpath'}, @items); + my @ok_items; + if (ref($dir_list) eq 'ARRAY') { + foreach my $dir_line (@{$dir_list}) { + my ($filename,undef,undef,undef,undef,undef,undef,undef,$size)=split(/\&/,$dir_line,10); + if (grep(/^\Q$filename\E$/,@items)) { + if ($size) { + push(@ok_items,$filename); + } + } + } + } + &Apache::lonnet::save_selected_files($env{'user.name'}, $env{'form.currentpath'}, @ok_items); } } else { #empty the file for a fresh start @@ -1803,111 +2025,293 @@ ENDSMP ); } - -sub check_for_upload { - my ($path,$fname,$group,$element) = @_; - my $disk_quota = &get_quota($group); - my $filesize = (length($env{'form.'.$element})) / 1000; #express in k (1024?) - my $portfolio_root = &get_portfolio_root(); - my $port_path = &get_port_path(); - my ($uname,$udom) = &get_name_dom($group); - # Fixme --- Move the checking for existing file to LOND error return - my @dir_list=&get_dir_list($portfolio_root,$path,$group); - my $found_file = 0; - my $locked_file = 0; - foreach my $line (@dir_list) { - my ($file_name)=split(/\&/,$line,2); - if ($file_name eq $fname){ - $file_name = $path.$file_name; - $file_name = &prepend_group($file_name); - $found_file = 1; - if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') { - $locked_file = 1; - } - } - } - my $getpropath = 1; - my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath); - - if (($current_disk_usage + $filesize) > $disk_quota){ - my $msg = ''. - &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.',''.$fname.'',$filesize).''. - '
'.&mt('Disk quota is [_1] kilobytes. Your current disk usage is [_2] kilobytes.',$disk_quota,$current_disk_usage); - return ('will_exceed_quota',$msg); - } elsif ($found_file) { - if ($locked_file) { - my $msg = ''; - $msg .= &mt('Unable to upload [_1]. A locked file by that name was found in [_2].',''.$fname.'',''.$port_path.$env{'form.currentpath'}.''); - $msg .= '
'; - $msg .= &mt('You will be able to rename or delete existing [_1] after a grade has been assigned.',''.$fname.''); - return ('file_locked',$msg); - } else { - my $msg = ''; - $msg .= &mt('Unable to upload [_1]. A file by that name was found in [_2].',''.$fname.'',$port_path.$env{'form.currentpath'}); - $msg .= ''; - $msg .= '
'; - $msg .= &mt('To upload, rename or delete existing [_1] in [_2].',''.$fname.'', $port_path.$env{'form.currentpath'}); - return ('file_exists',$msg); - } - } -} - sub upload { my ($r,$url,$group)=@_; - my $fname=&Apache::lonnet::clean_filename($env{'form.uploaddoc.filename'}); + my $formname = 'uploaddoc'; + my $fname = &Apache::lonnet::clean_filename($env{'form.'.$formname.'.filename'}); + my ($state,$msg); + if ($fname eq '') { + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '. + 'so after eliminating special characters there was nothing left.', + ''.$env{'form.uploaddoc.filename'}.''),1))); + + $r->print(&done(undef,$url)); + return; + } my $disk_quota = &get_quota($group); my $portfolio_root = &get_portfolio_root(); my $port_path = &get_port_path(); my ($uname,$udom) = &get_name_dom($group); my $getpropath = 1; my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath); - my ($state,$msg) = + ($state,$msg) = &Apache::loncommon::check_for_upload($env{'form.currentpath'},$fname, - $group,'uploaddoc',$portfolio_root, + $group,$formname,$portfolio_root, $port_path,$disk_quota, $current_disk_usage,$uname,$udom); if ($state eq 'will_exceed_quota' || $state eq 'file_locked' - || $state eq 'file_exists' ) { - $r->print($msg.&done('Back',$url)); + || $state eq 'zero_bytes') { + $r->print($msg.&done(undef,$url)); return; } - my (%allfiles,%codebase,$mode); - if ($env{'form.uploaddoc.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) { + my (%allfiles,%codebase,$mode,$mimetype); + if ($env{'form.'.$formname.'.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) { if ($env{'form.parserflag'}) { $mode = 'parse'; } } + my $context; + if ($state eq 'existingfile') { + $context = $state; + } + my $subdir = $port_path.$env{'form.currentpath'}; + $subdir =~ s{(/)$}{}; + my ($result,$timestamp) = + &Apache::lonnet::userfileupload($formname,$context,$subdir, + $mode,\%allfiles,\%codebase,undef,undef, + undef,undef,undef,undef,\$mimetype); + if ($state eq 'existingfile') { + my $group_elem; + my $rootdir = $r->dir_config('lonDaemons').'/tmp/overwrites'; + if ($group eq '') { + $rootdir .= '/'.$env{'user.domain'}.'/'.$env{'user.name'}; + } else { + $rootdir .= '/'.$env{'course.'.$env{'request.course.id'}.'.domain'}. + '/'.$env{'course.'.$env{'request.course.id'}.'.num'}; + $group_elem = ''; + } + if (($result eq $rootdir.'/'.$port_path.$env{'form.currentpath'}.$fname) && ($timestamp =~ /^\d+$/)) { + my $showfname = &HTML::Entities::encode($fname,'&<>"'); + my %lt = &Apache::lonlocal::texthash ( + over => 'Overwrite existing file?', + yes => 'Yes', + no => 'No', + undo => 'This action can not be undone.', + conf => 'Are you sure you want to overwrite an existing file?', + cont => 'Continue', + ); + my $parserflag; + my $hidden = &hidden_elems(); + if ($mode eq 'parse') { + $parserflag = ''; + } + $r->print(<<"END"); + +

+$msg +

+ +

$lt{'over'} +  +

+

+ + + +$hidden +$parserflag +$group_elem + +

+
+END + } else { + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('An error occurred ([_1]) while trying to upload [_2].' + ,$result,&display_file(undef,$fname)),1))); + $r->print(&done(undef,$url)); + } + } elsif ($result !~ m|^/uploaded/|) { + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('An error occurred ([_1]) while trying to upload [_2].' + ,$result,&display_file(undef,$fname)),1))); + $r->print(&done(undef,$url)); + } else { + if (!&suppress_embed_prompt()) { + if ($mimetype eq 'text/html') { + if (keys(%allfiles) > 0) { + &print_dependency_form($r,$url,\%allfiles,\%codebase,$result); + return; + } else { + $r->print('

'.&mt('No embedded items identified.').'

'); + } + } + } + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('File successfully uploaded')))); + $r->print(&done(undef,$url)); + } + return; +} + +sub hidden_elems { + my $contelem; + if ($env{'form.mode'} eq 'selectfile') { + $contelem = ''; + } + return < + + + + +$contelem +END +} + +sub print_dependency_form { + my ($r,$url,$allfiles,$codebase,$result) = @_; + my $container = &HTML::Entities::encode($result,'<>"&'); + my $state = &embedded_form_elems($container); + my ($embedded,$num,$pathchg) = &Apache::loncommon::ask_for_embedded_content($url,$state,$allfiles,$codebase, + {'error_on_invalid_names' => 1, + 'ignore_remote_references' => 1,}); + if ($embedded) { + if ($num || $pathchg) { + $r->print('

'.&mt("Reference Warning").'

'); + } else { + $r->print('

'.&mt("Reference Information").'

'); + } + if ($num) { + $r->print('

'.&mt('Completed upload of the file.').' '. + &mt('This file contained references to other files.').' '. + &mt('You must upload the referenced files or else the uploaded file may not work properly.'). + '

'. + '

'.&mt("Please select the locations from which the referenced files are to be uploaded.").'

'. + $embedded. + '

'.&mt('or').'

'.&done('Return to directory',$url)); + } else { + $r->print('

'.&mt("Completed upload of the file. This file contained references to other files.").'

'. + $embedded. + '

'.&done('Return to directory',$url).'

'); + } + } else { + $r->print(&done(undef,$url)); + } + return; +} + +sub overwrite { + my ($r,$url,$group)=@_; + my $formname = 'existingfile'; + my $port_path = &get_port_path(); + my $fname = &Apache::lonnet::clean_filename($env{'form.filename'}); + my (%allfiles,%codebase,$mode,$mimetype); + unless (&suppress_embed_prompt()) { + if ($env{'form.parserflag'}) { + if ($fname =~ /\.s?html?$/i) { + $mode = 'parse'; + } + } + } + if ($fname eq '') { + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '. + 'so after eliminating special characters there was nothing left.', + ''.$env{'form.filename'}.''),1))); + $r->print(&done(undef,$url)); + return; + } + $env{'form.'.$formname.'.filename'} = $fname; + my $subdir = $port_path.$env{'form.currentpath'}; + $subdir =~ s{(/)$}{}; my $result= - &Apache::lonnet::userfileupload('uploaddoc','', - $port_path.$env{'form.currentpath'}, - $mode,\%allfiles,\%codebase); + &Apache::lonnet::userfileupload($formname,'overwrite',$subdir,$mode, + \%allfiles,\%codebase,undef,undef,undef, + undef,undef,undef,\$mimetype); if ($result !~ m|^/uploaded/|) { - $r->print(''.&mt('An error occurred ([_1]) while trying to upload [_2].' - ,$result,&display_file()).'
'); - $r->print(&done('Back',$url)); - } else { - if (%allfiles) { - if (!&suppress_embed_prompt()) { - my $state = < - - - -STATE - $r->print("

".&mt("Reference Warning")."

"); - $r->print("

".&mt("Completed upload of the file. This file contained references to other files. You must upload the referenced files or else the uploaded file may not work properly.")."

"); - $r->print("

".&mt("Please select the locations from which the referenced files are to be uploaded.")."

"); - $r->print(&Apache::loncommon::ask_for_embedded_content('/adm/portfolio',$state,\%allfiles,\%codebase, - {'error_on_invalid_names' => 1, - 'ignore_remote_references' => 1,})); - $r->print('

Or '.&done('Return to directory',$url).'

'); + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('An error occurred ([_1]) while trying to overwrite [_2].' + ,$result,&display_file(undef,$fname)),1))); + } else { + if ($mode eq 'parse') { + if ($mimetype eq 'text/html') { + if (keys(%allfiles) > 0) { + &print_dependency_form($r,$url,\%allfiles,\%codebase,$result); + return; + } else { + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('Overwriting completed.')) + .'
'.&mt('No embedded items identified.'))); + } } - } else { - $r->print(&done(undef,$url)); - } + } else { + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('Overwriting completed.')))); + } + } + + my $group_elem; + if (defined($env{'form.group'})) { + $group_elem = ''; + if (defined($env{'form.ref'})) { + $group_elem .= ''."\n"; + } } + my $hidden = &hidden_elems(); + $r->print( + &Apache::lonhtmlcommon::actionbox( + ['' + .&mt('Return to directory') + .'']) + .'
' + .$hidden + .$group_elem + .'
' + ); + return; } sub lock_info { @@ -1926,7 +2330,7 @@ sub lock_info { $filetext = ''.$env{'form.lockinfo'}. ' (group: '.$group.')'; } else { - $filetext = ''.$file_name.''; + $filetext = ''.$file_name.''; } my $title =''.&Apache::lonnet::gettitle($$array_item[0]). @@ -1949,49 +2353,73 @@ sub lock_info { } } } - $r->print(&done(&mt('Back'),$url)); + $r->print(&done(undef,$url)); return 'ok'; } sub createdir { my ($r,$url,$group)=@_; my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'}); + # Display warning in case of directory name cleaning has changed the directory name + if ($newdir ne $env{'form.newdir'}) { + $r->print( + '

' + .&mt('Invalid characters') + .'
' + .&mt('The new directory name was changed from [_1] to [_2].' + ,''.$env{'form.newdir'}.'' + ,''.$newdir.'') + .'

' + ); + } + + # Directory name empty? if ($newdir eq '') { - $r->print(''. - &mt("Error: no directory name was provided."). - '
'); - $r->print(&done(undef,$url)); - return; + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('Error: no directory name was provided.'),1))); + $r->print(&done(undef,$url)); + return; } + my $portfolio_root = &get_portfolio_root(); - my @dir_list=&get_dir_list($portfolio_root,undef,$group); + my ($dirlistref,$listerror) = &get_dir_list($portfolio_root,undef,$group); my $found_file = 0; - foreach my $line (@dir_list) { - my ($filename)=split(/\&/,$line,2); - if ($filename eq $newdir){ - $found_file = 1; + if (ref($dirlistref) eq 'ARRAY') { + foreach my $line (@{$dirlistref}) { + my ($filename)=split(/\&/,$line,2); + if ($filename eq $newdir){ + $found_file = 1; + } } } - if ($found_file){ - $r->print('' - .&mt('Unable to create a directory named [_1].',''.$newdir.'') - .' '.&mt('A file or directory by that name already exists.').'
'); + if ($found_file) { + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('Unable to create a directory named [_1].' + ,''.$newdir.''),1) + .'
'.&mt('A file or directory by that name already exists.'))); } else { my ($uname,$udom) = &get_name_dom($group); my $port_path = &get_port_path(); my $result=&Apache::lonnet::mkdiruserfile($uname,$udom, $port_path.$env{'form.currentpath'}.$newdir); if ($result ne 'ok') { - $r->print('' - .&mt('An error occurred ([_1]) while trying to create a new directory [_2].' - ,$result,&display_file()) - .'
'); + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('An error occurred ([_1]) while trying to create a new directory [_2].' + ,$result,&display_file()),1))); + + } else { + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('Directory successfully created')))); } } - if ($newdir ne $env{'form.newdir'}) { - $r->print(&mt('The new directory name was changed from [_1] to [_2].' - ,''.$env{'form.newdir'}.'',''.$newdir.'')); - } $r->print(&done(undef,$url)); } @@ -2021,7 +2449,7 @@ sub get_group_quota { if (%curr_groups) { my %group_info = &Apache::longroup::get_group_settings( $curr_groups{$group}); - $group_quota = $group_info{'quota'}; #expressed in Mb + $group_quota = $group_info{'quota'}; #expressed in MB if ($group_quota) { $group_quota = 1000 * $group_quota; #expressed in k } @@ -2079,12 +2507,13 @@ sub get_port_path { sub missing_priv { my ($r,$url,$priv) = @_; - my $longtext = { + my %longtext = + &Apache::lonlocal::texthash( upload => 'upload files', delete => 'delete files', rename => 'rename files', setacl => 'set access controls for files', - }; + ); my $escpath = &HTML::Entities::encode($env{'form.currentpath'},'&<>"'); my $rtnlink = 'print(' '.&mt("in the group's group portfolio.")); $rtnlink .= &group_args() } else { - $r->print(&mt('in this portfolio.')); + $r->print(' '.&mt('in this portfolio.')); } $rtnlink .= '">'.&mt('Return to directory').''; $r->print('
'.$rtnlink); - $r->print(&Apache::loncommon::end_page()); return; } @@ -2121,13 +2549,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; } @@ -2143,8 +2573,8 @@ sub get_quota { } } else { $disk_quota = &Apache::loncommon::get_user_quota($env{'user.name'}, - $env{'user.domain'}); #expressed in Mb - $disk_quota = 1000 * $disk_quota; # convert from Mb to kb + $env{'user.domain'}); #expressed in MB + $disk_quota = 1024 * $disk_quota; # convert from MB to kB } return $disk_quota; } @@ -2159,6 +2589,72 @@ sub suppress_embed_prompt { return $suppress_prompt; } +sub embedded_form_elems { + my ($container) = @_; + my $state = < + + + + +STATE + if ($env{'form.group'} ne '') { + $state .= ''."\n"; + } + return $state; +} + +# Find space available in a user's portfolio (convert to bytes) +sub free_space { + my ($group) = @_; + my $disk_quota = &get_quota($group); # Expressed in kB + my ($uname,$udom) = &get_name_dom($group); + my $portfolio_root = &get_portfolio_root(); + my $getpropath = 1; + my $current_disk_usage = &Apache::lonnet::diskusage($udom, $uname, + $portfolio_root, $getpropath); # Expressed in kB + my $free_space = 1024 * ($disk_quota - $current_disk_usage); + 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 @@ -2166,7 +2662,7 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['selectfile','currentpath','meta','lockinfo','currentfile','action', 'fieldname','mode','rename','continue','group','access','setnum', - 'cnum','cdom','type','setroles','showversions','ref']); + 'cnum','cdom','type','setroles','showversions','ref','symb']); my ($uname,$udom,$portfolio_root,$url,$caller,$title,$group,$grp_desc); if ($r->uri =~ m|^(/adm/)([^/]+)|) { $url = $1.$2; @@ -2205,7 +2701,7 @@ sub handler { $r->print(&mt('Not a valid group for this course')); $earlyout = 1; } - $title = &mt('Group files for [_1]', $group); + $title = &mt('Group portfolio for [_1]', $group); } else { $r->print(&mt('Invalid group')); $earlyout = 1; @@ -2233,7 +2729,7 @@ sub handler { } else { ($uname,$udom) = &get_name_dom(); $portfolio_root = &get_portfolio_root(); - $title = &mt('Portfolio Manager'); + $title = 'My Space'; $can_modify = 1; $can_delete = 1; $can_upload = 1; @@ -2245,53 +2741,135 @@ sub handler { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; # Give the LON-CAPA page header + my $brcrum = [{href=>"/adm/portfolio",text=>"Portfolio Manager"}]; + + my $js = ''; + if ($env{"form.mode"} eq 'selectfile'){ - $r->print(&Apache::loncommon::start_page($title,undef, + $r->print(&Apache::loncommon::start_page($title, $js, {'only_body' => 1})); } elsif ($env{'form.action'} eq 'rolepicker') { - $r->print(&Apache::loncommon::start_page('New role-based condition',undef, + $r->print(&Apache::loncommon::start_page('New role-based condition', $js, {'no_nav_bar' => 1, })); + } elsif ($caller eq 'coursegrp_portfolio') { + $r->print(&Apache::loncommon::start_page($title, $js)); } else { - $r->print(&Apache::loncommon::start_page($title)); + $r->print(&Apache::loncommon::start_page($title, $js, + {'bread_crumbs' => $brcrum})); + if (!&Apache::lonnet::usertools_access($uname,$udom,'portfolio')) { + $r->print('

'.&mt('No user portfolio available') .'

'. + &mt('This is a result of one of the following:').'
    '. + '
  • '.&mt('The administrator of this domain has disabled portfolio functionality for this specific user.').'
    • '. + '
  • '.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'
    • '. + '
'); + $r->print(&Apache::loncommon::end_page()); + return OK; + } } $r->rflush(); + # Check if access to portfolio is blocked by one or more blocking events in courses. my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('port',$uname,$udom); if ($blocked) { - $r->print($blocktext); - $r->print(&Apache::loncommon::end_page()); - return OK; - } - if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){ - $r->print(''); - $r->print(&mt('No file was selected to upload.').' '); - $r->print(&mt('To upload a file, click Browse... and select a file, then click Upload.')); - $r->print(''); - } + my $evade_block; + # If portfolio display is in a window popped up from a "Select Portfolio Files" + # link in a .task resource, check if access to the task included proctor validation + # of check-in to a slot limited by IP. + # If so, and the slot is between its open and close dates, override the block. + if ($env{'request.course.id'} && $env{'form.symb'}) { + (undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'}); + if ($res =~ /\.task$/i) { + my %history = + &Apache::lonnet::restore($env{'form.symb'},$env{'request.course.id'}, + $env{'user.domain'},$env{'user.name'}); + my $version = $history{'resource.0.version'}; + if ($history{'resource.'.$version.'.0.checkedin'}) { + if ($history{'resource.'.$version.'.0.checkedin.slot'}) { + my %slot = &Apache::lonnet::get_slot($history{'resource.'.$version.'.0.checkedin.slot'}); + if ($slot{'ip'}) { + if (&Apache::loncommon::check_ip_acc($slot{'ip'})) { + my $now = time; + if (($slot{'slottime'} < $now) && ($slot{'endtime'} > $now)) { + $evade_block = 1; + } + } + } + } + } + } + } + unless ($evade_block) { + $r->print($blocktext); + $r->print(&Apache::loncommon::end_page()); + 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( + '

' + .&mt('No file was selected to upload.') + .'
' + .&mt('To upload a file, click [_1]Browse...[_2] and select a file, then click [_1]Upload[_2].' + ,'','') + .'

' + ); + } if ($env{'form.meta'}) { &open_form($r,$url); - $r->print(&mt('Edit the meta data').'
'); + $r->print(&mt('Edit Metadata').'
'); &close_form($r,$url); } - if ($env{'form.store'}) { - } - if ($env{'form.uploaddoc.filename'}) { if ($can_upload) { &upload($r,$url,$group); } else { &missing_priv($r,$url,'upload'); } + } elsif ($env{'form.action'} eq 'process_overwrite') { + if ($can_upload) { + &overwrite($r,$url,$group); + } else { + &missing_priv($r,$url,'existingfile'); + } } elsif ($env{'form.action'} eq 'upload_embedded') { if ($can_upload) { my $disk_quota = &get_quota($group); my $getpropath = 1; my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath); - $r->print( + my $container = &HTML::Entities::encode($env{'form.container'},'<>&"'); + my $state = &embedded_form_elems($container). + ''; + my ($result,$flag) = &Apache::loncommon::upload_embedded('portfolio',$port_path,$uname,$udom, - $group,$portfolio_root,$group,$disk_quota,$current_disk_usage)); - $r->print(&done(undef,$url)); + $group,$portfolio_root,$group,$disk_quota,$current_disk_usage,$state,$url); + $r->print($result.&done('Return to directory',$url)); + } else { + &missing_priv($r,$url,'upload'); + } + } elsif ($env{'form.action'} eq 'modify_orightml') { + if ($can_upload) { + my $result = + &Apache::loncommon::modify_html_refs('portfolio',$port_path,$uname, + $udom,$portfolio_root); + $r->print($result. + &done('Return to directory',$url)); } else { &missing_priv($r,$url,'upload'); } @@ -2361,6 +2939,16 @@ sub handler { } elsif ($env{'form.lockinfo'}) { &lock_info($r,$url,$group); } else { + if ($env{'form.action'} eq 'cancel_overwrite') { + if ($can_upload) { + my $formname = 'existingfile'; + my $fname = &Apache::lonnet::clean_filename($env{'form.filename'}); + $env{'form.'.$formname.'.filename'} = $fname; + my $subdir = $port_path.$env{'form.currentpath'}; + $subdir =~ s{(/)$}{}; + &Apache::lonnet::userfileupload($formname,'canceloverwrite',$subdir); + } + } my $current_path='/'; if ($env{'form.currentpath'}) { $current_path = $env{'form.currentpath'}; @@ -2369,8 +2957,9 @@ sub handler { &Apache::lonhtmlcommon::clear_breadcrumbs(); $r->print(&coursegrp_portfolio_header($udom,$uname,$grp_desc)); } - my @dir_list=&get_dir_list($portfolio_root,$current_path,$group); - if ($dir_list[0] eq 'no_such_dir'){ + my ($dirlistref,$listerror) = + &get_dir_list($portfolio_root,$current_path,$group); + if ($listerror eq 'no_such_dir'){ # two main reasons for this: # 1) never been here, so directory structure not created # 2) back-button navigation after deleting a directory @@ -2385,16 +2974,25 @@ sub handler { $current_path = '/'; # force it back to the root } # now grab the directory list again, for the first time - @dir_list=&get_dir_list($portfolio_root,$current_path,$group); + ($dirlistref,$listerror) = + &get_dir_list($portfolio_root,$current_path,$group); } # need to know if directory is empty so it can be removed if desired - my $is_empty=(@dir_list == 2); - &display_common($r,$url,$current_path,$is_empty,\@dir_list, - $can_upload); - &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group, + my $is_empty; + if ($listerror eq 'empty') { + $is_empty = 1; + } elsif (ref($dirlistref) eq 'ARRAY') { + if ((scalar(@{$dirlistref}) == 2) && ($dirlistref->[0] =~ /^\.+\&/) + && ($dirlistref->[1] =~ /^\.+\&/)) { + $is_empty = 1; + } + } + &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); - $r->print(&Apache::loncommon::end_page()); } + $r->print(&Apache::loncommon::end_page()); return OK; } 500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.