We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit dc2e7f42 authored by Evan Prodromou's avatar Evan Prodromou

voodoo changes

darcs-hash:20080618113720-84dde-4483d18751e7f82480c925cce4d1f84095598742.gz
parent d1a895c5
......@@ -58,18 +58,18 @@ class FinishaddopenidAction extends Action {
$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('"'));
} else {
$user = common_current_user();
if (!$this->connect_user($user, $display, $canonical)) {
$cur = common_current_user();
if (!$this->connect_user($cur, $display, $canonical)) {
$this->message(_t('Error connecting user'));
return;
}
if ($sreg) {
if (!$this->update_user($user, $sreg)) {
if (!$this->update_user($cur, $sreg)) {
$this->message(_t('Error updating profile'));
return;
}
......@@ -139,13 +139,17 @@ class FinishaddopenidAction extends Action {
function connect_user($user, $display, $canonical) {
$id = $user->id;
$oid = new User_openid();
$oid->display = $display;
$oid->canonical = $canonical;
$oid->user_id = $user->id;
$oid->user_id = $id;
$oid->created = DB_DataObject_Cast::dateTime();
if (!$oid->insert()) {
$result = $oid->insert();
if (!$result) {
$err = PEAR::getStaticProperty('DB_DataObject','lastError');
common_debug('DB error ' . $err->code . ': ' . $err->message, __FILE__);
return false;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment