--- loncom/auth/lonacc.pm	2005/07/07 05:53:35	1.67
+++ loncom/auth/lonacc.pm	2006/01/11 20:57:19	1.72
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.67 2005/07/07 05:53:35 albertel Exp $
+# $Id: lonacc.pm,v 1.72 2006/01/11 20:57:19 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,10 +44,31 @@ sub handler {
     my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
     my $lonid=$cookies{'lonID'};
     my $cookie;
+    my $lonidsdir=$r->dir_config('lonIDsDir');
+
+    my $handle;
     if ($lonid) {
-	my $handle=$lonid->value;
+	$handle=$lonid->value;
         $handle=~s/\W//g;
-        my $lonidsdir=$r->dir_config('lonIDsDir');
+    }
+      
+    if ($r->user 
+	&& (!$lonid || !-e "$lonidsdir/$handle.id" || $handle eq '') ) {
+	my $domain = $r->dir_config('lonDefDomain');
+	my $home=&Apache::lonnet::homeserver($r->user,$domain);
+	if ($home !~ /(con_lost|no_such_host)/) {
+	    $handle=&Apache::lonauth::success($r,$r->user,$domain,
+					     $home,'noredirect');
+	    $r->header_out('Set-cookie',"lonID=$handle; path=/");
+	}
+    }
+
+    if ($r->dir_config("lonBalancer") eq 'yes') {
+	$r->set_handlers('PerlResponseHandler'=>
+			 [\&Apache::switchserver::handler]);
+    }
+
+    if ($handle ne '') {
         if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
 
 # ------------------------------------------------------ Initialize Environment
@@ -95,7 +116,7 @@ sub handler {
 	    if ($env{'user.name'} eq 'public' && 
 		$env{'user.domain'} eq 'public' &&
 		$requrl !~ m{^/+(res|public)/} &&
-		$requrl !~ m{^/+adm/(roles|logout|randomlabel\.png)}) {
+		$requrl !~ m{^/+adm/(help|logout|randomlabel\.png)}) {
 		$env{'request.querystring'}=$r->args;
 		$env{'request.firsturl'}=$requrl;
 		return FORBIDDEN;
@@ -107,6 +128,7 @@ sub handler {
             if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
  ($requrl=~/^\/adm\/.*\/(aboutme|navmaps|smppg|bulletinboard)(\?|$)/) ||
  ($requrl=~/^\/adm\/wrapper\//) ||
+ ($requrl=~m|^/adm/coursedocs/showdoc/|) ||
  ($requrl=~m|\.problem/smpedit$|) ||
  ($requrl=~/^\/public\/.*\/syllabus$/)) {
 # ------------------------------------- This is serious stuff, get symb and log
@@ -117,7 +139,8 @@ sub handler {
                 }
                 if ($env{'form.symb'}) {
 		    $symb=&Apache::lonnet::symbclean($env{'form.symb'});
-                    if ($requrl =~ m|^/adm/wrapper/|) {
+                    if ($requrl =~ m|^/adm/wrapper/|
+			|| $requrl =~ m|^/adm/coursedocs/showdoc/|) {
                         my ($map,$mid,$murl)=&Apache::lonnet::decode_symb($symb);
                         &Apache::lonnet::symblist($map,$murl => [$murl,$mid],
 						  'last_known' =>[$murl,$mid]);
@@ -167,6 +190,7 @@ sub handler {
     if ($requrl=~m|^/public/|
 	|| (&Apache::lonnet::metadata($requrl,'copyright') eq 'public')) {
         &Apache::lonnet::logthis('Granting public access: '.$requrl);
+        &Apache::lonlocal::get_language_handle($r);
 	my $cookie=
 	    &Apache::lonauth::success($r,'public','public','public');
         my $lonidsdir=$r->dir_config('lonIDsDir');
@@ -179,6 +203,9 @@ sub handler {
 	$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') ||