--- loncom/interface/portfolio.pm 2010/03/26 23:08:41 1.222 +++ loncom/interface/portfolio.pm 2010/10/29 20:41:43 1.227 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.222 2010/03/26 23:08:41 raeburn Exp $ +# $Id: portfolio.pm,v 1.227 2010/10/29 20:41:43 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -287,7 +287,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(); @@ -304,30 +303,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); + $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').'' @@ -336,12 +322,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').'' @@ -349,6 +341,38 @@ 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; @@ -1889,111 +1913,202 @@ 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 '') { + my $msg = &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'}.''); + $r->print($msg.&done('Back',$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' ) { + || $state eq 'zero_bytes') { $r->print($msg.&done('Back',$url)); return; } my (%allfiles,%codebase,$mode); - if ($env{'form.uploaddoc.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) { + if ($env{'form.'.$formname.'.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) { if ($env{'form.parserflag'}) { $mode = 'parse'; } } - my $result= - &Apache::lonnet::userfileupload('uploaddoc','', + my $context; + if ($state eq 'existingfile') { + $context = $state; + } + my ($result,$timestamp) = + &Apache::lonnet::userfileupload($formname,$context, $port_path.$env{'form.currentpath'}, $mode,\%allfiles,\%codebase); - if ($result !~ m|^/uploaded/|) { + 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', + ); + $r->print(<<"END"); + +$msg +
+$lt{'over'} +  + + + + + + + + +$group_elem +

+ +
+END + } else { + $r->print(''.&mt('An error occurred ([_1]) while trying to upload [_2].' + ,$result,&display_file(undef,$fname)).'
'); + $r->print(&done('Back',$url)); + } + } elsif ($result !~ m|^/uploaded/|) { $r->print(''.&mt('An error occurred ([_1]) while trying to upload [_2].' - ,$result,&display_file()).'
'); + ,$result,&display_file(undef,$fname)).'
'); $r->print(&done('Back',$url)); } else { if (%allfiles) { if (!&suppress_embed_prompt()) { - my $state = <print(&done(undef,$url)); + } + } +} + +sub print_dependency_form { + my ($r,$url,$allfiles,$codebase) = @_; + 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).'

'); + if ($env{'form.group'} ne '') { + $state .= ''."\n"; + } + my $embedded = &Apache::loncommon::ask_for_embedded_content($url,$state,$allfiles,$codebase, + {'error_on_invalid_names' => 1, + 'ignore_remote_references' => 1,}); + if ($embedded) { + $r->print('

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

'. + '

'.&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.").'

'. + '

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

'. + $embedded. + '

Or '.&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); + $mode = $env{'form.mode'}; + if ($mode eq 'parse') { + if ($fname !~ /\.s?html?$/i) { + undef($mode); + } + } + if ($fname eq '') { + my $msg = &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'}.''); + $r->print($msg.&done('Back',$url)); + return; + } + $env{'form.'.$formname.'.filename'} = $fname; + my $result= + &Apache::lonnet::userfileupload($formname,'overwrite', + $port_path.$env{'form.currentpath'}, + $mode,\%allfiles,\%codebase); + if ($result !~ m|^/uploaded/|) { + $r->print(''.&mt('An error occurred ([_1]) while trying to overwrite [_2].' + ,$result,&display_file(undef,$fname)).'
'); + $r->print(&done('Back',$url)); + } else { + if (%allfiles) { + if (!&suppress_embed_prompt()) { + foreach my $file (keys(%allfiles)) { + print STDERR "got $file\n"; + } + &print_dependency_form($r,$url,\%allfiles,\%codebase); + } else { + $r->print(&done(undef,$url)); } - } else { - $r->print(&done(undef,$url)); - } + } else { + $r->print(&done(undef,$url)); + } } + return; } sub lock_info { @@ -2190,7 +2305,6 @@ sub missing_priv { } $rtnlink .= '">'.&mt('Return to directory').''; $r->print('
'.$rtnlink); - $r->print(&Apache::loncommon::end_page()); return; } @@ -2362,26 +2476,29 @@ sub handler { $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(''); - } + 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(''); + } if ($env{'form.meta'}) { &open_form($r,$url); $r->print(&mt('Edit the meta data').'
'); &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); @@ -2461,6 +2578,15 @@ 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; + &Apache::lonnet::userfileupload($formname,'canceloverwrite', + $port_path.$env{'form.currentpath'}); + } + } my $current_path='/'; if ($env{'form.currentpath'}) { $current_path = $env{'form.currentpath'}; @@ -2493,8 +2619,8 @@ sub handler { $can_upload,$group); &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$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.