--- loncom/lonnet/perl/lonnet.pm 2010/11/01 20:04:38 1.1091 +++ loncom/lonnet/perl/lonnet.pm 2010/11/10 14:44:19 1.1093 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.1091 2010/11/01 20:04:38 raeburn Exp $ +# $Id: lonnet.pm,v 1.1093 2010/11/10 14:44:19 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2352,7 +2352,7 @@ sub resizeImage { # --------------- Take an uploaded file and put it into the userfiles directory # input: $formname - the contents of the file are in $env{"form.$formname"} -# the desired filenam is in $env{"form.$formname.filename"} +# the desired filename is in $env{"form.$formname.filename"} # $context - possible values: coursedoc, existingfile, overwrite, # canceloverwrite, or ''. # if 'coursedoc': upload to the current course @@ -2442,7 +2442,7 @@ sub userfileupload { } if ($subdir eq 'scantron') { $fname = 'scantron_orig_'.$fname; - } else { + } else { $fname="$subdir/$fname"; } if ($context eq 'coursedoc') { @@ -7288,7 +7288,7 @@ sub is_locked { my ($file_name, $domain, $user) = @_; my @check; my $is_locked; - push @check, $file_name; + push (@check,$file_name); my %locked = &get('file_permissions',\@check, $env{'user.domain'},$env{'user.name'}); my ($tmp)=keys(%locked); @@ -7305,6 +7305,7 @@ sub is_locked { } else { $is_locked = 'false'; } + return $is_locked; } sub declutter_portfile { @@ -8455,7 +8456,7 @@ sub metadata { if (($uri eq '') || (($uri =~ m|^/*adm/|) && ($uri !~ m|^adm/includes|) && ($uri !~ m|/bulletinboard$|)) || - ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ /^\*uploaded\//) ) { + ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ /^\*uploaded\/.+\.sequence$/) ) { return undef; } if (($uri =~ /^~/ || $uri =~ m{home/$match_username/public_html/})