--- loncom/interface/portfolio.pm 2004/10/12 00:44:05 1.48
+++ loncom/interface/portfolio.pm 2005/09/09 19:12:29 1.88
@@ -29,47 +29,72 @@ use Apache::lonnet;
use Apache::lontexconvert;
use Apache::lonfeedback;
use Apache::lonlocal;
+use Apache::lonnet;
# receives a file name and path stub from username/userfiles/portfolio/
# returns an anchor tag consisting encoding filename and currentpath
sub make_anchor {
- my ($filename, $current_path) = @_;
- my $anchor = ''.$filename.'';
+ my ($filename, $current_path, $current_mode, $field_name, $continue_select) = @_;
+ if ($continue_select ne 'true') {$continue_select = 'false'};
+ my $anchor = ''.$filename.'';
return $anchor;
}
my $dirptr=16384;
sub display_common {
my ($r,$current_path,$is_empty,$dir_list)=@_;
my $iconpath= $r->dir_config('lonIconsURL') . "/";
- $r->print('
');
- $r->print('
');
- my $displayOut = '';
- $r->print($displayOut);
- $r->print('
');
+ &close_form($r);
+ } else {
+ $r->print("No file was checked to delete. ");
+ $r->print(&done());
+ }
+ }
}
sub delete_confirmed {
my ($r)=@_;
- my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
- $ENV{'user.domain'},'portfolio'.
- $ENV{'form.currentpath'}.
- $ENV{'form.selectfile'});
- if ($result ne 'ok') {
+ my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
+ my $result;
+ foreach my $delete_file (@files) {
+ $result=&Apache::lonnet::removeuserfile($env{'user.name'},
+ $env{'user.domain'},'portfolio'.
+ $env{'form.currentpath'}.
+ $delete_file);
+ if ($result ne 'ok') {
$r->print(' An error occured ('.$result.
- ') while trying to delete '.&display_file().' ');
+ ') while trying to delete '.&display_file(undef, $delete_file).' ');
+ }
}
$r->print(&done());
}
@@ -258,11 +302,10 @@ sub delete_dir {
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'.
+ my $directory_name = $env{'form.currentpath'};
+ $directory_name =~ s|/$||; # remove any trailing slash
+ my $result=&Apache::lonnet::removeuserfile($env{'user.name'},
+ $env{'user.domain'},'portfolio'.
$directory_name);
if ($result ne 'ok') {
@@ -279,22 +322,28 @@ sub delete_dir_confirmed {
for (my $i=1; $i < (@dirs - 1); $i ++){
$directory_name .= $dirs[$i].'/';
}
- $ENV{'form.currentpath'} = $directory_name;
+ $env{'form.currentpath'} = $directory_name;
}
$r->print(&done());
}
sub rename {
my ($r)=@_;
- &open_form($r);
- $r->print('
'.&mt('Rename').' '.&display_file().' to
- ?
');
- &close_form($r);
+ my $file_name = $env{'form.currentpath'}.$env{'form.rename'};
+ if (&Apache::lonnet::is_locked($file_name,$env{'user.domain'},$env{'user.name'}) eq 'true') {
+ $r->print ("The file is locked and cannot be renamed. ");
+ $r->print(&done());
+ } else {
+ &open_form($r);
+ $r->print('
'.&mt('Rename').' '.&display_file().' to
+ ?
');
+ &close_form($r);
+ }
}
sub rename_confirmed {
my ($r)=@_;
- my $filenewname=&Apache::lonnet::clean_filename($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.").
@@ -303,108 +352,144 @@ sub rename_confirmed {
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'});
+ &Apache::lonnet::renameuserfile($env{'user.name'},$env{'user.domain'},
+ 'portfolio'.$env{'form.currentpath'}.$env{'form.selectfile'},
+ 'portfolio'.$env{'form.currentpath'}.$filenewname);
if ($result ne 'ok') {
$r->print(' An errror occured ('.$result.
') 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 {
my ($r)=@_;
- my $java_script =(<
function finishSelect() {
- opener.document.forms.lonhomework.selectedfiles.value='files were selected';
-
+ENDSMP
+ $javascript .= 'fileList = "'.$java_files.'";';
+ $javascript .= (<
ENDSMP
- $r->print($java_script);
+ $r->print($javascript);
$r->print("
Select portfolio files
- Check as many as you wish in response to the essay problem. ");
- my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
- $ENV{'user.name'}).
- '/userfiles/portfolio';
- my $current_path='/';
- if ($ENV{'form.currentpath'}) {
- $current_path = $ENV{'form.currentpath'};
- }
- 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
+ Check as many as you wish in response to the problem. ");
+ my @otherfiles=&Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'});
+ if (@otherfiles) {
+ $r->print("Files selected from other directories: ");
+ foreach my $file (@otherfiles) {
+ $r->print($file." ");
}
- # 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_common($r,$current_path,$is_empty,\@dir_list);
- &display_file_select($r,$current_path,$is_empty,\@dir_list);
- $r->print("