--- loncom/interface/portfolio.pm 2004/12/12 01:35:44 1.65 +++ loncom/interface/portfolio.pm 2004/12/16 21:19:46 1.68 @@ -148,9 +148,6 @@ sub display_file_select { my $iconpath= $r->dir_config('lonIconsURL') . "/"; my $display_out; my $checked_files = &Apache::lonnet::files_in_path($ENV{'user.name'}, $ENV{'form.currentpath'}); - foreach my $key (keys %$checked_files) { - &Apache::lonnet::logthis("a key is $key $$checked_files{$key} is the value"); - } if ($is_empty && ($current_path ne '/')) { $display_out = '
'. ''. @@ -188,9 +185,6 @@ sub display_file_select { $r->print('print("CHECKED"); - &Apache::lonnet::logthis("checked"); - } else { - &Apache::lonnet::logthis("not checked $$checked_files{$filename} $filename"); } $r->print('>'); $r->print(''); @@ -249,7 +243,7 @@ sub display_file { $display_file_text = ''.$path.$filename.''; } elsif (ref($filename) eq "ARRAY") { foreach (@$filename) { - $display_file_text .= ''.$path.$_.''; + $display_file_text .= ''.$path.$_.'
'; } } elsif (ref($filename) eq "SCALAR") { $display_file_text = ''.$path.$filename.''; @@ -270,13 +264,19 @@ sub delete { my @check; my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'}; my @files=&Apache::loncommon::get_env_multiple('form.selectfile'); + 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()); } else { - &open_form($r); - $r->print('

'.&mt('Delete').' '.&display_file(undef,\@files).'?

'); - &close_form($r); + if (scalar(@files)) { + &open_form($r); + $r->print('

'.&mt('Delete').' '.&display_file(undef,\@files).'?

'); + &close_form($r); + } else { + $r->print("No file was checked to delete.
"); + $r->print(&done()); + } } } @@ -285,7 +285,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'}. @@ -366,6 +365,9 @@ sub rename_confirmed { ') while trying to rename '.&display_file().' to '. &display_file(undef,$filenewname).'
'); } + if ($filenewname ne $ENV{'form.filenewname'}) { + $r->print("The new file name was changed from:
".$ENV{'form.filenewname'}." to $filenewname "); + } $r->print(&done()); } sub select_files { @@ -487,6 +489,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()); }