--- loncom/interface/portfolio.pm 2005/03/15 23:11:08 1.80 +++ loncom/interface/portfolio.pm 2005/12/19 20:41:45 1.91 @@ -29,52 +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, $current_mode, $field_name) = @_; - 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 = '
'; - $displayOut .= ''. - ''. - ''. - ''. - ''. - ''. - '
'; - $r->print($displayOut); - $r->print('
'); - $displayOut = '
'; - $displayOut .= ''. - ''. - ''. - ''. - ''. - ''. - '
'; - $r->print($displayOut); - $r->print('
'); + my %text=&Apache::lonlocal::texthash('upload' => 'Upload', + 'upload_label' => + 'Upload file to current directory:', + 'createdir' => 'Create Subdirectory', + 'createdir_label' => + 'Create subdirectory in current directory:'); + $r->print(<<"TABLE"); + + + + + + + + + + + + + +
+ $text{'upload_label'} + + + + + + + +
+ $text{'createdir_label'} + + + + + + + +
+TABLE my @tree = split (/\//,$current_path); - $r->print(''.&make_anchor('portfolio','/',$ENV{"form.mode"},$ENV{"form.fieldname"}).'/'); + $r->print(''.&make_anchor('portfolio','/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"}).'/'); if (@tree > 1){ my $newCurrentPath = ''; for (my $i = 1; $i< @tree; $i++){ $newCurrentPath .= $tree[$i].'/'; - $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath, $ENV{"form.mode"},$ENV{"form.fieldname"}).'/'); + $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"}).'/'); } } $r->print(''); &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path); - $r->print('
'. + $r->print('
'. &Apache::lonhtmlcommon::select_recent('portfolio','currentpath', 'this.form.submit();')); $r->print("
"); @@ -85,10 +105,10 @@ sub display_directory { my $display_out; my $select_mode; my $checked_files; - my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash ($ENV{'user.domain'},$ENV{'user.name'}); - if ($ENV{"form.mode"} eq 'selectfile'){ + my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash ($env{'user.domain'},$env{'user.name'}); + if ($env{"form.mode"} eq 'selectfile'){ &select_files($r); - $checked_files =&Apache::lonnet::files_in_path($ENV{'user.name'},$ENV{'form.currentpath'}); + $checked_files =&Apache::lonnet::files_in_path($env{'user.name'},$env{'form.currentpath'}); $select_mode = 'true'; } if ($is_empty && ($current_path ne '/')) { @@ -111,8 +131,8 @@ sub display_directory { 'Actions NameSizeLast Modified'); $r->print('
'); } - my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path"; - my $href_edit_location="/editupload/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path"; + my $href_location="/uploaded/$env{'user.domain'}/$env{'user.name'}/portfolio$current_path"; + my $href_edit_location="/editupload/$env{'user.domain'}/$env{'user.name'}/portfolio$current_path/"; foreach my $line (sort { my ($afile)=split('&',$a,2); @@ -123,7 +143,7 @@ sub display_directory { #$dom my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); $filename =~ s/\s+$//; - if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ )) { + if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(.*)\.(.*)/)) { if ($dirptr&$testdir) { if ($select_mode eq 'true'){ $r->print(''); @@ -131,12 +151,12 @@ sub display_directory { $r->print(''); } $r->print('Go to ...'); - $r->print(''.&make_anchor($filename.'/',$current_path.$filename.'/',$ENV{'form.mode'},$ENV{"form.fieldname"}).''); + $r->print(''.&make_anchor($filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'}).''); $r->print(''); } else { $r->print(''); if ($select_mode eq 'true'){ - $r->print('print('print("CHECKED"); } @@ -145,13 +165,15 @@ sub display_directory { if (exists $locked_files{$current_path.$filename}){ $r->print('Locked'); } else { + my $cat=''.&mt('Catalog Information').
+			    ''; $r->print(' Rename - Meta + '.$cat.' '); } } - $r->print(''); + $r->print(''); $r->print(''. $filename.''); $r->print(''.$size.''); @@ -163,7 +185,7 @@ sub display_directory { if ($select_mode eq 'true') { $r->print(' - +
@@ -183,14 +205,14 @@ sub open_form { my @files=&Apache::loncommon::get_env_multiple('form.selectfile'); $r->print(''); $r->print(''); + $env{'form.action'}.'" />'); $r->print(''); foreach (@files) { $r->print(''); } $r->print(''); + $env{'form.currentpath'}.'" />'); } sub close_form { @@ -200,7 +222,7 @@ sub close_form { $r->print('

+ $env{'form.currentpath'}.'" />

'); @@ -209,9 +231,9 @@ sub close_form { sub display_file { my ($path,$filename)=@_; my $display_file_text; - if (!defined($path)) { $path=$ENV{'form.currentpath'}; } + if (!defined($path)) { $path=$env{'form.currentpath'}; } if (!defined($filename)) { - $filename=$ENV{'form.selectfile'}; + $filename=$env{'form.selectfile'}; $display_file_text = ''.$path.$filename.''; } elsif (ref($filename) eq "ARRAY") { foreach (@$filename) { @@ -229,19 +251,19 @@ sub done { $message='Done'; } return ('

'.&mt($message).'

'); } sub delete { my ($r)=@_; my @check; - my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'}; + 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') { + 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('Back')); } else { @@ -261,9 +283,9 @@ sub delete_confirmed { 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'}. + $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. @@ -282,11 +304,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') { @@ -303,15 +324,15 @@ 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)=@_; - my $file_name = $ENV{'form.currentpath'}.$ENV{'form.rename'}; - if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'}) eq 'true') { + 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 { @@ -324,7 +345,7 @@ sub rename { 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."). @@ -333,33 +354,33 @@ 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'}.$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 "); + 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)=@_; - if ($ENV{'form.continue'} eq 'true') { + 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.selectfile'); - &Apache::lonnet::save_selected_files($ENV{'user.name'}, $ENV{'form.currentpath'}, @items); + 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 { - if ($ENV{'form.currentpath'} eq '/') { #empty the file for a fresh start - # &Apache::lonnet::clear_selected_files($ENV{'user.name'}); - } + &Apache::lonnet::clear_selected_files($env{'user.name'}); } - my @files = &Apache::lonnet::files_not_in_path($ENV{'user.name'}, $ENV{'form.currentpath'}); + my @files = &Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'}); my $java_files = join ",", @files; if ($java_files) { $java_files.=','; @@ -377,7 +398,7 @@ ENDSMP } opener.document.forms.lonhomework. ENDSMP - $javascript .= $ENV{'form.fieldname'}; + $javascript .= $env{'form.fieldname'}; $javascript .= (<print($javascript); $r->print("

Select portfolio files

- Check as many as you wish in response to the essay problem.
"); - $r->print("Files selected from other directories:
"); - foreach (&Apache::lonnet::files_not_in_path($ENV{'user.name'}, $ENV{'form.currentpath'})) { - $r->print($_."
"); + 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 $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'}). + 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 @dir_list=&Apache::lonnet::dirlist($env{'form.currentpath'}, + $env{'user.domain'}, + $env{'user.name'},$portfolio_root); my $found_file = 0; my $locked_file = 0; foreach my $line (@dir_list) { 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') { + 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/1000) + $filesize) > $disk_quota){ - $r->print('Unable to upload '.$fname.' (size = '.$filesize.' kilobytes. Disk quota will be exceeded.'. + 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.'); $r->print(&done('Back')); } 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'}.''. + $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('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'}); + 'portfolio'.$env{'form.currentpath'}); if ($result !~ m|^/uploaded/|) { $r->print(' An errror occured ('.$result. ') while trying to upload '.&display_file().'
'); @@ -446,12 +470,28 @@ sub upload { } sub lock_info { my ($r) = @_; - $r->print("lock info here"); + my %current_permissions = &Apache::lonnet::dump('file_permissions',$env{'user.domain'},$env{'user.name'}); + 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')); return 'ok'; } sub createdir { my ($r)=@_; - my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'}); + my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'}); if ($newdir eq '') { $r->print(''. &mt("Error: no directory name was provided."). @@ -459,12 +499,12 @@ sub createdir { $r->print(&done()); return; } - my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'}, - $ENV{'user.name'}). + 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 @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); @@ -476,15 +516,15 @@ 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 $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().'
'); } } - if ($newdir ne $ENV{'form.newdir'}) { - $r->print("The new directory name was changed from:
".$ENV{'form.newdir'}." to $newdir "); + if ($newdir ne $env{'form.newdir'}) { + $r->print("The new directory name was changed from:
".$env{'form.newdir'}." to $newdir "); } $r->print(&done()); } @@ -492,12 +532,12 @@ sub createdir { sub handler { # this handles file management my $r = shift; - my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'}, - $ENV{'user.name'}). + 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']); + 'currentfile','action','fieldname','mode','rename','continue']); &Apache::loncommon::no_cache($r); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -506,61 +546,61 @@ sub handler { $r->print($html.''. &mt('Portfolio Manager'). "\n"); - if ($ENV{"form.mode"} eq 'selectfile'){ + 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(); - if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){ + 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.meta'}) { + if ($env{'form.meta'}) { &open_form($r); -# $r->print(&edit_meta_data($r, $ENV{'form.currentpath'}.$ENV{'form.selectfile'})); +# $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.store'}) { } - if ($ENV{'form.uploaddoc.filename'}) { + if ($env{'form.uploaddoc.filename'}) { &upload($r); - } elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) { + } elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) { &delete_confirmed($r); - } elsif ($ENV{'form.action'} eq 'delete') { + } elsif ($env{'form.action'} eq 'delete') { &delete($r); - } elsif ($ENV{'form.action'} eq 'deletedir' && $ENV{'form.confirmed'}) { + } elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) { &delete_dir_confirmed($r); - } elsif ($ENV{'form.action'} eq 'deletedir'){ + } elsif ($env{'form.action'} eq 'deletedir'){ &delete_dir($r); - } elsif ($ENV{'form.action'} eq 'rename' && $ENV{'form.confirmed'}) { + } elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) { &rename_confirmed($r); - } elsif ($ENV{'form.rename'}) { - $ENV{'form.selectfile'} = $ENV{'form.rename'}; - $ENV{'form.action'} = 'rename'; + } elsif ($env{'form.rename'}) { + $env{'form.selectfile'} = $env{'form.rename'}; + $env{'form.action'} = 'rename'; &rename($r); - } elsif ($ENV{'form.createdir'}) { + } elsif ($env{'form.createdir'}) { &createdir($r); - } elsif ($ENV{'form.lockinfo'}) { + } elsif ($env{'form.lockinfo'}) { &lock_info($r); } else { my $current_path='/'; - if ($ENV{'form.currentpath'}) { - $current_path = $ENV{'form.currentpath'}; + 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); + $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'); + &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 @@ -570,16 +610,16 @@ sub handler { } # 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); + $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_directory($r,$current_path,$is_empty,\@dir_list); $r->print("\n\n"); - return OK; } + return OK; } 1; __END__