--- loncom/interface/portfolio.pm 2004/08/24 21:30:00 1.31 +++ loncom/interface/portfolio.pm 2004/09/10 17:59:13 1.41 @@ -38,127 +38,6 @@ sub make_anchor { return $anchor; } -# returns html with
separated contents of the directory -# returns a currentFile (bolds the selected file/dir) -sub display_directory_old { - my ($currentPath, $currentFile, @dirList,) = @_; - my $displayOut=''; - my $filename; - my $upPath; - if ($currentPath ne '/') { - $displayOut = 'Listing of '.$currentPath.'

'; - # provides the "up one directory level" function - # it means shortening the currentpath to the parent directory - $currentPath =~ m:(^/.*)(/.*/$):; - if ($1 ne '/') { - $upPath = $1.'/'; - } else { - $upPath = $1; - } - - # $displayOut = $displayOut.'..
'; - } else { - # $displayOut = $displayOut.'at root '.$currentPath.'
'; - } - foreach my $line (@dirList) { - #$strip holds directory/file name - #$dom - my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); - if (($filename ne '.') && ($filename ne '..')) { - if ($testdir =~ m:^1:) { - # handle directories different from files - if ($filename eq $currentFile) { - #checks to bold the selected file - $displayOut.= ''.(&make_anchor($filename.'/', $filename.'/').'
'."\n"); - } else { - $displayOut.= (&make_anchor($filename.'/', $filename.'/').'
'."\n"); - } - } else { - if ($filename eq $currentFile) { - #checks to bold the selected file - $displayOut.=''.(&make_anchor($filename, $currentPath).'
'."\n"); - } else { - $displayOut.=(&make_anchor($filename, $currentPath).'
'."\n"); - } - } - - } - - } - return $displayOut; -} - -sub displayActions { - # returns html to offer user appropriate actions depending on selected file/directory - my $displayOut; - my ($currentPath, $currentFile, $isEmpty) = @_; -# $displayOut = 'here are actions for '.$currentFile; - if ($currentFile =~ m:/$:) { - # if the selected file is a directory, these are the options - # offer the chance to delete the directory only if it is empty - if ($isEmpty && ($currentPath ne '/')) { - $displayOut = $displayOut.'
- - - -
- -
-
'; - } - if ($currentPath ne '/') { - $displayOut = $displayOut.'
-
- - - - - -
'; - } - } else { #action options offered for files - $displayOut = $displayOut.'
'; - $displayOut = $displayOut.' - -
- -
-
'; - - $displayOut = $displayOut.'
-
- - - - - -
-
'; - } - $displayOut = $displayOut.'
Add a file to '.$currentPath; - # file upload form - $displayOut = $displayOut.'
'; - $displayOut = $displayOut.''. - ''. - ''. - '

'; - $displayOut = $displayOut.'
- - -
- '; - return $displayOut; -} - my $dirptr=16384; sub display_directory { my ($r,$current_path,$is_empty,$dir_list)=@_; @@ -190,6 +69,7 @@ sub display_directory { } $r->print(''); &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path); + #Fixme -- remove from recent those paths that are deleted $r->print('
'. &Apache::lonhtmlcommon::select_recent('portfolio','currentpath', 'this.form.submit();')); @@ -207,7 +87,7 @@ sub display_directory { } $r->print(''. ''); - my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio/$current_path/"; + my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path"; foreach my $line (sort { my ($afile)=split('&',$a,2); @@ -226,20 +106,20 @@ sub display_directory { } else { $r->print(''); $r->print(''); + + + + + + + '); $r->print(''); $r->print(''); + $filename.''); $r->print(''); $r->print(''); $r->print(''); @@ -321,16 +201,28 @@ sub delete_dir { sub delete_dir_confirmed { my ($r)=@_; my $directory_name = $ENV{'form.currentpath'}; - $r->print('
'.$directory_name.'
'); $directory_name =~ m/\/$/; $directory_name = $`; my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'}, $ENV{'user.domain'},'portfolio'. $directory_name); + if ($result ne 'ok') { $r->print(' An error occured (dir) ('.$result. -# ') while trying to delete '.&display_file().'
'); ') while trying to delete '.$directory_name.'
'); + } else { + # now remove from recent +# $r->print('
removing '.$directory_name.'
print(&done()); } @@ -367,33 +259,76 @@ sub rename_confirmed { sub upload { my ($r)=@_; - #FIXME if the file already exists we need to do a confirmation pass - #before overwriting - my $result=&Apache::lonnet::userfileupload('uploaddoc','', - 'portfolio'.$ENV{'form.currentpath'}); - if ($result !~ m|^/uploaded/|) { - $r->print(' An errror occured ('.$result. - ') while trying to upload '.&display_file().'
'); + 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); + my $found_file = 0; + foreach my $line (@dir_list) { + my ($filename)=split(/\&/,$line,2); + if ($filename eq $fname){ + $found_file = 1; + } + } + 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 { + my $result=&Apache::lonnet::userfileupload('uploaddoc','', + 'portfolio'.$ENV{'form.currentpath'}); + if ($result !~ m|^/uploaded/|) { + $r->print(' An errror occured ('.$result. + ') while trying to upload '.&display_file().'
'); + } } $r->print(&done()); } 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()); } @@ -401,6 +336,9 @@ sub createdir { sub handler { # this handles file management my $r = shift; + my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'}, + $ENV{'user.name'}). + '/userfiles/portfolio'; &Apache::loncommon::no_cache($r); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -413,7 +351,20 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['selectfile','currentpath', 'currentfile']); - + # make sure there is a portfolio directory off /userfiles + # Fixme -- Do this in a better way -- offload it to the LOND routine + my @dir_list=&Apache::lonnet::dirlist('/', + $ENV{'user.domain'}, + $ENV{'user.name'},$portfolio_root); + if ($dir_list[0] eq 'no_such_dir'){ + &Apache::lonnet::mkdiruserfile($ENV{'user.name'}, + $ENV{'user.domain'},'portfolio'); + } + 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'}) { @@ -435,11 +386,7 @@ sub handler { if ($ENV{'form.currentpath'}) { $current_path = $ENV{'form.currentpath'}; } - - my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'}, - $ENV{'user.name'}). - '/userfiles/portfolio'; - my @dir_list=&Apache::lonnet::dirlist($current_path, + @dir_list=&Apache::lonnet::dirlist($current_path, $ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root);
Actions NameSizeLast Modified
- - - - - - -
'. - $filename.''.$size.''.&Apache::lonlocal::locallocaltime($mtime).'