--- loncom/interface/portfolio.pm 2004/08/25 17:30:49 1.32 +++ loncom/interface/portfolio.pm 2004/11/22 22:59:32 1.57 @@ -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,17 +56,20 @@ 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(''); @@ -194,20 +78,31 @@ sub display_directory { &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::dump('file_permissions', + $ENV{'user.domain'},$ENV{'user.name'}); + my $locked_file; + foreach my $key (keys %locked_files) { + $locked_file .= $locked_files{$key}.':'; + } + 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"; foreach my $line (sort { my ($afile)=split('&',$a,2); @@ -217,29 +112,36 @@ sub display_directory { #$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); + if ($Apache::lonhomework::results{"resource.$ENV{'user.domain'}.$ENV{'user.name'}.$filename"}eq'true'){ + &Apache::lonnet::logthis("found submitted file"); + &Apache::lonnet::logthis("resource.$ENV{'user.domain'}.$ENV{'user.name'}.$filename"); + } else { + &Apache::lonnet::logthis("$filename not found submitted file"); + &Apache::lonnet::logthis("resource.$ENV{'user.domain'}.$ENV{'user.name'}.$filename"); + } if (($filename ne '.') && ($filename ne '..')) { if ($dirptr&$testdir) { $r->print(''); $r->print(''); - $r->print(''); + $r->print(''); $r->print(''); } else { $r->print(''); $r->print(''); + + + + + + + '); $r->print(''); $r->print(''); + $filename.''); $r->print(''); $r->print(''); $r->print(''); @@ -253,6 +155,60 @@ sub display_directory { # $r->print(&display_actions($current_path, $currentFile, $isEmpty)); $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"}).'
-
- - - - -
-
'. - $filename.''.$size.''.&Apache::lonlocal::locallocaltime($mtime).'
'); } +sub display_file_select { + my ($r,$current_path,$is_empty,$dir_list)=@_; + my $iconpath= $r->dir_config('lonIconsURL') . "/"; + my $display_out; + 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); + 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"}).'
+ + '. + $filename.''.$size.''.&Apache::lonlocal::locallocaltime($mtime).'
+ + + '); +} sub open_form { my ($r)=@_; @@ -288,14 +244,24 @@ sub display_file { 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'}; + 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().'?

'); + &close_form($r); + } } sub delete_confirmed { @@ -331,6 +297,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.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 renamed.
"); + $r->print(&done()); + } else { + &open_form($r); + $r->print('

'.&mt('Rename').' '.&display_file().' to + ?

'); + &close_form($r); + } } sub rename_confirmed { @@ -372,36 +347,102 @@ sub rename_confirmed { } $r->print(&done()); } - +sub select_files { + my ($r)=@_; + my $java_script =(< + function finishSelect() { + fileList = ""; + for (i=0;i +ENDSMP + $r->print($java_script); + $r->print("

Select portfolio files

+ Check as many as you wish in response to the essay problem.
"); +} sub upload { my ($r)=@_; - #FIXME if the file already exists we need to do a confirmation pass - #before overwriting - my $result=&Apache::lonnet::userfileupload('uploaddoc','', - 'portfolio'.$ENV{'form.currentpath'}); - if ($result !~ m|^/uploaded/|) { - $r->print(' An errror occured ('.$result. - ') while trying to upload '.&display_file().'
'); + 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'; + # 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 $found_file = 0; + foreach my $line (@dir_list) { + my ($filename)=split(/\&/,$line,2); + if ($filename eq $fname){ + $found_file = 1; + } + } + 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.'); + } + 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'}); + } else { + my $result=&Apache::lonnet::userfileupload('uploaddoc','', + 'portfolio'.$ENV{'form.currentpath'}); + if ($result !~ m|^/uploaded/|) { + $r->print(' An errror occured ('.$result. + ') while trying to upload '.&display_file().'
'); + } } $r->print(&done()); } sub createdir { my ($r)=@_; - #FIXME 1) file exists in place of dir (errormessage needs improvement) my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'}); if ($newdir eq '') { - $r->print(''. - &mt("Error: no valid directory name was provided."). - '
'); - $r->print(&done()); - return; + $r->print(''. + &mt("Error: no directory name was provided."). + '
'); + $r->print(&done()); + return; } - 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().'
'); + 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 $found_file = 0; + foreach my $line (@dir_list) { + my ($filename)=split(/\&/,$line,2); + if ($filename eq $newdir){ + $found_file = 1; + } + } + if ($found_file){ + $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); + if ($result ne 'ok') { + $r->print(' An errror occured ('.$result. + ') while trying to create a new directory '.&display_file().'
'); + } } $r->print(&done()); } @@ -409,6 +450,9 @@ sub createdir { 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::no_cache($r); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -420,8 +464,12 @@ sub handler { $r->rflush(); &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['selectfile','currentpath', - 'currentfile']); - + 'currentfile','action','fieldname','mode']); + 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); } elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) { @@ -443,17 +491,37 @@ sub handler { if ($ENV{'form.currentpath'}) { $current_path = $ENV{'form.currentpath'}; } - - my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'}, - $ENV{'user.name'}). - '/userfiles/portfolio'; 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; }