do some commits

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

diff --git a/actions/finishaddopenid.php b/actions/finishaddopenid.php
index bd9ecf7dd7356c626cc2a7f8176fe4e8a8142415..9ba3189b33fdeff3bd9492eb39b6dae27ccf0063 100644 (file)
--- a/actions/finishaddopenid.php
+++ b/actions/finishaddopenid.php
@@ -34,7 +34,7 @@ class FinishaddopenidAction extends Action {
 
        function try_login() {
 
-               $consumer = oid_consumer();
+               $consumer =& oid_consumer();
 
                $response = $consumer->complete(common_local_url('finishaddopenid'));
 
@@ -45,38 +45,33 @@ class FinishaddopenidAction extends Action {
                        // Authentication failed; display the error message.
                        $this->message(_t('OpenID authentication failed: ') . $response->message);
                } 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();
-                       $canonical = ($response->endpoint->canonicalID) ?
-                         $response->endpoint->canonicalID : $response->getDisplayIdentifier();
+                       $canonical = ($response->endpoint && $response->endpoint->canonicalID) ?
+                         $response->endpoint->canonicalID : $display;
 
                        $sreg_resp = Auth_OpenID_SRegResponse::fromSuccessResponse($response);
 
                        if ($sreg_resp) {
                                $sreg = $sreg_resp->contents();
                        }
-
-                       $user = $this->get_user($canonical);
-
-                       if ($user) {
-                               $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)) {
-                                       $this->message(_t('Error connecting user'));
+                       
+                       $cur =& common_current_user();
+                       common_debug('cur = ' .print_r($cur, TRUE), __FILE__);
+                       $result = oid_link_user($cur->id, $display, $canonical);
+                       
+                       if (!$result) {
+                               $this->message(_t('Error connecting user.'));
+                               return;
+                       }
+                       if ($sreg) {
+                               if (!$this->update_user($cur, $sreg)) {
+                                       $this->message(_t('Error updating profile'));
                                        return;
                                }
-                               if ($sreg) {
-                                       if (!$this->update_user($user, $sreg)) {
-                                               $this->message(_t('Error updating profile'));
-                                               return;
-                                       }
-                               }
-                               # success!
-                               common_redirect(common_local_url('openidsettings'));
                        }
+                       # success!
+                       common_redirect(common_local_url('openidsettings'));
                }
        }
 
@@ -95,9 +90,9 @@ class FinishaddopenidAction extends Action {
                return $user;
        }
 
-       function update_user($user, $sreg) {
+       function update_user(&$user, $sreg) {
 
-               $profile = $user->getProfile();
+               $profile =& $user->getProfile();
 
                $orig_profile = clone($profile);
 
@@ -136,19 +131,4 @@ class FinishaddopenidAction extends Action {
                
                return true;
        }
-
-       function connect_user($user, $display, $canonical) {
-
-               $oid = new User_openid();
-               $oid->display = $display;
-               $oid->canonical = $canonical;
-               $oid->user_id = $user->id;
-               $oid->created = DB_DataObject_Cast::dateTime();
-
-               common_debug('Saving ' . print_r($oid, TRUE), __FILE__);
-               
-               if (!$oid->insert()) {
-                       return false;
-               }
-       }
 }