GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

take out check for other user

Browse Source 
darcs-hash:20080618210044-84dde-3b064b11117d4c785e4eba7902f1c0298dbbd8a7.gz
This commit is contained in:
Evan Prodromou
2008-06-18 17:00:44 -04:00
parent 6ac185abeb
commit e47ba46634
1 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
actions/finishaddopenid.php
View File

@@ -45,9 +45,7 @@ class FinishaddopenidAction extends Action {
// Authentication failed; display the error message. // Authentication failed; display the error message.
$this->message(_t('OpenID authentication failed: ') . $response->message); $this->message(_t('OpenID authentication failed: ') . $response->message);
} else if ($response->status == Auth_OpenID_SUCCESS) { } else if ($response->status == Auth_OpenID_SUCCESS) {
// This means the authentication succeeded; extract the
// identity URL and Simple Registration data (if it was
// returned).
$display = $response->getDisplayIdentifier(); $display = $response->getDisplayIdentifier();
$canonical = ($response->endpoint && $response->endpoint->canonicalID) ? $canonical = ($response->endpoint && $response->endpoint->canonicalID) ?
$response->endpoint->canonicalID : $display; $response->endpoint->canonicalID : $display;
@@ -58,19 +56,10 @@ class FinishaddopenidAction extends Action {
$sreg = $sreg_resp->contents(); $sreg = $sreg_resp->contents();
} }
common_debug('response = ' .print_r($response, TRUE), __FILE__);
common_debug('sreg = ' .print_r($sreg, TRUE), __FILE__);
common_debug('display = ' .print_r($display, TRUE), __FILE__);
common_debug('canonical = ' .print_r($canonical, TRUE), __FILE__);
$other =& $this->get_user($canonical);
if ($other) {
$this->message(_t('This OpenID is already associated with user "') . $other->nickname . _t('"'));
} else {
$cur =& common_current_user(); $cur =& common_current_user();
common_debug('cur = ' .print_r($cur, TRUE), __FILE__); common_debug('cur = ' .print_r($cur, TRUE), __FILE__);
$result = oid_link_user($cur->id, $display, $canonical); $result = oid_link_user($cur->id, $display, $canonical);
if (!$result) { if (!$result) {
$this->message(_t('Error connecting user.')); $this->message(_t('Error connecting user.'));
return; return;
@@ -85,7 +74,6 @@ class FinishaddopenidAction extends Action {
common_redirect(common_local_url('openidsettings')); common_redirect(common_local_url('openidsettings'));
} }
} }
}
function message($msg) { function message($msg) {
common_show_header(_t('OpenID Login')); common_show_header(_t('OpenID Login'));