--- loncom/auth/lonacc.pm	2006/08/30 21:48:51	1.95
+++ 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.95 2006/08/30 21:48:51 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;
@@ -44,6 +45,7 @@ sub cleanup {
     my ($r)=@_;
     if (! $r->is_initial_req()) { return DECLINED; }
     &Apache::lonnet::save_cache();
+    &Apache::lontexconvert::jsMath_reset();
     return OK;
 }
 
@@ -153,20 +155,23 @@ sub sso_login {
 	return undef;
     }
 
+    my ($user) = ($r->user =~ m/([a-zA-Z0-9_\-@.]*)/);
+
     my $domain = $r->dir_config('lonDefDomain');
-    my $home=&Apache::lonnet::homeserver($r->user,$domain);
+    my $home=&Apache::lonnet::homeserver($user,$domain);
     if ($home !~ /(con_lost|no_host|no_such_host)/) {
 	if ($r->dir_config("lonBalancer") eq 'yes') {
 	    # login but immeaditly go to switch server to find us a new 
 	    # machine
-	    &Apache::lonauth::success($r,$r->user,$domain,$home,'noredirect');
+	    &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
 	    my %info=('ip'        => $r->connection->remote_ip(),
 		      'domain'    => $domain,
-		      'username'  => $r->user,
+		      'username'  => $user,
 		      'server'    => $r->dir_config('lonHostID'),
 		      'sso.login' => 1
 		      );
@@ -175,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;
@@ -194,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
     }
 
@@ -250,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;