--- loncom/auth/lonacc.pm	2006/09/07 20:57:04	1.97
+++ loncom/auth/lonacc.pm	2007/01/08 15:54:23	1.104
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.97 2006/09/07 20:57:04 albertel Exp $
+# $Id: lonacc.pm,v 1.104 2007/01/08 15:54:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,7 @@ use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonlocal;
 use Apache::restrictedaccess();
+use Apache::blockedaccess(); 
 use CGI::Cookie();
 use Fcntl qw(:flock);
 use LONCAPA;
@@ -164,6 +165,7 @@ sub sso_login {
 	    # machine
 	    &Apache::lonauth::success($r,$user,$domain,$home,'noredirect');
 	    $r->internal_redirect('/adm/switchserver');
+	    $r->set_handlers('PerlHandler'=> undef);
 	} else {
 	    # need to login them in, so generate the need data that
 	    # migrate expects to do login
@@ -178,10 +180,14 @@ sub sso_login {
 					$r->dir_config('lonHostID'));
 	    $env{'form.token'} = $token;
 	    $r->internal_redirect('/adm/migrateuser');
+	    $r->set_handlers('PerlHandler'=> undef);
 	}
 	return OK;
-    } elsif (defined($r->dir_config('lonSSOUserUnkownRedirect'))) {
-	$r->internal_redirect($r->dir_config('lonSSOUserUnkownRedirect'));
+    } elsif (defined($r->dir_config('lonSSOUserUnknownRedirect'))) {
+        $r->subprocess_env->set('SSOUserUnknown' => $user);
+        $r->subprocess_env->set('SSOUserDomain' => $domain);
+	$r->internal_redirect($r->dir_config('lonSSOUserUnknownRedirect'));
+	$r->set_handlers('PerlHandler'=> undef);
 	return OK;
     }
     return undef;
@@ -197,11 +203,11 @@ sub handler {
 
     my $handle;
     if ($lonid) {
-	$handle=$lonid->value;
-        $handle=~s/\W//g;
+	$handle=&LONCAPA::clean_handle($lonid->value);
     }
 
-    if (my $result = &sso_login($r,$lonid,$handle)) {
+    my $result = &sso_login($r,$lonid,$handle);
+    if (defined($result)) {
 	return $result
     }
 
@@ -253,6 +259,10 @@ sub handler {
 		&Apache::restrictedaccess::setup_handler($r);
 		return OK;
 	    }
+            if ($access eq 'B') {
+                &Apache::blockedaccess::setup_handler($r);
+                return OK;
+            }
 	    if (($access ne '2') && ($access ne 'F')) {
 		$env{'user.error.msg'}="$requrl:bre:1:1:Access Denied";
 		return HTTP_NOT_ACCEPTABLE;