');
+ '">'.&mt($message).'');
}
sub delete {
@@ -273,7 +243,7 @@ sub delete {
if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'} ) eq 'true') {
$r->print ("The file is locked and cannot be deleted. ");
- $r->print(&done());
+ $r->print(&done('Back'));
} else {
if (scalar(@files)) {
&open_form($r);
@@ -291,7 +261,6 @@ sub delete_confirmed {
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
my $result;
foreach my $delete_file (@files) {
- &Apache::lonnet::logthis("trying to delete $delete_file");
$result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
$ENV{'user.domain'},'portfolio'.
$ENV{'form.currentpath'}.
@@ -314,8 +283,7 @@ sub delete_dir {
sub delete_dir_confirmed {
my ($r)=@_;
my $directory_name = $ENV{'form.currentpath'};
- $directory_name =~ m/\/$/;
- $directory_name = $`;
+ $directory_name =~ s|/$||; # remove any trailing slash
my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
$ENV{'user.domain'},'portfolio'.
$directory_name);
@@ -437,31 +405,49 @@ sub upload {
$ENV{'user.domain'},
$ENV{'user.name'},$portfolio_root);
my $found_file = 0;
+ my $locked_file = 0;
foreach my $line (@dir_list) {
- my ($filename)=split(/\&/,$line,2);
- if ($filename eq $fname){
+ my ($file_name)=split(/\&/,$line,2);
+ if ($file_name eq $fname){
$found_file = 1;
+ if (&Apache::lonnet::is_locked($ENV{'form.currentpath'}.$file_name,$ENV{'user.domain'},$ENV{'user.name'} ) eq 'true') {
+ $locked_file = 1;
+ }
}
}
my $current_disk_usage = &Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root);
- if (($current_disk_usage + $filesize) > $disk_quota){
+ if ((($current_disk_usage/1000) + $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.');
+ $r->print(&done('Back'));
}
- 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'});
+ elsif ($found_file){
+ if ($locked_file){
+ $r->print('Unable to upload '.$fname.', a locked file by that name was found in portfolio'.$ENV{'form.currentpath'}.''.
+ ' You will be able to rename or delete existing '.$fname.' after a grade has been assigned.');
+ $r->print(&done('Back'));
+ } else {
+ $r->print('Unable to upload '.$fname.', a file by that name was found in portfolio'.$ENV{'form.currentpath'}.''.
+ ' To upload, rename or delete existing '.$fname.' in portfolio'.$ENV{'form.currentpath'});
+ $r->print(&done('Back'));
+ }
} 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('Back'));
+ } else {
+ $r->print(&done());
}
}
- $r->print(&done());
}
-
+sub lock_info {
+ my ($r) = @_;
+ $r->print("lock info here");
+ return 'ok';
+}
sub createdir {
my ($r)=@_;
my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'});
@@ -496,6 +482,9 @@ sub createdir {
') while trying to create a new directory '.&display_file().' ');
}
}
+ if ($newdir ne $ENV{'form.newdir'}) {
+ $r->print("The new directory name was changed from: ".$ENV{'form.newdir'}." to $newdir ");
+ }
$r->print(&done());
}
@@ -505,23 +494,37 @@ sub handler {
my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
$ENV{'user.name'}).
'/userfiles/portfolio';
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['selectfile','currentpath','meta','lockinfo',
+ 'currentfile','action','fieldname','mode','rename']);
&Apache::loncommon::no_cache($r);
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
# Give the LON-CAPA page header
- $r->print(''.
+ my $html=&Apache::lonxml::xmlbegin();
+ $r->print($html.'<head><title>'.
&mt('Portfolio Manager').
- "\n".
- &Apache::loncommon::bodytag('Portfolio Manager'));
+ "\n");
+ if ($ENV{"form.mode"} eq 'selectfile'){
+ $r->print(&Apache::loncommon::bodytag('Portfolio Manager',undef,undef,1));
+ } else {
+ $r->print(&Apache::loncommon::bodytag('Portfolio Manager'));
+ }
$r->rflush();
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['selectfile','currentpath',
- 'currentfile','action','fieldname','mode','rename']);
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.meta'}) {
+ &open_form($r);
+# $r->print(&edit_meta_data($r, $ENV{'form.currentpath'}.$ENV{'form.selectfile'}));
+ $r->print('Edit the meta data ');
+ &close_form($r);
+ }
+ if ($ENV{'form.store'}) {
+ }
+
if ($ENV{'form.uploaddoc.filename'}) {
&upload($r);
} elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) {
@@ -540,6 +543,8 @@ sub handler {
&rename($r);
} elsif ($ENV{'form.createdir'}) {
&createdir($r);
+ } elsif ($ENV{'form.lockinfo'}) {
+ &lock_info($r);
} else {
my $current_path='/';
if ($ENV{'form.currentpath'}) {
@@ -570,12 +575,7 @@ sub handler {
# need to know if directory is empty so it can be removed if desired
my $is_empty=(@dir_list == 2);
&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);
- }
+ &display_directory($r,$current_path,$is_empty,\@dir_list);
$r->print("