loncom/auth/lonacc.pm - diff

Return to lonacc.pm CVS log

Up to [LON-CAPA] / loncom / auth

version 1.151, 2014/01/04 23:21:22	version 1.153, 2014/01/30 12:15:12
Line 365 sub sso_login {	Line 365 sub sso_login {
}	}
}	}
unless ($info{'symb'}) {	unless ($info{'symb'}) {
unless ($r->uri eq '/adm/roles') {	unless (($r->uri eq '/adm/roles') \|\| ($r->uri eq '/adm/sso')) {
$info{'origurl'} = $r->uri;	$info{'origurl'} = $r->uri;
}	}
}	}
Line 402 sub sso_login {	Line 402 sub sso_login {
}	}
}	}
if (grep(/^sso$/,@cancreate)) {	if (grep(/^sso$/,@cancreate)) {
$r->internal_redirect('/adm/createaccount');	$r->set_handlers('PerlHandler'=>
	[\&Apache::createaccount::handler]);
	$r->handler('perl-script');
} else {	} else {
$r->internal_redirect($r->dir_config('lonSSOUserUnknownRedirect'));	$r->internal_redirect($r->dir_config('lonSSOUserUnknownRedirect'));
	$r->set_handlers('PerlHandler'=> undef);
}	}
$r->set_handlers('PerlHandler'=> undef);
return OK;	return OK;
}	}
return undef;	return undef;
Line 530 sub handler {	Line 532 sub handler {
if ($otherserver ne '') {	if ($otherserver ne '') {
$env{'form.otherserver'} = $otherserver;	$env{'form.otherserver'} = $otherserver;
}	}
	unless (($env{'form.origurl'}) \|\| ($r->uri eq '/adm/roles') \|\|
	($r->uri eq '/adm/switchserver') \|\| ($r->uri eq '/adm/sso')) {
	$env{'form.origurl'} = $r->uri;
	}
}	}

# ---------------------------------------------------------------- Check access	# ---------------------------------------------------------------- Check access