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

[www]

www		Wed Nov 23 15:46:06 2005 EDT

  Modified files:              
    /loncom/auth	lonacc.pm lonlogin.pm 
  Log:
  Remove "already logged in" and "no active roles" weirdness after looking
  at /public-resources.
  
  
Index: loncom/auth/lonacc.pm
diff -u loncom/auth/lonacc.pm:1.68 loncom/auth/lonacc.pm:1.69
--- loncom/auth/lonacc.pm:1.68	Thu Jul  7 17:38:35 2005
+++ loncom/auth/lonacc.pm	Wed Nov 23 15:46:04 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.68 2005/07/07 21:38:35 albertel Exp $
+# $Id: lonacc.pm,v 1.69 2005/11/23 20:46:04 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -95,7 +95,7 @@
 	    if ($env{'user.name'} eq 'public' && 
 		$env{'user.domain'} eq 'public' &&
 		$requrl !~ m{^/+(res|public)/} &&
-		$requrl !~ m{^/+adm/(help|roles|logout|randomlabel\.png)}) {
+		$requrl !~ m{^/+adm/(help|logout|randomlabel\.png)}) {
 		$env{'request.querystring'}=$r->args;
 		$env{'request.firsturl'}=$requrl;
 		return FORBIDDEN;
Index: loncom/auth/lonlogin.pm
diff -u loncom/auth/lonlogin.pm:1.68 loncom/auth/lonlogin.pm:1.69
--- loncom/auth/lonlogin.pm:1.68	Tue Aug 30 17:14:20 2005
+++ loncom/auth/lonlogin.pm	Wed Nov 23 15:46:04 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.68 2005/08/30 21:14:20 albertel Exp $
+# $Id: lonlogin.pm,v 1.69 2005/11/23 20:46:04 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,7 +60,7 @@
 	my $handle=$lonid->value;
         $handle=~s/\W//g;
         my $lonidsdir=$r->dir_config('lonIDsDir');
-        if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
+        if ((-e "$lonidsdir/$handle.id") && ($handle ne '') && ($handle!~/^publicuser\_/)) {
 # Indeed, a valid token is found
 	    my $bodytag=&Apache::loncommon::bodytag('Already logged in');
 	    $r->print(<<ENDFAILED);