aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-19 15:03:09 -0700
committerfriendica <info@friendica.com>2012-03-19 15:03:09 -0700
commit9e133d6412945f84f858d4bfde26c69f9e1afbfd (patch)
treed2f678e48693a41385df10d0df8586ab6087da4d /include
parent139a86dbd395f4601b29b9af97ac8ea190cce9f9 (diff)
downloadvolse-hubzilla-9e133d6412945f84f858d4bfde26c69f9e1afbfd.tar.gz
volse-hubzilla-9e133d6412945f84f858d4bfde26c69f9e1afbfd.tar.bz2
volse-hubzilla-9e133d6412945f84f858d4bfde26c69f9e1afbfd.zip
refactor openid logins/registrations
Diffstat (limited to 'include')
-rwxr-xr-xinclude/auth.php29
1 files changed, 4 insertions, 25 deletions
diff --git a/include/auth.php b/include/auth.php
index fc52684e6..faf922199 100755
--- a/include/auth.php
+++ b/include/auth.php
@@ -77,7 +77,7 @@ else {
$noid = get_config('system','no_openid');
- $openid_url = trim( (strlen($_POST['openid_url'])?$_POST['openid_url']:$_POST['username']) );
+ $openid_url = trim((strlen($_POST['openid_url'])?$_POST['openid_url']:$_POST['username']) );
// validate_url alters the calling parameter
@@ -99,30 +99,9 @@ else {
$openid->identity = $openid_url;
$_SESSION['openid'] = $openid_url;
$a = get_app();
- $openid->returnUrl = $a->get_baseurl() . '/openid';
-
- $r = q("SELECT `uid` FROM `user` WHERE `openid` = '%s' LIMIT 1",
- dbesc($openid_url)
- );
- if(count($r)) {
- // existing account
- goaway($openid->authUrl());
- // NOTREACHED
- }
- else {
- if($a->config['register_policy'] == REGISTER_CLOSED) {
- $a = get_app();
- notice( t('Login failed.') . EOL);
- goaway(z_root());
- // NOTREACHED
- }
- // new account
- $_SESSION['register'] = 1;
- $openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
- $openid->optional = array('namePerson/first','media/image/aspect11','media/image/default');
- goaway($openid->authUrl());
- // NOTREACHED
- }
+ $openid->returnUrl = $a->get_baseurl(true) . '/openid';
+ goaway($openid->authUrl());
+ // NOTREACHED
}
}
if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') {