--- loncom/lonnet/perl/lonnet.pm 2010/11/09 20:55:34 1.1056.4.13 +++ loncom/lonnet/perl/lonnet.pm 2010/11/11 21:57:35 1.1056.4.14 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.1056.4.13 2010/11/09 20:55:34 raeburn Exp $ +# $Id: lonnet.pm,v 1.1056.4.14 2010/11/11 21:57:35 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2466,7 +2466,7 @@ sub userfileupload { } if ($subdir eq 'scantron') { $fname = 'scantron_orig_'.$fname; - } else { + } else { $fname="$subdir/$fname"; } if ($context eq 'coursedoc') { @@ -7397,7 +7397,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); @@ -7414,6 +7414,7 @@ sub is_locked { } else { $is_locked = 'false'; } + return $is_locked; } sub declutter_portfile {