![]() ![]() | ![]() |
- BUG#4292, quota calculation was incorrect
# Copyright Michigan State University Board of Trustees # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). # # LON-CAPA is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # LON-CAPA is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with LON-CAPA; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # /home/httpd/html/adm/gpl.txt # # http://www.lon-capa.org/ # package Apache::portfolio; use strict; use Apache::Constants qw(:common :http); use Apache::loncommon; 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, $continue_select) = @_; if ($continue_select ne 'true') {$continue_select = 'false'}; my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'¤tpath='.$current_path.'&mode='.$current_mode.'&continue='.$continue_select.'&fieldname='.$field_name.'">'.$filename.'</a>'; return $anchor; } my $dirptr=16384; sub display_common { my ($r,$current_path,$is_empty,$dir_list)=@_; my $iconpath= $r->dir_config('lonIconsURL') . "/"; $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">'); $r->print('<td bgcolor="#ccddaa" align="center">'); my $displayOut = '<form method="post" enctype="multipart/form-data">'; $displayOut .= '<input name="uploaddoc" type="file" />'. '<input type="hidden" name="currentpath" value="'.$current_path.'" />'. '<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'. '<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'. '<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'. '<input type="submit" name="storeupl" value="Upload" />'. '</form>'; $r->print($displayOut); $r->print('</td></tr><tr><td bgcolor="#ccddaa" align="center">'); $displayOut = '<form method="post">'; $displayOut .= '<input name="newdir" type="input" />'. '<input type="hidden" name="currentpath" value="'.$current_path.'" />'. '<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'. '<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'. '<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'. '<input type="submit" name="createdir" value="'.&mt("Create Directory").'" />'. '</form>'; $r->print($displayOut); $r->print('</td></tr></table>'); my @tree = split (/\//,$current_path); $r->print('<font size="+2">'.&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"}, $env{"form.continue"}).'/'); } } $r->print('</font>'); &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path); $r->print('<br /><form method=post action="/adm/portfolio?mode='.$env{"form.mode"}.'&fieldname='.$env{"form.fieldname"}.'">'. &Apache::lonhtmlcommon::select_recent('portfolio','currentpath', 'this.form.submit();')); $r->print("</form>"); } sub display_directory { my ($r,$current_path,$is_empty,$dir_list)=@_; my $iconpath= $r->dir_config('lonIconsURL') . "/"; 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'){ &select_files($r); $checked_files =&Apache::lonnet::files_in_path($env{'user.name'},$env{'form.currentpath'}); $select_mode = 'true'; } if ($is_empty && ($current_path ne '/')) { $display_out = '<form method="post" action="/adm/portfolio">'. '<input type="hidden" name="action" value="deletedir" />'. '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'. '<input type="hidden" name="selectfile" value="" />'. '<input type="hidden" name="currentpath" value="'.$current_path.'" />'. '</form>'; $r->print($display_out); return; } if ($select_mode eq 'true') { $r->print('<table border="0" cellspacing="2" cellpadding="2">'. '<tr><th>Select</th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th></tr>'); $r->print('<form method="post" name="checkselect" action="/adm/portfolio">'); } else { $r->print('<table border="0" cellspacing="2" cellpadding="2">'. '<tr><th colspan="2">Actions</th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th></tr>'); $r->print('<form method="post" action="/adm/portfolio">'); } 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); 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 '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(.*)\.(.*)/)) { if ($dirptr&$testdir) { if ($select_mode eq 'true'){ $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>'); } else { $r->print('<tr bgcolor="#FFAA99"><td colspan="2"><img src="'.$iconpath.'folder_closed.gif"></td>'); } $r->print('<td>Go to ...</td>'); $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'}).'</td>'); $r->print('</tr>'); } else { $r->print('<tr bgcolor="#CCCCFF">'); if ($select_mode eq 'true'){ $r->print('<td><input type="checkbox" name="checkfile" value="'.$filename.'"'); if ($$checked_files{$filename} eq 'selected') { $r->print("CHECKED"); } $r->print('></td>'); } else { if (exists $locked_files{$current_path.$filename}){ $r->print('<td colspan="2"><a href="portfolio?lockinfo='.$current_path.$filename.'">Locked</a></td>'); } else { $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'" /> <a href="/adm/portfolio?rename='.$filename.'&currentpath='.$current_path.'">Rename</a></td> <td><a href="'.$href_edit_location.$filename.'.meta">Meta</a> </td>'); } } $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>'); $r->print('<td><a href="'.$href_location.$filename.'">'. $filename.'</a></td>'); $r->print('<td>'.$size.'</td>'); $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>'); $r->print('</tr>'); } } } if ($select_mode eq 'true') { $r->print('</table> <input type="hidden" name="continue" value="true"> <input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'"> <input type="hidden" name="mode" value="selectfile"> <input type="submit" name="submit" value="Select checked files, and continue selecting." /><br /> <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" /> <input type="hidden" name="currentpath" value="'.$current_path.'" /> </form>'); } else { $r->print('</table> <input type="submit" name="doit" value="Delete Checked Files" /> <input type="hidden" name="action" value="delete" /> <input type="hidden" name="currentpath" value="'.$current_path.'" /> </form>'); } } sub open_form { my ($r)=@_; my @files=&Apache::loncommon::get_env_multiple('form.selectfile'); $r->print('<form method="post" action="/adm/portfolio">'); $r->print('<input type="hidden" name="action" value="'. $env{'form.action'}.'" />'); $r->print('<input type="hidden" name="confirmed" value="1" />'); foreach (@files) { $r->print('<input type="hidden" name="selectfile" value="'. $_.'" />'); } $r->print('<input type="hidden" name="currentpath" value="'. $env{'form.currentpath'}.'" />'); } sub close_form { my ($r)=@_; $r->print('<p><input type="submit" value="'.&mt('Continue'). '" /></p></form>'); $r->print('<form action="/adm/portfolio" method="POST"> <p> <input type="hidden" name="currentpath" value="'. $env{'form.currentpath'}.'" /> <input type="submit" value="'.&mt('Cancel').'" /> </p></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'}; $display_file_text = '<tt>'.$path.$filename.'</tt>'; } elsif (ref($filename) eq "ARRAY") { foreach (@$filename) { $display_file_text .= '<tt>'.$path.$_.'</tt><br />'; } } elsif (ref($filename) eq "SCALAR") { $display_file_text = '<tt>'.$path.$filename.'</tt>'; } return $display_file_text; } sub done { my ($message)=@_; unless (defined $message) { $message='Done'; } return ('<h3><a href="/adm/portfolio?currentpath='. $env{'form.currentpath'}. '&fieldname='.$env{'form.fieldname'}. '&mode='.$env{'form.mode'}. '">'.&mt($message).'</a></h3>'); } sub delete { my ($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.<br />"); $r->print(&done('Back')); } else { if (scalar(@files)) { &open_form($r); $r->print('<p>'.&mt('Delete').' '.&display_file(undef,\@files).'?</p>'); &close_form($r); } else { $r->print("No file was checked to delete.<br />"); $r->print(&done()); } } } sub delete_confirmed { my ($r)=@_; 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('<font color="red"> An error occured ('.$result. ') while trying to delete '.&display_file(undef, $delete_file).'</font><br />'); } } $r->print(&done()); } sub delete_dir { my ($r)=@_; &open_form($r); $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>'); &close_form($r); } sub delete_dir_confirmed { my ($r)=@_; 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') { $r->print('<font color="red"> An error occured (dir) ('.$result. ') while trying to delete '.$directory_name.'</font><br />'); } else { # now remove from recent # $r->print('<br /> removing '.$directory_name.'<br /'); &Apache::lonhtmlcommon::remove_recent('portfolio',[$directory_name.'/']); my @dirs = split m!/!, $directory_name; # $directory_name =~ m/^(\/*\/)(\/*.)$/; $directory_name='/'; for (my $i=1; $i < (@dirs - 1); $i ++){ $directory_name .= $dirs[$i].'/'; } $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') { $r->print ("The file is locked and cannot be renamed.<br />"); $r->print(&done()); } else { &open_form($r); $r->print('<p>'.&mt('Rename').' '.&display_file().' to <input name="filenewname" type="input" size="50" />?</p>'); &close_form($r); } } sub rename_confirmed { my ($r)=@_; my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'}); if ($filenewname eq '') { $r->print('<font color="red">'. &mt("Error: no valid filename was provided to rename to."). '</font><br />'); $r->print(&done()); return; } my $result= &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('<font color="red"> An errror occured ('.$result. ') while trying to rename '.&display_file().' to '. &display_file(undef,$filenewname).'</font><br />'); } if ($filenewname ne $env{'form.filenewname'}) { $r->print("The new file name was changed from:<br /><strong>".$env{'form.filenewname'}."</strong> to <strong>$filenewname </strong>"); } $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.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 =(<<ENDSMP); <script language='javascript'> function finishSelect() { ENDSMP $javascript .= 'fileList = "'.$java_files.'";'; $javascript .= (<<ENDSMP); for (i=0;i<document.forms.checkselect.length;i++) { if (document.forms.checkselect[i].checked){ fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ; } } opener.document.forms.lonhomework. ENDSMP $javascript .= $env{'form.fieldname'}; $javascript .= (<<ENDSMP); .value=fileList; self.close(); } </script> ENDSMP $r->print($javascript); $r->print("<h1>Select portfolio files</h1> Check as many as you wish in response to the essay problem.<br />"); $r->print("<strong>Files selected from other directories:</strong><br />"); foreach (&Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'})) { $r->print($_."<br />"); } } sub upload { my ($r)=@_; 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; 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') { $locked_file = 1; } } } my $current_disk_usage = &Apache::lonnet::diskusage($env{'user.domain'}, $env{'user.name'},$portfolio_root); if ((($current_disk_usage) + $filesize/1000) > $disk_quota){ $r->print('<font color="red">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes)</strong>. Disk quota will be exceeded.'. '<br />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('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>portfolio'.$env{'form.currentpath'}.'</strong></font>'. '<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.'); $r->print(&done('Back')); } else { $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>portfolio'.$env{'form.currentpath'}.'</strong></font>'. '<br />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'}); if ($result !~ m|^/uploaded/|) { $r->print('<font color="red"> An errror occured ('.$result. ') while trying to upload '.&display_file().'</font><br />'); $r->print(&done('Back')); } else { $r->print(&done()); } } } sub lock_info { my ($r) = @_; 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('<strong>'.$key.'</strong> was submitted in response to problem: <strong>'. &Apache::lonnet::gettitle($$array_item[0]).'</strong><br />'); my %course_description = &Apache::lonnet::coursedescription($$array_item[1]); $r->print('In the course: <strong>'.$course_description{'description'}.'</strong><br />'); # $r->print('the third is '.$$array_item[2].'<br>'); # $r->print("item is $$array_item[0]<br> and $$array_item[0]"); } } } } $r->print(&done('Back')); return 'ok'; } sub createdir { my ($r)=@_; my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'}); if ($newdir eq '') { $r->print('<font color="red">'. &mt("Error: no directory name was provided."). '</font><br />'); $r->print(&done()); 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 $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('<font color="red"> Unable to create a directory named <strong>'.$newdir. ' </strong>a file or directory by that name already exists.</font><br />'); } else { my $result=&Apache::lonnet::mkdiruserfile($env{'user.name'}, $env{'user.domain'},'portfolio'.$env{'form.currentpath'}.$newdir); if ($result ne 'ok') { $r->print('<font color="red"> An errror occured ('.$result. ') while trying to create a new directory '.&display_file().'</font><br />'); } } if ($newdir ne $env{'form.newdir'}) { $r->print("The new directory name was changed from:<br /><strong>".$env{'form.newdir'}."</strong> to <strong>$newdir </strong>"); } $r->print(&done()); } 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']); &Apache::loncommon::no_cache($r); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; # Give the LON-CAPA page header my $html=&Apache::lonxml::xmlbegin(); $r->print($html.'<head><title>'. &mt('Portfolio Manager'). "</title></head>\n"); 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'})){ $r->print('<font color="red"> No file was selected to upload.'. 'To upload a file, click <strong>Browse...</strong>'. ', select a file, then click <strong>Upload</strong>,</font>'); } if ($env{'form.meta'}) { &open_form($r); # $r->print(&edit_meta_data($r, $env{'form.currentpath'}.$env{'form.selectfile'})); $r->print('Edit the meta data<br />'); &close_form($r); } if ($env{'form.store'}) { } 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.rename'}) { $env{'form.selectfile'} = $env{'form.rename'}; $env{'form.action'} = 'rename'; &rename($r); } elsif ($env{'form.createdir'}) { &createdir($r); } elsif ($env{'form.lockinfo'}) { &lock_info($r); } else { 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 } # 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_directory($r,$current_path,$is_empty,\@dir_list); $r->print("</body>\n</html>\n"); return OK; } } 1; __END__