cleanup after openid refactoring
This commit is contained in:
parent
9e133d6412
commit
b8f6312408
1 changed files with 6 additions and 1 deletions
|
@ -13,6 +13,7 @@ function openid_content(&$a) {
|
||||||
logger('mod_openid ' . print_r($_REQUEST,true), LOGGER_DATA);
|
logger('mod_openid ' . print_r($_REQUEST,true), LOGGER_DATA);
|
||||||
|
|
||||||
if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) {
|
if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) {
|
||||||
|
|
||||||
$openid = new LightOpenID;
|
$openid = new LightOpenID;
|
||||||
|
|
||||||
if($openid->validate()) {
|
if($openid->validate()) {
|
||||||
|
@ -31,6 +32,9 @@ function openid_content(&$a) {
|
||||||
);
|
);
|
||||||
|
|
||||||
if($r && count($r)) {
|
if($r && count($r)) {
|
||||||
|
|
||||||
|
// successful OpenID login
|
||||||
|
|
||||||
unset($_SESSION['openid']);
|
unset($_SESSION['openid']);
|
||||||
|
|
||||||
require_once('include/security.php');
|
require_once('include/security.php');
|
||||||
|
@ -42,7 +46,8 @@ function openid_content(&$a) {
|
||||||
goaway(z_root());
|
goaway(z_root());
|
||||||
}
|
}
|
||||||
|
|
||||||
// new registration?
|
// Successful OpenID login - but we can't match it to an existing account.
|
||||||
|
// New registration?
|
||||||
|
|
||||||
if($a->config['register_policy'] == REGISTER_CLOSED) {
|
if($a->config['register_policy'] == REGISTER_CLOSED) {
|
||||||
notice( t('Account not found and OpenID registration is not permitted on this site.') . EOL);
|
notice( t('Account not found and OpenID registration is not permitted on this site.') . EOL);
|
||||||
|
|
Loading…
Reference in a new issue