[LON-CAPA-cvs] cvs: loncom /auth lonacc.pm /lonnet/perl lonnet.pm

[albertel]

albertel		Wed Aug 30 17:48:55 2006 EDT

  Modified files:              
    /loncom/auth	lonacc.pm 
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - BUG#4986, smppg weren't listing to conditions
  
  
Index: loncom/auth/lonacc.pm
diff -u loncom/auth/lonacc.pm:1.94 loncom/auth/lonacc.pm:1.95
--- loncom/auth/lonacc.pm:1.94	Wed Aug 30 12:50:23 2006
+++ loncom/auth/lonacc.pm	Wed Aug 30 17:48:51 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.94 2006/08/30 16:50:23 albertel Exp $
+# $Id: lonacc.pm,v 1.95 2006/08/30 21:48:51 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -239,7 +239,8 @@
 
 # ---------------------------------------------------------------- Check access
 	my $now = time;
-	if ($requrl!~/^\/adm|public|prtspool\//) {
+	if ($requrl !~ m{^/(?:adm|public|prtspool)/}
+	    || $requrl =~ /^\/adm\/.*\/(smppg|bulletinboard)(\?|$ )/x) {
 	    my $access=&Apache::lonnet::allowed('bre',$requrl);
 	    if ($access eq '1') {
 		$env{'user.error.msg'}="$requrl:bre:0:0:Choose Course";
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.774 loncom/lonnet/perl/lonnet.pm:1.775
--- loncom/lonnet/perl/lonnet.pm:1.774	Wed Aug 30 12:49:36 2006
+++ loncom/lonnet/perl/lonnet.pm	Wed Aug 30 17:48:54 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.774 2006/08/30 16:49:36 banghart Exp $
+# $Id: lonnet.pm,v 1.775 2006/08/30 21:48:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3474,7 +3474,7 @@
     
     if (defined($env{'allowed.'.$priv})) { return $env{'allowed.'.$priv}; }
 # Free bre access to adm and meta resources
-    if (((($uri=~/^adm\//) && ($uri !~ m|/bulletinboard$|)) 
+    if (((($uri=~/^adm\//) && ($uri !~ m{/(?:smppg|bulletinboard)$})) 
 	 || (($uri=~/\.meta$/) && ($uri!~m|^uploaded/|) )) 
 	&& ($priv eq 'bre')) {
 	return 'F';