eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

voodoo changes

Browse Source 
darcs-hash:20080618113720-84dde-4483d18751e7f82480c925cce4d1f84095598742.gz
This commit is contained in:
Evan Prodromou 2008-06-18 07:37:20 -04:00
parent d1a895c5b1
commit dc2e7f4225
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
actions/finishaddopenid.php
View File

@ -58,18 +58,18 @@ class FinishaddopenidAction extends Action {
$sreg = $sreg_resp->contents(); $sreg = $sreg_resp->contents();
} }
$user = $this->get_user($canonical); $other = $this->get_user($canonical);
if ($user) { if ($other) {
$this->message(_t('This OpenID is already associated with user "') . $user->nickname . _t('"')); $this->message(_t('This OpenID is already associated with user "') . $user->nickname . _t('"'));
} else { } else {
$user = common_current_user(); $cur = common_current_user();
if (!$this->connect_user($user, $display, $canonical)) { if (!$this->connect_user($cur, $display, $canonical)) {
$this->message(_t('Error connecting user')); $this->message(_t('Error connecting user'));
return; return;
} }
if ($sreg) { if ($sreg) {
if (!$this->update_user($user, $sreg)) { if (!$this->update_user($cur, $sreg)) {
$this->message(_t('Error updating profile')); $this->message(_t('Error updating profile'));
return; return;
} }
@ -139,13 +139,17 @@ class FinishaddopenidAction extends Action {
function connect_user($user, $display, $canonical) { function connect_user($user, $display, $canonical) {
$id = $user->id;
$oid = new User_openid(); $oid = new User_openid();
$oid->display = $display; $oid->display = $display;
$oid->canonical = $canonical; $oid->canonical = $canonical;
$oid->user_id = $user->id; $oid->user_id = $id;
$oid->created = DB_DataObject_Cast::dateTime(); $oid->created = DB_DataObject_Cast::dateTime();
if (!$oid->insert()) { $result = $oid->insert();
if (!$result) {
$err = PEAR::getStaticProperty('DB_DataObject','lastError'); $err = PEAR::getStaticProperty('DB_DataObject','lastError');
common_debug('DB error ' . $err->code . ': ' . $err->message, __FILE__); common_debug('DB error ' . $err->code . ': ' . $err->message, __FILE__);
return false; return false;