--- loncom/interface/portfolio.pm 2004/09/08 17:53:37 1.38 +++ loncom/interface/portfolio.pm 2004/12/12 01:35:44 1.65 @@ -33,141 +33,22 @@ use Apache::lonlocal; # 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) = @_; + my $anchor = ''.$filename.''; return $anchor; } - -# returns html with
separated contents of the directory -# returns a currentFile (bolds the selected file/dir) -sub display_directory_old { - my ($currentPath, $currentFile, @dirList,) = @_; - my $displayOut=''; - my $filename; - my $upPath; - if ($currentPath ne '/') { - $displayOut = 'Listing of '.$currentPath.'
'; - # provides the "up one directory level" function - # it means shortening the currentpath to the parent directory - $currentPath =~ m:(^/.*)(/.*/$):; - if ($1 ne '/') { - $upPath = $1.'/'; - } else { - $upPath = $1; - } - - # $displayOut = $displayOut.'..
'; - } else { - # $displayOut = $displayOut.'at root '.$currentPath.'
'; - } - foreach my $line (@dirList) { - #$strip holds directory/file name - #$dom - my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); - if (($filename ne '.') && ($filename ne '..')) { - if ($testdir =~ m:^1:) { - # handle directories different from files - if ($filename eq $currentFile) { - #checks to bold the selected file - $displayOut.= ''.(&make_anchor($filename.'/', $filename.'/').'
'."\n"); - } else { - $displayOut.= (&make_anchor($filename.'/', $filename.'/').'
'."\n"); - } - } else { - if ($filename eq $currentFile) { - #checks to bold the selected file - $displayOut.=''.(&make_anchor($filename, $currentPath).'
'."\n"); - } else { - $displayOut.=(&make_anchor($filename, $currentPath).'
'."\n"); - } - } - - } - - } - return $displayOut; -} - -sub displayActions { - # returns html to offer user appropriate actions depending on selected file/directory - my $displayOut; - my ($currentPath, $currentFile, $isEmpty) = @_; -# $displayOut = 'here are actions for '.$currentFile; - if ($currentFile =~ m:/$:) { - # if the selected file is a directory, these are the options - # offer the chance to delete the directory only if it is empty - if ($isEmpty && ($currentPath ne '/')) { - $displayOut = $displayOut.'
- - - -
- -
-
'; - } - if ($currentPath ne '/') { - $displayOut = $displayOut.'
-
- - - - - -
'; - } - } else { #action options offered for files - $displayOut = $displayOut.'
'; - $displayOut = $displayOut.' - -
- -
-
'; - - $displayOut = $displayOut.'
-
- - - - - -
-
'; - } - $displayOut = $displayOut.'
Add a file to '.$currentPath; - # file upload form - $displayOut = $displayOut.'
'; - $displayOut = $displayOut.''. - ''. - ''. - '
'; - $displayOut = $displayOut.'
- - -
- '; - return $displayOut; -} - my $dirptr=16384; -sub display_directory { +sub display_common { my ($r,$current_path,$is_empty,$dir_list)=@_; my $iconpath= $r->dir_config('lonIconsURL') . "/"; $r->print(''); $r->print('
'); my $displayOut = '
'; - $displayOut = $displayOut.''. + $displayOut .= ''. ''. + ''. + ''. + ''. ''. '
'; $r->print($displayOut); @@ -175,39 +56,49 @@ sub display_directory { $displayOut = '
'; $displayOut .= ''. ''. + ''. + ''. + ''. ''. '
'; $r->print($displayOut); $r->print('
'); my @tree = split (/\//,$current_path); - $r->print(''.&make_anchor('portfolio','/').'/'); + $r->print(''.&make_anchor('portfolio','/',$ENV{"form.mode"},$ENV{"form.fieldname"}).'/'); if (@tree > 1){ my $newCurrentPath = ''; for (my $i = 1; $i< @tree; $i++){ $newCurrentPath .= $tree[$i].'/'; - $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath).'/'); + $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath, $ENV{"form.mode"},$ENV{"form.fieldname"}).'/'); } } $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("
"); - if ($is_empty) { - $displayOut = '
'. +} +sub display_directory { + my ($r,$current_path,$is_empty,$dir_list)=@_; + my $iconpath= $r->dir_config('lonIconsURL') . "/"; + my $display_out; + my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash ($ENV{'user.domain'},$ENV{'user.name'}); + if ($is_empty && ($current_path ne '/')) { + $display_out = ''. ''. ''. ''. ''. '
'; - $r->print($displayOut); + $r->print($display_out); return; } $r->print(''. ''); - my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio/$current_path/"; + my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path"; + $r->print(''); foreach my $line (sort { my ($afile)=split('&',$a,2); @@ -221,25 +112,20 @@ sub display_directory { if ($dirptr&$testdir) { $r->print(''); $r->print(''); - $r->print(''); + $r->print(''); $r->print(''); } else { $r->print(''); - $r->print(''); + if (exists $locked_files{$current_path.$filename}){ + $r->print(''); + } else { + $r->print(''); + } $r->print(''); $r->print(''); + $filename.''); $r->print(''); $r->print(''); $r->print(''); @@ -251,17 +137,92 @@ sub display_directory { # $r->print(&display_directory($current_path, $currentFile, @dir_list)); # $r->print('>
Actions NameSizeLast Modified
Go to ...'.&make_anchor($filename.'/',$current_path.$filename.'/').''.&make_anchor($filename.'/',$current_path.$filename.'/',$ENV{'form.mode'},$ENV{"form.fieldname"}).'
- - - - - - -LockedDelete + Rename + '. - $filename.''.$size.''.&Apache::lonlocal::locallocaltime($mtime).'
'); # $r->print(&display_actions($current_path, $currentFile, $isEmpty)); - $r->print('
'); + $r->print(' + + + + '); +} +sub display_file_select { + my ($r,$current_path,$is_empty,$dir_list)=@_; + 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 = '
'. + ''. + ''. + ''. + ''. + + '
'; + + $r->print($display_out); + return; + } + $r->print(''. + ''); + my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path"; + $r->print(''); + foreach my $line (sort + { + my ($afile)=split('&',$a,2); + my ($bfile)=split('&',$b,2); + return (lc($afile) cmp lc($bfile)); + } (@$dir_list)) { + #$strip holds directory/file name + #$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 '..')) { + if ($dirptr&$testdir) { + $r->print(''); + $r->print(''); + $r->print(''); + $r->print(''); + } else { + $r->print(''); + $r->print(''); + $r->print(''); + $r->print(''); + $r->print(''); + $r->print(''); + $r->print(''); + } + } + } + $r->print('
Select NameSizeLast Modified
Go to ...'.&make_anchor($filename.'/',$current_path.$filename.'/',$ENV{'form.mode'},$ENV{"form.fieldname"}).'
print("CHECKED"); + &Apache::lonnet::logthis("checked"); + } else { + &Apache::lonnet::logthis("not checked $$checked_files{$filename} $filename"); + } + $r->print('>'. + $filename.''.$size.''.&Apache::lonlocal::locallocaltime($mtime).'
+ + + +
+ + + '); } sub open_form { my ($r)=@_; + my @files=&Apache::loncommon::get_env_multiple('form.selectfile'); $r->print('
'); $r->print(''); $r->print(''); - $r->print(''); + foreach (@files) { + $r->print(''); + } $r->print(''); } @@ -281,32 +242,58 @@ sub close_form { sub display_file { my ($path,$filename)=@_; + my $display_file_text; if (!defined($path)) { $path=$ENV{'form.currentpath'}; } - if (!defined($filename)) { $filename=$ENV{'form.selectfile'}; } - return ''.$path.$filename.''; + if (!defined($filename)) { + $filename=$ENV{'form.selectfile'}; + $display_file_text = ''.$path.$filename.''; + } elsif (ref($filename) eq "ARRAY") { + foreach (@$filename) { + $display_file_text .= ''.$path.$_.''; + } + } elsif (ref($filename) eq "SCALAR") { + $display_file_text = ''.$path.$filename.''; + } + return $display_file_text; } sub done { return ('

'.&mt('Done').'

'); + $ENV{'form.currentpath'}. + '&fieldname='.$ENV{'form.fieldname'}. + '&mode='.$ENV{'form.mode'}. + '">'.&mt('Done').''); } sub delete { my ($r)=@_; - &open_form($r); - $r->print('

'.&mt('Delete').' '.&display_file().'?

'); - &close_form($r); + 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); + } } sub delete_confirmed { my ($r)=@_; - my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'}, + 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'}. - $ENV{'form.selectfile'}); - if ($result ne 'ok') { + $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()); } @@ -331,6 +318,9 @@ sub delete_dir_confirmed { $r->print(' An error occured (dir) ('.$result. ') while trying to delete '.$directory_name.'
'); } else { + # now remove from recent +# $r->print('
removing '.$directory_name.'
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 { @@ -364,7 +360,7 @@ sub rename_confirmed { 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'}); + 'portfolio'.$ENV{'form.currentpath'}.$filenewname); if ($result ne 'ok') { $r->print(' An errror occured ('.$result. ') while trying to rename '.&display_file().' to '. @@ -372,7 +368,52 @@ sub rename_confirmed { } $r->print(&done()); } - +sub select_files { + my ($r)=@_; + 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); + } else { + if ($ENV{'form.currentpath'} eq '/') { + #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 essay problem.
"); + $r->print("Files selected from other directories:
"); + foreach (&Apache::lonnet::files_not_in_path($ENV{'user.name'}, $ENV{'form.currentpath'})) { + $r->print($_."
"); + } +} sub upload { my ($r)=@_; my $fname=$ENV{'form.uploaddoc.filename'}; @@ -452,7 +493,7 @@ sub createdir { sub handler { # this handles file management my $r = shift; - my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'}, + my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'}, $ENV{'user.name'}). '/userfiles/portfolio'; &Apache::loncommon::no_cache($r); @@ -466,15 +507,11 @@ sub handler { $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'); + '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.uploaddoc.filename'}) { &upload($r); @@ -488,7 +525,9 @@ sub handler { &delete_dir($r); } elsif ($ENV{'form.action'} eq 'rename' && $ENV{'form.confirmed'}) { &rename_confirmed($r); - } elsif ($ENV{'form.action'} eq 'rename') { + } elsif ($ENV{'form.rename'}) { + $ENV{'form.selectfile'} = $ENV{'form.rename'}; + $ENV{'form.action'} = 'rename'; &rename($r); } elsif ($ENV{'form.createdir'}) { &createdir($r); @@ -497,13 +536,37 @@ sub handler { if ($ENV{'form.currentpath'}) { $current_path = $ENV{'form.currentpath'}; } - @dir_list=&Apache::lonnet::dirlist($current_path, + 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 + } + # 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_directory($r,$current_path,$is_empty,\@dir_list); + &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); + } $r->print("\n\n"); return OK; }