"); - if ($is_empty) { - $displayOut = ''; - $r->print($displayOut); + $r->print($display_out); return; } $r->print('
| Actions | Name | Size | Last Modified | |
|---|---|---|---|---|
 | ');
@@ -226,20 +127,20 @@ sub display_directory {
} else {
$r->print('||||
| - - | '); + + '); $r->print(' | ');
$r->print(''. - $filename.' | '); + $filename.''); $r->print(''.$size.' | '); $r->print(''.&Apache::lonlocal::locallocaltime($mtime).' | '); $r->print('
| Select | Name | Size | Last Modified |
|---|
'.&mt('Done').'
'); + $ENV{'form.currentpath'}. + '&fieldname='.$ENV{'form.fieldname'}. + '">'.&mt('Done').''); } sub delete { @@ -331,6 +288,9 @@ sub delete_dir_confirmed { $r->print(' An error occured (dir) ('.$result. ') while trying to delete '.$directory_name.''); } else { + # now remove from recent +# $r->print('
removing '.$directory_name.'
print(&done()); } - +sub select_files { + my ($r)=@_; + my $java_script =(<
Select portfolio files
+ Check as many as you wish in response to the essay problem."); +} sub upload { my ($r)=@_; my $fname=$ENV{'form.uploaddoc.filename'}; + my $filesize = (length($ENV{'form.uploaddoc'})) / 1000; #express in k (1024?) + my $disk_quota = 20000; # expressed in k $fname=&Apache::lonnet::clean_filename($fname); my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'}, $ENV{'user.name'}). '/userfiles/portfolio'; + # Fixme --- Move the checking for existing file to LOND error return my @dir_list=&Apache::lonnet::dirlist($ENV{'form.currentpath'}, $ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root); @@ -390,7 +376,12 @@ sub upload { $found_file = 1; } } - if ($found_file){ + my $current_disk_usage = &Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root); + if (($current_disk_usage + $filesize) > $disk_quota){ + $r->print('Unable to upload '.$fname.' (size = '.$filesize.' kilobytes. Disk quota will be exceeded.'. + '
Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.'); + } + elsif ($found_file){ $r->print('Unable to upload '.$fname.', a file by that name was found in '.$ENV{'form.currentpath'}.''. '
To upload, rename or delete existing '.$fname.' in '.$ENV{'form.currentpath'}); } else { @@ -406,20 +397,37 @@ sub upload { sub createdir { my ($r)=@_; - #FIXME 1) file exists in place of dir (errormessage needs improvement) my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'}); if ($newdir eq '') { - $r->print(''. - &mt("Error: no valid directory name was provided."). - '
'); - $r->print(&done()); - return; + $r->print(''. + &mt("Error: no directory name was provided."). + '
'); + $r->print(&done()); + return; } - my $result=&Apache::lonnet::mkdiruserfile($ENV{'user.name'}, - $ENV{'user.domain'},'portfolio'.$ENV{'form.currentpath'}.$newdir); - if ($result ne 'ok') { - $r->print(' An errror occured ('.$result. - ') while trying to create a new directory '.&display_file().'
'); + my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'}, + $ENV{'user.name'}). + '/userfiles/portfolio'; + my @dir_list=&Apache::lonnet::dirlist($ENV{'form.currentpath'}, + $ENV{'user.domain'}, + $ENV{'user.name'},$portfolio_root); + my $found_file = 0; + foreach my $line (@dir_list) { + my ($filename)=split(/\&/,$line,2); + if ($filename eq $newdir){ + $found_file = 1; + } + } + if ($found_file){ + $r->print(' Unable to create a directory named '.$newdir. + ' a file or directory by that name already exists.
'); + } else { + my $result=&Apache::lonnet::mkdiruserfile($ENV{'user.name'}, + $ENV{'user.domain'},'portfolio'.$ENV{'form.currentpath'}.$newdir); + if ($result ne 'ok') { + $r->print(' An errror occured ('.$result. + ') while trying to create a new directory '.&display_file().'
'); + } } $r->print(&done()); } @@ -427,7 +435,7 @@ sub createdir { sub handler { # this handles file management my $r = shift; - my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'}, + my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'}, $ENV{'user.name'}). '/userfiles/portfolio'; &Apache::loncommon::no_cache($r); @@ -441,8 +449,12 @@ sub handler { $r->rflush(); &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['selectfile','currentpath', - 'currentfile']); - + 'currentfile','action','fieldname','mode']); + if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){ + $r->print(' No file was selected to upload.'. + 'To upload a file, click Browse...'. + ', select a file, then click Upload,'); + } if ($ENV{'form.uploaddoc.filename'}) { &upload($r); } elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) { @@ -467,10 +479,34 @@ sub handler { my @dir_list=&Apache::lonnet::dirlist($current_path, $ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root); - + if ($dir_list[0] 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 + if ($current_path eq '/'){ + &Apache::lonnet::mkdiruserfile($ENV{'user.name'}, + $ENV{'user.domain'},'portfolio'); + } else { + # some directory that snuck in get rid of the directory + # from the recent pulldown, just in case + &Apache::lonhtmlcommon::remove_recent('portfolio', + [$current_path]); + $current_path = '/'; # force it back to the root + } + # now grab the directory list again, for the first time + @dir_list=&Apache::lonnet::dirlist($current_path, + $ENV{'user.domain'}, + $ENV{'user.name'},$portfolio_root); + } # need to know if directory is empty so it can be removed if desired my $is_empty=(@dir_list == 2); - &display_directory($r,$current_path,$is_empty,\@dir_list); + &display_common($r,$current_path,$is_empty,\@dir_list); + if ($ENV{"form.mode"} eq 'selectfile'){ + &select_files($r); + &display_file_select($r,$current_path,$is_empty,\@dir_list); + } else { + &display_directory($r,$current_path,$is_empty,\@dir_list); + } $r->print("