mirror of
https://github.com/friendica/friendica
synced 2024-12-23 11:20:15 +00:00
Issue 3229: Switched to other function to receive the identity
This commit is contained in:
parent
7a9aba7674
commit
f71abb30ca
1 changed files with 15 additions and 24 deletions
|
@ -13,21 +13,20 @@ use Friendica\Util\Strings;
|
||||||
|
|
||||||
function openid_content(App $a) {
|
function openid_content(App $a) {
|
||||||
|
|
||||||
$noid = Config::get('system','no_openid');
|
if (Config::get('system','no_openid')) {
|
||||||
if($noid)
|
|
||||||
$a->internalRedirect();
|
$a->internalRedirect();
|
||||||
|
}
|
||||||
|
|
||||||
Logger::log('mod_openid ' . print_r($_REQUEST,true), Logger::DATA);
|
Logger::log('mod_openid ' . print_r($_REQUEST,true), Logger::DATA);
|
||||||
|
|
||||||
if(!empty($_GET['openid_mode']) && !empty($_SESSION['openid'])) {
|
if (!empty($_GET['openid_mode']) && !empty($_SESSION['openid'])) {
|
||||||
|
|
||||||
$openid = new LightOpenID($a->getHostName());
|
$openid = new LightOpenID($a->getHostName());
|
||||||
|
|
||||||
if($openid->validate()) {
|
if ($openid->validate()) {
|
||||||
|
$authid = $openid->identity;
|
||||||
|
|
||||||
$authid = $_REQUEST['openid_identity'];
|
if (empty($authid)) {
|
||||||
|
|
||||||
if(! strlen($authid)) {
|
|
||||||
Logger::log(L10n::t('OpenID protocol error. No ID returned.') . EOL);
|
Logger::log(L10n::t('OpenID protocol error. No ID returned.') . EOL);
|
||||||
$a->internalRedirect();
|
$a->internalRedirect();
|
||||||
}
|
}
|
||||||
|
@ -37,22 +36,16 @@ function openid_content(App $a) {
|
||||||
// mod/settings.php in 8367cad so it might have left mixed
|
// mod/settings.php in 8367cad so it might have left mixed
|
||||||
// records in the user table
|
// records in the user table
|
||||||
//
|
//
|
||||||
$r = q("SELECT *
|
$condition = ['blocked' => false, 'account_expired' => false, 'account_removed' => false, 'verified' => true,
|
||||||
FROM `user`
|
'openid' => [$authid, Strings::normaliseOpenID($authid)]];
|
||||||
WHERE ( `openid` = '%s' OR `openid` = '%s' )
|
$user = DBA::selectFirst('user', [], $condition);
|
||||||
AND `blocked` = 0 AND `account_expired` = 0
|
if (DBA::isResult($user)) {
|
||||||
AND `account_removed` = 0 AND `verified` = 1
|
|
||||||
LIMIT 1",
|
|
||||||
DBA::escape($authid), DBA::escape(Strings::normaliseOpenID($authid))
|
|
||||||
);
|
|
||||||
|
|
||||||
if (DBA::isResult($r)) {
|
|
||||||
|
|
||||||
// successful OpenID login
|
// successful OpenID login
|
||||||
|
|
||||||
unset($_SESSION['openid']);
|
unset($_SESSION['openid']);
|
||||||
|
|
||||||
Session::setAuthenticatedForUser($a, $r[0],true,true);
|
Session::setAuthenticatedForUser($a, $user, true, true);
|
||||||
|
|
||||||
// just in case there was no return url set
|
// just in case there was no return url set
|
||||||
// and we fell through
|
// and we fell through
|
||||||
|
@ -76,10 +69,10 @@ function openid_content(App $a) {
|
||||||
if ($k === 'namePerson/friendly') {
|
if ($k === 'namePerson/friendly') {
|
||||||
$nick = Strings::escapeTags(trim($v));
|
$nick = Strings::escapeTags(trim($v));
|
||||||
}
|
}
|
||||||
if($k === 'namePerson/first') {
|
if ($k === 'namePerson/first') {
|
||||||
$first = Strings::escapeTags(trim($v));
|
$first = Strings::escapeTags(trim($v));
|
||||||
}
|
}
|
||||||
if($k === 'namePerson') {
|
if ($k === 'namePerson') {
|
||||||
$args .= '&username=' . urlencode(Strings::escapeTags(trim($v)));
|
$args .= '&username=' . urlencode(Strings::escapeTags(trim($v)));
|
||||||
}
|
}
|
||||||
if ($k === 'contact/email') {
|
if ($k === 'contact/email') {
|
||||||
|
@ -95,15 +88,13 @@ function openid_content(App $a) {
|
||||||
}
|
}
|
||||||
if (!empty($nick)) {
|
if (!empty($nick)) {
|
||||||
$args .= '&nickname=' . urlencode($nick);
|
$args .= '&nickname=' . urlencode($nick);
|
||||||
}
|
} elseif (!empty($first)) {
|
||||||
elseif (!empty($first)) {
|
|
||||||
$args .= '&nickname=' . urlencode($first);
|
$args .= '&nickname=' . urlencode($first);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($photosq)) {
|
if (!empty($photosq)) {
|
||||||
$args .= '&photo=' . urlencode($photosq);
|
$args .= '&photo=' . urlencode($photosq);
|
||||||
}
|
} elseif (!empty($photo)) {
|
||||||
elseif (!empty($photo)) {
|
|
||||||
$args .= '&photo=' . urlencode($photo);
|
$args .= '&photo=' . urlencode($photo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue