--- loncom/interface/portfolio.pm 2005/04/12 01:15:46 1.83
+++ loncom/interface/portfolio.pm 2005/08/26 21:47:25 1.87
@@ -125,7 +125,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('
![]('.$iconpath.'folder_closed.gif) | ');
@@ -354,12 +354,10 @@ sub select_files {
# eventually, have to handle removing those not checked, but . . .
my @items=&Apache::loncommon::get_env_multiple('form.checkfile');
if (scalar(@items)){
- &Apache::lonnet::logthis("one of the items is $items[0]");
- &Apache::lonnet::save_selected_files($env{'user.name'}, $env{'form.currentpath'}, @items);
+ &Apache::lonnet::save_selected_files($env{'user.name'}, $env{'form.currentpath'}, @items);
}
} else {
#empty the file for a fresh start
- &Apache::lonnet::logthis("Clearing saved files");
&Apache::lonnet::clear_selected_files($env{'user.name'});
}
my @files = &Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'});
@@ -420,8 +418,8 @@ sub upload {
}
}
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.'.
+ 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'));
}
@@ -449,7 +447,23 @@ 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 {