--- loncom/lonnet/perl/lonnet.pm 2006/06/16 22:37:35 1.749 +++ loncom/lonnet/perl/lonnet.pm 2006/06/19 21:01:01 1.750 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.749 2006/06/16 22:37:35 raeburn Exp $ +# $Id: lonnet.pm,v 1.750 2006/06/19 21:01:01 banghart Exp $ # # Copyright Michigan State University Board of Trustees # @@ -4846,12 +4846,18 @@ sub get_marked_as_readonly_hash { if (ref($value) eq "ARRAY"){ foreach my $stored_what (@{$value}) { if (ref($stored_what) eq 'ARRAY') { - if ($stored_what eq $what) { - $readonly_files{$file_name} = 'locked'; - } elsif (!defined($what)) { - $readonly_files{$file_name} = 'locked'; + foreach my $lock_descriptor(@{$stored_what}) { + if ($lock_descriptor eq 'graded') { + $readonly_files{$file_name} = 'graded'; + } elsif ($lock_descriptor eq 'handback') { + $readonly_files{$file_name} = 'handback'; + } else { + if (!exists($readonly_files{$file_name})) { + $readonly_files{$file_name} = 'locked'; + } + } } - } + } } } } @@ -4917,7 +4923,7 @@ sub dirlist { if(defined($alternateDirectoryRoot)) { $dirRoot = $alternateDirectoryRoot; $dirRoot =~ s/\/$//; - } + }Clay Greene if($udom) { if($uname) {