From 4a0b1a9ea9d288e42ac03c43ef904b0565a7087f Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 18 Jun 2008 07:43:10 -0400 Subject: consolidate linking a user to an OpenID darcs-hash:20080618114310-84dde-15b224bb16d434150af457bc3b08de58e3833abd.gz --- actions/finishopenidlogin.php | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'actions/finishopenidlogin.php') diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php index 202520d54..3d0c8f277 100644 --- a/actions/finishopenidlogin.php +++ b/actions/finishopenidlogin.php @@ -264,15 +264,8 @@ class FinishopenidloginAction extends Action { $profile->delete(); } - $oid = new User_openid(); - $oid->display = $display; - $oid->canonical = $canonical; - $oid->user_id = $id; - $oid->created = DB_DataObject_Cast::dateTime(); - $result = $oid->insert(); - - if (!$result) { + if (!oid_link_user($user->id, $canonical, $display) { # Try to clean up... $user->delete(); $profile->delete(); @@ -303,14 +296,10 @@ class FinishopenidloginAction extends Action { return; } - $oid = new User_openid(); - $oid->display = $display; - $oid->canonical = $canonical; - $oid->user_id = $user->id; - $oid->created = DB_DataObject_Cast::dateTime(); + $result = oid_link_user($user->id, $canonical, $display); - if (!$oid->insert()) { - common_server_error(_t('Error connecting OpenID.')); + if (!$result) { + common_server_error(_t('Error connecting user to OpenID.')); return; } -- cgit v1.2.3-54-g00ecf