keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5068 from Quix0r/fixes/rc-openid-login

Browse source 
OpenId possibly fixed
This commit is contained in:
Hypolite Petovan 2018-05-16 18:42:43 -04:00 committed by GitHub
commit b1c38641cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/openid.php
View file

@ -19,7 +19,7 @@ function openid_content(App $a) {
if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) { if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) {
$openid = new LightOpenID; $openid = new LightOpenID($a->get_hostname());
if($openid->validate()) { if($openid->validate()) {

2
mod/settings.php
View file

@ -543,7 +543,7 @@ function settings_post(App $a)
if ($openid != $a->user['openid'] || (strlen($openid) && (!strlen($openidserver)))) { if ($openid != $a->user['openid'] || (strlen($openid) && (!strlen($openidserver)))) {
if (Network::isUrlValid($openid)) { if (Network::isUrlValid($openid)) {
logger('updating openidserver'); logger('updating openidserver');
$open_id_obj = new LightOpenID; $open_id_obj = new LightOpenID($a->get_hostname());
$open_id_obj->identity = $openid; $open_id_obj->identity = $openid;
$openidserver = $open_id_obj->discover($open_id_obj->identity); $openidserver = $open_id_obj->discover($open_id_obj->identity);
} else { } else {

2
src/Model/User.php
View file

@ -359,7 +359,7 @@ class User
$_SESSION['register'] = 1; $_SESSION['register'] = 1;
$_SESSION['openid'] = $openid_url; $_SESSION['openid'] = $openid_url;
$openid = new LightOpenID; $openid = new LightOpenID($a->get_hostname());
$openid->identity = $openid_url; $openid->identity = $openid_url;
$openid->returnUrl = System::baseUrl() . '/openid'; $openid->returnUrl = System::baseUrl() . '/openid';
$openid->required = ['namePerson/friendly', 'contact/email', 'namePerson']; $openid->required = ['namePerson/friendly', 'contact/email', 'namePerson'];

3
src/Module/Login.php
View file

@ -90,7 +90,8 @@ class Login extends BaseModule
// Otherwise it's probably an openid. // Otherwise it's probably an openid.
try { try {
$openid = new LightOpenID; $a = get_app();
$openid = new LightOpenID($a->get_hostname());
$openid->identity = $openid_url; $openid->identity = $openid_url;
$_SESSION['openid'] = $openid_url; $_SESSION['openid'] = $openid_url;
$_SESSION['remember'] = $remember; $_SESSION['remember'] = $remember;