[LON-CAPA-cvs] cvs: loncom(version_2_10_X) /lonnet/perl lonnet.pm

[raeburn]

raeburn		Fri Jan 21 12:18:28 2011 EDT

  Modified files:              (Branch: version_2_10_X)
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - Backport 1.1100, 1.1101. 
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1056.4.19 loncom/lonnet/perl/lonnet.pm:1.1056.4.20
--- loncom/lonnet/perl/lonnet.pm:1.1056.4.19	Tue Jan 11 22:36:11 2011
+++ loncom/lonnet/perl/lonnet.pm	Fri Jan 21 12:18:28 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1056.4.19 2011/01/11 22:36:11 raeburn Exp $
+# $Id: lonnet.pm,v 1.1056.4.20 2011/01/21 12:18:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -8578,7 +8578,7 @@
     if (($uri eq '') || 
 	(($uri =~ m|^/*adm/|) && 
 	     ($uri !~ m|^adm/includes|) && ($uri !~ m|/bulletinboard$|)) ||
-        ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ /^\*uploaded\/.+\.sequence$/) || ($uri =~ m{^/*uploaded/$match_domain/$match_courseid/docs/})) {
+        ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ m{^/*uploaded/.+\.sequence$}) || ($uri =~ m{^/*uploaded/$match_domain/$match_courseid/docs/})) {
 	return undef;
     }
     if (($uri =~ /^~/ || $uri =~ m{home/$match_username/public_html/}) 
@@ -8981,7 +8981,8 @@
   &symbclean(&declutter($bighash{'map_id_'.$mapid}).'___'.$resid.'___'.$thisfn)
    eq $symb) { 
 		   if (($env{'request.role.adv'}) ||
-		       $bighash{'encrypted_'.$id} eq $env{'request.enc'}) {
+		       ($bighash{'encrypted_'.$id} eq $env{'request.enc'}) ||
+		       ($thisurl eq '/adm/navmaps')) {
 		       $okay=1; 
 		   }
 	       }