--- loncom/interface/portfolio.pm 2004/12/04 18:37:36 1.61
+++ loncom/interface/portfolio.pm 2005/02/11 00:18:14 1.73
@@ -83,12 +83,7 @@ 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}.':';
- }
+ my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash ($ENV{'user.domain'},$ENV{'user.name'});
if ($is_empty && ($current_path ne '/')) {
$display_out = '<form method="post" action="/adm/portfolio">'.
'<input type="hidden" name="action" value="deletedir" />'.
@@ -101,8 +96,9 @@ sub display_directory {
return;
}
$r->print('<table border="0" cellspacing="2" cellpadding="2">'.
- '<tr><th>Actions</th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
+ '<tr><th colspan="2">Actions</th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
+ $r->print('<form method="post" action="/adm/portfolio">');
foreach my $line (sort
{
my ($afile)=split('&',$a,2);
@@ -114,24 +110,20 @@ sub display_directory {
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('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
+ $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"}).'</td>');
$r->print('</tr>');
} else {
$r->print('<tr bgcolor="#CCCCFF">');
- $r->print('<td>
- <form method="post" action="/adm/portfolio">
- <select name="action">
- <option value=""></option>
- <option value="delete">'.&mt("Delete").'</option>
- <option value="rename">'.&mt("Rename").'</option>
- </select>
- <input type="submit" name="doit" value="Go" />
- <input type="hidden" name="selectfile" value="'.$filename.'" />
- <input type="hidden" name="currentpath" value="'.$current_path.'" />
- </form>
- </td>');
+ if (exists $locked_files{$current_path.$filename}){
+ $r->print('<td colspan="2">Locked</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="/adm/portfolio'.$current_path.$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>');
@@ -146,16 +138,17 @@ sub display_directory {
# $r->print(&display_directory($current_path, $currentFile, @dir_list));
# $r->print('</td>><td>');
# $r->print(&display_actions($current_path, $currentFile, $isEmpty));
- $r->print('</table></form>');
+ $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 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 = '<form method="post" action="/adm/portfolio">'.
'<input type="hidden" name="action" value="deletedir" />'.
@@ -190,12 +183,9 @@ sub display_file_select {
$r->print('</tr>');
} else {
$r->print('<tr bgcolor="#CCCCFF">');
- $r->print('<td><input type="checkbox" name="selectedfile" value="'.$filename.'"');
+ $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'"');
if ($$checked_files{$filename} eq 'selected') {
$r->print("CHECKED");
- &Apache::lonnet::logthis("checked");
- } else {
- &Apache::lonnet::logthis("not checked $$checked_files{$filename} $filename");
}
$r->print('></td>');
$r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
@@ -219,12 +209,15 @@ sub display_file_select {
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" />');
- $r->print('<input type="hidden" name="selectfile" value="'.
- $ENV{'form.selectfile'}.'" />');
+ foreach (@files) {
+ $r->print('<input type="hidden" name="selectfile" value="'.
+ $_.'" />');
+ }
$r->print('<input type="hidden" name="currentpath" value="'.
$ENV{'form.currentpath'}.'" />');
}
@@ -244,9 +237,19 @@ 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 '<tt>'.$path.$filename.'</tt>';
+ 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 {
@@ -261,25 +264,36 @@ 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());
} else {
- &open_form($r);
- $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
- &close_form($r);
+ 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 $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
+ 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'}.
- $ENV{'form.selectfile'});
- if ($result ne 'ok') {
+ $delete_file);
+ if ($result ne 'ok') {
$r->print('<font color="red"> An error occured ('.$result.
- ') while trying to delete '.&display_file().'</font><br />');
+ ') while trying to delete '.&display_file(undef, $delete_file).'</font><br />');
+ }
}
$r->print(&done());
}
@@ -321,7 +335,7 @@ sub delete_dir_confirmed {
sub rename {
my ($r)=@_;
- my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
+ 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());
@@ -352,6 +366,9 @@ sub rename_confirmed {
') 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 {
@@ -359,13 +376,25 @@ sub select_files {
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.selectedfile');
+ 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 $java_script =(<<ENDSMP);
+ 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() {
- fileList = "";
+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 + "," ;
@@ -373,14 +402,14 @@ sub select_files {
}
opener.document.forms.lonhomework.
ENDSMP
- $java_script .= $ENV{'form.fieldname'};
- $java_script .= (<<ENDSMP);
+ $javascript .= $ENV{'form.fieldname'};
+ $javascript .= (<<ENDSMP);
.value=fileList;
self.close();
}
</script>
ENDSMP
- $r->print($java_script);
+ $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 />");
@@ -409,7 +438,7 @@ sub upload {
}
}
my $current_disk_usage = &Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root);
- if (($current_disk_usage + $filesize) > $disk_quota){
+ if ((($current_disk_usage/1000) + $filesize) > $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.');
}
@@ -461,15 +490,28 @@ sub createdir {
') 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 $bodytag;
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',
+ 'currentfile','action','fieldname','mode','rename']);
+ if ($ENV{"form.mode"} eq 'selectfile'){
+ $bodytag = &Apache::loncommon::bodytag('Portfolio Manager',undef,undef,1);
+ } else {
+ $bodytag = &Apache::loncommon::bodytag('Portfolio Manager');
+ }
+
&Apache::loncommon::no_cache($r);
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -477,16 +519,22 @@ sub handler {
$r->print('<html><head><title>'.
&mt('Portfolio Manager').
"</title></head>\n".
- &Apache::loncommon::bodytag('Portfolio Manager'));
+ $bodytag);
$r->rflush();
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['selectfile','currentpath',
- 'currentfile','action','fieldname','mode']);
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'}) {
@@ -499,7 +547,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);