--- loncom/lonnet/perl/lonnet.pm 2011/11/07 18:27:19 1.1142 +++ loncom/lonnet/perl/lonnet.pm 2011/11/07 20:05:59 1.1144 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.1142 2011/11/07 18:27:19 raeburn Exp $ +# $Id: lonnet.pm,v 1.1144 2011/11/07 20:05:59 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3338,7 +3338,7 @@ sub courseacclog { my $fnsymb=shift; unless ($env{'request.course.id'}) { return ''; } my $what=$fnsymb.':'.$env{'user.name'}.':'.$env{'user.domain'}; - if ($fnsymb=~/(problem|exam|quiz|assess|survey|form|task|page)$/) { + if ($fnsymb=~/$LONCAPA::assess_re/) { $what.=':POST'; # FIXME: Probably ought to escape things.... foreach my $key (keys(%env)) { @@ -10276,8 +10276,8 @@ sub hreflocation { if ($file=~m-^\Q$perlvar{'lonDocRoot'}\E-) { $file=~s-^\Q$perlvar{'lonDocRoot'}\E--; } elsif ($file=~m-^\Q$perlvar{'lonUsersDir'}\E-) { - $file=~s{^/home/httpd/lonUsers/($match_domain)/./././($match_name)/userfiles/ - -/uploaded/$1/$2/-x; + $file=~s{^/home/httpd/lonUsers/($match_domain)/./././($match_name)/userfiles/} + {/uploaded/$1/$2/}x; } if ($file=~ m{^/userfiles/}) { $file =~ s{^/userfiles/}{/uploaded/};