--- loncom/auth/lonacc.pm	2005/04/22 20:55:40	1.65
+++ loncom/auth/lonacc.pm	2005/07/07 21:38:35	1.68
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.65 2005/04/22 20:55:40 albertel Exp $
+# $Id: lonacc.pm,v 1.68 2005/07/07 21:38:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -92,6 +92,14 @@ sub handler {
 		    return HTTP_NOT_ACCEPTABLE;
 		}
 	    }
+	    if ($env{'user.name'} eq 'public' && 
+		$env{'user.domain'} eq 'public' &&
+		$requrl !~ m{^/+(res|public)/} &&
+		$requrl !~ m{^/+adm/(help|roles|logout|randomlabel\.png)}) {
+		$env{'request.querystring'}=$r->args;
+		$env{'request.firsturl'}=$requrl;
+		return FORBIDDEN;
+	    }
 # ------------------------------------------------------------- This is allowed
           if ($env{'request.course.id'}) {
 	    &Apache::lonnet::countacc($requrl);
@@ -159,23 +167,21 @@ sub handler {
     if ($requrl=~m|^/public/|
 	|| (&Apache::lonnet::metadata($requrl,'copyright') eq 'public')) {
         &Apache::lonnet::logthis('Granting public access: '.$requrl);
+	my $cookie=
+	    &Apache::lonauth::success($r,'public','public','public');
+        my $lonidsdir=$r->dir_config('lonIDsDir');
+	&Apache::lonnet::transfer_profile_to_env($lonidsdir,$cookie);
 	&Apache::loncommon::get_posted_cgi($r);
-	$env{'user.name'}='public';
-        $env{'user.domain'}='public';
         $env{'request.state'} = "published";
         $env{'request.publicaccess'} = 1;
         $env{'request.filename'} = $r->filename;
-	my ($httpbrowser,  $clientbrowser, $clientversion,
-	    $clientmathml, $clientunicode, $clientos) =
-		&Apache::loncommon::decode_user_agent($r);
-	$env{'browser.type'}=$clientbrowser;
-        $env{'browser.version'}=$clientversion;
-        $env{'browser.mathml'}=$clientmathml;
-        $env{'browser.unicode'}=$clientunicode;
-        $env{'browser.os'}=$clientos;
 
+	$r->header_out('Set-cookie',"lonID=$cookie; path=/");
         return OK;
     }
+    if ($requrl=~m|^/+adm/+help/+|) {
+	return OK;
+    }
 # -------------------------------------------------------------- Not authorized
     $requrl=~/\.(\w+)$/;
 #    if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||