';
+ return $result;
}
sub delete {
- my ($r)=@_;
- &open_form($r);
- $r->print('
'.&mt('Delete').' '.&display_file().'?
');
- &close_form($r);
+ my ($r,$url,$group)=@_;
+ my @check;
+ my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
+ my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
+ my ($uname,$udom) = &get_name_dom($group);
+ if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
+ $r->print ("The file is locked and cannot be deleted. ");
+ $r->print(&done('Back',$url,$group));
+ } else {
+ if (scalar(@files)) {
+ &open_form($r,$url);
+ $r->print('
');
+ &close_form($r,$url,$group);
+ } else {
+ $r->print("No file was checked to delete. ");
+ $r->print(&done(undef,$url,$group));
+ }
+ }
}
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 ($r,$url,$group)=@_;
+ my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
+ my $result;
+ my ($uname,$udom) = &get_name_dom($group);
+ my $port_path = &get_port_path($group);
+ foreach my $delete_file (@files) {
+ $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
+ $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());
+ $r->print(&done(undef,$url,$group));
}
sub delete_dir {
- my ($r)=@_;
- &open_form($r);
+ my ($r,$url,$group)=@_;
+ &open_form($r,$url);
$r->print('
'.&mt('Delete').' '.&display_file().'?
');
- &close_form($r);
+ &close_form($r,$url,$group);
}
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 ($r,$url,$group)=@_;
+ my $directory_name = $env{'form.currentpath'};
+ $directory_name =~ s|/$||; # remove any trailing slash
+ my ($uname,$udom) = &get_name_dom($group);
+ my $namespace = &get_namespace($group);
+ my $port_path = &get_port_path($group);
+ my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
$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());
+ $r->print(&done(undef,$url,$group));
}
sub rename {
- my ($r)=@_;
- &open_form($r);
- $r->print('
'.&mt('Rename').' '.&display_file().' to
- ?
');
- &close_form($r);
+ my ($r,$url,$group)=@_;
+ my $file_name = $env{'form.currentpath'}.$env{'form.rename'};
+ my ($uname,$udom) = &get_name_dom($group);
+ if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
+ $r->print ("The file is locked and cannot be renamed. ");
+ $r->print(&done(undef,$url,$group));
+ } else {
+ &open_form($r,$url);
+ $r->print('
'.&mt('Rename').' '.&display_file().' to
+ ?
');
+ &close_form($r,$url,$group);
+ }
}
sub rename_confirmed {
- my ($r)=@_;
- my $filenewname=&Apache::lonnet::clean_filename($ENV{'form.filenewname'});
+ my ($r,$url,$group)=@_;
+ my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});
+ my ($uname,$udom) = &get_name_dom($group);
+ my $port_path = &get_port_path($group);
if ($filenewname eq '') {
$r->print(''.
&mt("Error: no valid filename was provided to rename to.").
' ');
- $r->print(&done());
+ $r->print(&done(undef,$url,$group));
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($uname,$udom,
+ $port_path.$env{'form.currentpath'}.$env{'form.selectfile'},
+ $port_path.$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).' ');
}
- $r->print(&done());
+ if ($filenewname ne $env{'form.filenewname'}) {
+ $r->print("The new file name was changed from: ".$env{'form.filenewname'}." to $filenewname ");
+ }
+ $r->print(&done(undef,$url,$group));
+}
+sub select_files {
+ my ($r,$group)=@_;
+ if ($env{'form.continue'} eq 'true') {
+ # here we update the selections for the currentpath
+ # eventually, have to handle removing those not checked, but . . .
+ my @items=&Apache::loncommon::get_env_multiple('form.checkfile');
+ if (scalar(@items)){
+ &Apache::lonnet::save_selected_files($env{'user.name'}, $env{'form.currentpath'}, @items);
+ }
+ } else {
+ #empty the file for a fresh start
+ &Apache::lonnet::clear_selected_files($env{'user.name'});
+ }
+ my @files = &Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'});
+ my $java_files = join ",", @files;
+ if ($java_files) {
+ $java_files.=',';
+ }
+ my $javascript =(<
+ function finishSelect() {
+ENDSMP
+ $javascript .= 'fileList = "'.$java_files.'";';
+ $javascript .= (<
+ENDSMP
+ $r->print($javascript);
+ $r->print("
Select portfolio files
+ 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." ");
+ }
+ }
}
-
sub upload {
- my ($r)=@_;
- my $fname=$ENV{'form.uploaddoc.filename'};
- my $filesize = (length($ENV{'form.uploaddoc'})) / 1000; #express in k (1024?)
+ my ($r,$url,$group)=@_;
+ 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';
+
+ my $portfolio_root=&get_portfolio_root($group);
+ my ($uname,$udom) = &get_name_dom($group);
+ my $port_path = &get_port_path($group);
# 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 @dir_list=&get_dir_list($portfolio_root,$group);
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,$udom,$uname) eq 'true') {
+ $locked_file = 1;
+ }
}
}
- my $current_disk_usage = &Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root);
+ my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root);
if (($current_disk_usage + $filesize) > $disk_quota){
- $r->print('Unable to upload '.$fname.' (size = '.$filesize.' kilobytes. Disk quota will be exceeded.'.
+ $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',$url,$group));
}
- 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 '.$port_path.$env{'form.currentpath'}.''.
+ ' You will be able to rename or delete existing '.$fname.' after a grade has been assigned.');
+ $r->print(&done('Back',$url,$group));
+ } else {
+ $r->print('Unable to upload '.$fname.', a file by that name was found in '.$port_path.$env{'form.currentpath'}.''.
+ ' To upload, rename or delete existing '.$fname.' in '.$port_path.$env{'form.currentpath'});
+ $r->print(&done('Back',$url,$group));
+ }
} else {
my $result=&Apache::lonnet::userfileupload('uploaddoc','',
- 'portfolio'.$ENV{'form.currentpath'});
+ $port_path.$env{'form.currentpath'});
+ print STDERR "result was $result for $port_path.$env{'form.currentpath'}\n";
if ($result !~ m|^/uploaded/|) {
$r->print(' An errror occured ('.$result.
') while trying to upload '.&display_file().' ');
+ $r->print(&done('Back',$url,$group));
+ } else {
+ $r->print(&done(undef,$url,$group));
}
}
- $r->print(&done());
}
-
+sub lock_info {
+ my ($r,$url,$group) = @_;
+ my ($uname,$udom) = &get_name_dom($group);
+ my %current_permissions = &Apache::lonnet::dump('file_permissions',$udom,$uname);
+ my $file_name = $env{'form.lockinfo'};
+ foreach my $key(keys(%current_permissions)) {
+ if ($file_name eq $key) {
+ foreach my $array_item (@{$current_permissions{$key}}) {
+ if (ref($array_item)) {
+ $r->print(''.$key.' was submitted in response to problem: '.
+ &Apache::lonnet::gettitle($$array_item[0]).' ');
+ my %course_description = &Apache::lonnet::coursedescription($$array_item[1]);
+ $r->print('In the course: '.$course_description{'description'}.' ');
+ # $r->print('the third is '.$$array_item[2].' ');
+ # $r->print("item is $$array_item[0] and $$array_item[0]");
+ }
+ }
+ }
+ }
+ $r->print(&done('Back',$url,$group));
+ return 'ok';
+}
sub createdir {
- my ($r)=@_;
- my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'});
+ my ($r,$url,$group)=@_;
+ my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});
if ($newdir eq '') {
$r->print(''.
&mt("Error: no directory name was provided.").
' ');
- $r->print(&done());
+ $r->print(&done(undef,$url,$group));
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 $portfolio_root = &get_portfolio_root($group);
+ my @dir_list=&get_dir_list($portfolio_root,$group);
my $found_file = 0;
foreach my $line (@dir_list) {
my ($filename)=split(/\&/,$line,2);
@@ -439,74 +556,202 @@ sub createdir {
$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);
+ my ($uname,$udom) = &get_name_dom($group);
+ my $port_path = &get_port_path($group);
+ my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,
+ $port_path.$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());
+ if ($newdir ne $env{'form.newdir'}) {
+ $r->print("The new directory name was changed from: ".$env{'form.newdir'}." to $newdir ");
+ }
+ $r->print(&done(undef,$url,$group));
+}
+
+sub get_portfolio_root {
+ my ($group) = @_;
+ my ($portfolio_root,$udom,$uname,$path);
+ ($uname,$udom) = &get_name_dom($group);
+ if (defined($group)) {
+ $path = '/userfiles/groups/'.$group.'/portfolio';
+ } else {
+ $path = '/userfiles/portfolio';
+ }
+ return (&Apache::loncommon::propath($udom,$uname).$path);
+}
+
+sub get_dir_list {
+ my ($portfolio_root,$group) = @_;
+ my ($uname,$udom) = &get_name_dom($group);
+ return &Apache::lonnet::dirlist($env{'form.currentpath'},
+ $udom,$uname,$portfolio_root);
+}
+
+sub get_name_dom {
+ my ($group) = @_;
+ my ($uname,$udom);
+ if (defined($group)) {
+ $udom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ $uname = $env{'course.'.$env{'request.course.id'}.'.num'};
+ } else {
+ $udom = $env{'user.domain'};
+ $uname = $env{'user.name'};
+ }
+ return ($uname,$udom);
+}
+
+sub get_namespace {
+ my ($group) = @_;
+ my $namespace = 'portfolio';
+ if (defined($group)) {
+ my ($uname,$udom) = &get_name_dom($group);
+ $namespace .= '_'.$udom.'_'.$uname.'_'.$group;
+ }
+ return $namespace;
+}
+
+sub get_port_path {
+ my ($group) = @_;
+ my $port_path;
+ if (defined($group)) {
+ $port_path = "groups/$group/portfolio";
+ } else {
+ $port_path = 'portfolio';
+ }
+ return $port_path;
}
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::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['selectfile','currentpath','meta','lockinfo','currentfile',
+ 'action','fieldname','mode','rename','continue','group']);
+ my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title);
+ if ($r->uri =~ m|^(/adm/)([^/]+)|) {
+ $url = $1.$2;
+ $caller = $2;
+ }
+ if ($caller eq 'coursegrp_portfolio') {
+ # Needs to be in a course
+ if (! ($env{'request.course.fn'})) {
+ # Not in a course
+ $env{'user.error.msg'}=
+ "/adm/coursegrp_portfolio:rgf:0:0:Cannot view group portfolio";
+ return HTTP_NOT_ACCEPTABLE;
+ }
+ my $earlyout = 0;
+ my $view_permission = &Apache::lonnet::allowed('vcg',
+ $env{'request.course.id'});
+ $group = $env{'form.group'};
+ $group =~ s/\W//g;
+ if ($group) {
+ my %curr_groups = ();
+ ($uname,$udom) = &get_name_dom($group);
+ if (&Apache::loncommon::coursegroups(\%curr_groups,$udom,$uname,
+ $group)) {
+ if (($view_permission) || (&Apache::lonnet::allowed('rgf',
+ $env{'request.course.id'}.'/'.$group))) {
+ $portfolio_root = &get_portfolio_root($group);
+ } else {
+ $r->print('You do not have the privileges required to access the shared files space for this group');
+ $earlyout = 1;
+ }
+ } else {
+ $r->print('Not a valid group for this course');
+ $earlyout = 1;
+ }
+ $title = &mt('Group files').' for '.$group;
+ } else {
+ $r->print('Invalid group');
+ $earlyout = 1;
+ }
+ if ($earlyout) { return OK; }
+ } else {
+ ($uname,$udom) = &get_name_dom();
+ $portfolio_root = &get_portfolio_root();
+ $title = &mt('Portfolio Manager');
+ }
+
&Apache::loncommon::no_cache($r);
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
# Give the LON-CAPA page header
- $r->print(''.
- &mt('Portfolio Manager').
- "\n".
- &Apache::loncommon::bodytag('Portfolio Manager'));
+ my $html=&Apache::lonxml::xmlbegin();
+ $r->print($html.&Apache::loncommon::head($title)."\n");
+ if ($env{"form.mode"} eq 'selectfile'){
+ $r->print(&Apache::loncommon::bodytag($title,undef,undef,1));
+ } else {
+ $r->print(&Apache::loncommon::bodytag($title));
+ }
$r->rflush();
- &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'}) & (!$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') {
- &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') {
- &rename($r);
- } elsif ($ENV{'form.createdir'}) {
- &createdir($r);
+ if ($env{'form.meta'}) {
+ &open_form($r,$url);
+# $r->print(&edit_meta_data($r, $env{'form.currentpath'}.$env{'form.selectfile'}));
+ $r->print('Edit the meta data ');
+ &close_form($r,$url,$group);
+ }
+ if ($env{'form.store'}) {
+ }
+
+ if ($env{'form.uploaddoc.filename'}) {
+ &upload($r,$url,$group);
+ } elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) {
+ &delete_confirmed($r,$url,$group);
+ } elsif ($env{'form.action'} eq 'delete') {
+ &delete($r,$url,$group);
+ } elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) {
+ &delete_dir_confirmed($r,$url,$group);
+ } elsif ($env{'form.action'} eq 'deletedir'){
+ &delete_dir($r,$url,$group);
+ } elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) {
+ &rename_confirmed($r,$url,$group);
+ } elsif ($env{'form.rename'}) {
+ $env{'form.selectfile'} = $env{'form.rename'};
+ $env{'form.action'} = 'rename';
+ &rename($r,$url,$group);
+ } elsif ($env{'form.createdir'}) {
+ &createdir($r,$url,$group);
+ } elsif ($env{'form.lockinfo'}) {
+ &lock_info($r,$url,$group);
} else {
my $current_path='/';
- if ($ENV{'form.currentpath'}) {
- $current_path = $ENV{'form.currentpath'};
+ if ($env{'form.currentpath'}) {
+ $current_path = $env{'form.currentpath'};
}
- @dir_list=&Apache::lonnet::dirlist($current_path,
- $ENV{'user.domain'},
- $ENV{'user.name'},$portfolio_root);
-
+ my @dir_list=&get_dir_list($portfolio_root,$group);
+ 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($uname,$udom,'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,
+ $udom,$uname,$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("\n