--- loncom/auth/lonacc.pm 2006/11/23 01:49:41 1.102 +++ loncom/auth/lonacc.pm 2007/01/12 15:06:18 1.105 @@ -1,7 +1,7 @@ # The LearningOnline Network # Cookie Based Access Handler # -# $Id: lonacc.pm,v 1.102 2006/11/23 01:49:41 albertel Exp $ +# $Id: lonacc.pm,v 1.105 2007/01/12 15:06:18 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; @@ -163,6 +164,7 @@ sub sso_login { # login but immeaditly go to switch server to find us a new # machine &Apache::lonauth::success($r,$user,$domain,$home,'noredirect'); + $env{'request.sso.login'} = 1; $r->internal_redirect('/adm/switchserver'); $r->set_handlers('PerlHandler'=> undef); } else { @@ -183,6 +185,8 @@ sub sso_login { } return OK; } 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; @@ -256,6 +260,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;