--- loncom/interface/portfolio.pm 2004/08/24 06:51:11 1.26
+++ loncom/interface/portfolio.pm 2004/09/10 20:48:33 1.45
@@ -38,130 +38,9 @@ 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.'Add a file to '.$currentPath;
- # file upload form
- $displayOut = $displayOut.'';
- $displayOut = $displayOut.'
- ';
- return $displayOut;
-}
-
my $dirptr=16384;
sub display_directory {
- my ($r,$current_path,$dir_list)=@_;
+ my ($r,$current_path,$is_empty,$dir_list)=@_;
my $iconpath= $r->dir_config('lonIconsURL') . "/";
$r->print('
');
$r->print('
');
@@ -180,7 +59,7 @@ sub display_directory {
$r->print($displayOut);
$r->print('
');
my @tree = split (/\//,$current_path);
- $r->print(''.&make_anchor('/','/'));
+ $r->print(''.&make_anchor('portfolio','/').'/');
if (@tree > 1){
my $newCurrentPath = '';
for (my $i = 1; $i< @tree; $i++){
@@ -190,13 +69,25 @@ 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(' ");
+ if ($is_empty && ($current_path ne '/')) {
+ $displayOut = '';
+
+ $r->print($displayOut);
+ return;
+ }
$r->print('
'.
'
Actions
Name
Size
Last Modified
');
- 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);
@@ -215,20 +106,20 @@ sub display_directory {
} else {
$r->print('
');
@@ -269,7 +160,10 @@ sub close_form {
}
sub display_file {
- return $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
+ my ($path,$filename)=@_;
+ if (!defined($path)) { $path=$ENV{'form.currentpath'}; }
+ if (!defined($filename)) { $filename=$ENV{'form.selectfile'}; }
+ return ''.$path.$filename.'';
}
sub done {
@@ -291,46 +185,149 @@ sub delete_confirmed {
$ENV{'form.currentpath'}.
$ENV{'form.selectfile'});
if ($result ne 'ok') {
- $r->print(' An errror occured ('.$result.
+ $r->print(' An error occured ('.$result.
') while trying to delete '.&display_file().' ');
}
$r->print(&done());
}
+sub delete_dir {
+ my ($r)=@_;
+ &open_form($r);
+ $r->print('
'.&mt('Delete').' '.&display_file().'?
');
+ &close_form($r);
+}
+
+sub delete_dir_confirmed {
+ my ($r)=@_;
+ my $directory_name = $ENV{'form.currentpath'};
+ $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 '.$directory_name.' ');
+ } else {
+ # now remove from recent
+# $r->print(' removing '.$directory_name.' print(&done());
+}
+
sub rename {
my ($r)=@_;
&open_form($r);
- $r->print('
'.&mt('Rename').' '.&display_file().'?
');
+ $r->print('
'.&mt('Rename').' '.&display_file().' to
+ ?
');
&close_form($r);
}
sub rename_confirmed {
my ($r)=@_;
- &Apache::lonnet::renameuserfile($ENV{'form.currentpath'}.$ENV{'form.selectfile'}, 'rename', $ENV{'form.currentpath'}.$ENV{'form.filenewname'} );
-}
+ my $filenewname=&Apache::lonnet::clean_filename($ENV{'form.filenewname'});
+ if ($filenewname eq '') {
+ $r->print(''.
+ &mt("Error: no valid filename was provided to rename to.").
+ ' ');
+ $r->print(&done());
+ return;
+ }
+ my $result=
+ &Apache::lonnet::renameuserfile($ENV{'user.name'},$ENV{'user.domain'},
+ 'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.selectfile'},
+ 'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.filenewname'});
+ if ($result ne 'ok') {
+ $r->print(' An errror occured ('.$result.
+ ') while trying to rename '.&display_file().' to '.
+ &display_file(undef,$filenewname).' ');
+ }
+ $r->print(&done());
+}
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) bad dirnames ( '/' etc)
- # 2) file exists in place of dir (errormessage needs improvement)
- my $result=&Apache::lonnet::mkdiruserfile($ENV{'user.name'},
- $ENV{'user.domain'},'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.newdir'});
- if ($result ne 'ok') {
- $r->print(' An errror occured ('.$result.
- ') while trying to create a new directory '.&display_file().' ');
+ my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'});
+ if ($newdir eq '') {
+ $r->print(''.
+ &mt("Error: no directory name was provided.").
+ ' ');
+ $r->print(&done());
+ return;
+ }
+ 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());
}
@@ -338,12 +335,9 @@ sub createdir {
sub handler {
# this handles file management
my $r = shift;
- my @dir_list; # will hold directory listing as array
- my $udir; # returned from home server
- my $currentFile; # directory or file contained in $pathToRoot.$current_path
- my $action; # delete, rename, makedirectory, removedirectory,
- my $filenewname; # for rename action (guess what we do with it!)
- my $isFile;
+ 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;
@@ -356,21 +350,24 @@ sub handler {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['selectfile','currentpath',
'currentfile']);
-
- # if we're uploading a file, we need to do it early so it will
- # show in the directory list
-
+ 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'}) {
+ &delete_confirmed($r);
} elsif ($ENV{'form.action'} eq 'delete') {
- if ($ENV{'form.confirmed'}) {
- &delete_confirmed($r);
- } else {
- &delete($r);
- }
+ &delete($r);
+ } elsif ($ENV{'form.action'} eq 'deletedir' && $ENV{'form.confirmed'}) {
+ &delete_dir_confirmed($r);
+ } elsif ($ENV{'form.action'} eq 'deletedir'){
+ &delete_dir($r);
+ } elsif ($ENV{'form.action'} eq 'rename' && $ENV{'form.confirmed'}) {
+ &rename_confirmed($r);
} elsif ($ENV{'form.action'} eq 'rename') {
- # similarly, we need to delete or rename files before getting
- # directory list
&rename($r);
} elsif ($ENV{'form.createdir'}) {
&createdir($r);
@@ -379,24 +376,32 @@ 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';
- @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,\@dir_list);
-
+ 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);
+ $r->print("