--- loncom/auth/publiccheck.pm	2006/07/14 21:39:16	1.6
+++ loncom/auth/publiccheck.pm	2006/07/21 18:52:32	1.8
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: publiccheck.pm,v 1.6 2006/07/14 21:39:16 albertel Exp $
+# $Id: publiccheck.pm,v 1.8 2006/07/21 18:52:32 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,6 +40,7 @@ use Apache::lonacc();
 
 sub handler {
     my $r = shift;
+
     my $requrl=$r->uri;
     my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
     my $lonid=$cookies{'lonID'};
@@ -60,20 +61,17 @@ sub handler {
 	|| (&Apache::lonnet::metadata($requrl,'copyright') eq 'public')) {
         &process_public($r,$requrl);
         return OK;
-    } elsif ($requrl =~ m|/+uploaded/([^/]+)/([^/]+)/portfolio(/.+)$|) {
-        my $access = &process_portfolio($1,$2,$3);
+    } elsif (&Apache::lonnet::is_portfolio_url($requrl)) {
+	my (undef,$udom,$unum,$file_name,$group) = 
+	    &Apache::lonnet::parse_portfolio_url($requrl);
+        my $access = &process_portfolio($udom,$unum,$file_name,$group);
         if ($access) {
             &process_public($r,$requrl,$access);
             return OK;
         } 
-    } elsif ($requrl =~ m|/+uploaded/([^/]+)/([^/]+)/groups/([^/]+)/portfolio/(.+)$|) {
-        my $access = &process_portfolio($1,$2,$3.'/'.$4,$3);
-        if ($access) {
-            &process_public($r,$requrl,$access);
-            return OK;
-        }
     } elsif ($requrl eq '/adm/restrictedaccess') {
         &process_public($r,$requrl);
+	return OK;
     } 
     return DECLINED;
 }