--- loncom/auth/lonacc.pm 2008/03/08 02:45:14 1.114 +++ loncom/auth/lonacc.pm 2008/11/10 13:20:24 1.117 @@ -1,7 +1,7 @@ # The LearningOnline Network # Cookie Based Access Handler # -# $Id: lonacc.pm,v 1.114 2008/03/08 02:45:14 raeburn Exp $ +# $Id: lonacc.pm,v 1.117 2008/11/10 13:20:24 jms Exp $ # # Copyright Michigan State University Board of Trustees # @@ -150,6 +150,7 @@ sub get_posted_cgi { # balance them # returns OK if it was a SSO and user was handled # undef if not SSO or no means to hanle the user + sub sso_login { my ($r,$handle) = @_; @@ -187,6 +188,9 @@ sub sso_login { 'server' => $r->dir_config('lonHostID'), 'sso.login' => 1 ); + if ($r->dir_config("ssodirecturl") == 1) { + $info{'origurl'} = $r->uri; + } if (defined($r->dir_config("lonSSOReloginServer"))) { $info{'sso.reloginserver'} = $r->dir_config('lonSSOReloginServer'); @@ -203,7 +207,24 @@ sub sso_login { &Apache::lonnet::logthis(" SSO authorized unknown user $user "); $r->subprocess_env->set('SSOUserUnknown' => $user); $r->subprocess_env->set('SSOUserDomain' => $domain); - $r->internal_redirect($r->dir_config('lonSSOUserUnknownRedirect')); + my @cancreate; + my %domconfig = + &Apache::lonnet::get_dom('configuration',['usercreation'],$domain); + if (ref($domconfig{'usercreation'}) eq 'HASH') { + if (ref($domconfig{'usercreation'}{'cancreate'}) eq 'HASH') { + if (ref($domconfig{'usercreation'}{'cancreate'}{'selfcreate'}) eq 'ARRAY') { + @cancreate = @{$domconfig{'usercreation'}{'cancreate'}{'selfcreate'}}; + } elsif (($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne 'none') && + ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne '')) { + @cancreate = ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'}); + } + } + } + if (grep(/^sso$/,@cancreate)) { + $r->internal_redirect('/adm/createaccount'); + } else { + $r->internal_redirect($r->dir_config('lonSSOUserUnknownRedirect')); + } $r->set_handlers('PerlHandler'=> undef); return OK; } @@ -222,7 +243,7 @@ sub handler { my $result = &sso_login($r,$handle); if (defined($result)) { - return $result + return $result; }