move instructions to top in openid pages

[quix0rs-gnu-social.git] / actions / finishopenidlogin.php

diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php
index 825f1d959dc27700170bddb6fbde33ec437f7ddb..2b3616ffae8074c5103dd6eaa7527b825b057635 100644 (file)
--- a/actions/finishopenidlogin.php
+++ b/actions/finishopenidlogin.php
@@ -264,14 +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_link_user($user->id, $canonical, $display);
                
-               $result = $oid->insert();
-
                if (!$result) {
                        # Try to clean up...
                        $user->delete();
@@ -279,7 +273,7 @@ class FinishopenidloginAction extends Action {
                }
                
                common_set_user($user->nickname);
-               common_redirect(common_local_url('showstream', array('nickname' => $user->nickname));
+               common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)));
        }
        
        function connect_user() {
@@ -303,14 +297,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;
                }