trac750 Add prefix string option in Facebook app for notice sync

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

diff --git a/actions/finishaddopenid.php b/actions/finishaddopenid.php
index 2b34b38ea2eb0f22ae69025e83fba094d630a487..0ce1680aa60fbaa135d3ac25d1d8219719e02f01 100644 (file)
--- a/actions/finishaddopenid.php
+++ b/actions/finishaddopenid.php
@@ -21,139 +21,87 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
-class FinishaddopenidAction extends Action {
-
-       function handle($args) {
-               parent::handle($args);
-               if (!common_logged_in()) {
-                       common_user_error(_t('Not logged in.'));
-               } else {
-                       $this->try_login();
-               }
-       }
-
-       function try_login() {
-
-               $consumer = oid_consumer();
-
-               $response = $consumer->complete(common_local_url('finishaddopenid'));
-
-               if ($response->status == Auth_OpenID_CANCEL) {
-                       $this->message(_t('OpenID authentication cancelled.'));
-                       return;
-               } else if ($response->status == Auth_OpenID_FAILURE) {
-                       // 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();
-
-                       $sreg_resp = Auth_OpenID_SRegResponse::fromSuccessResponse($response);
-
-                       if ($sreg_resp) {
-                               $sreg = $sreg_resp->contents();
-                       }
-
-                       $other = $this->get_user($canonical);
-
-                       if ($other) {
-                               $this->message(_t('This OpenID is already associated with user "') . $user->nickname . _t('"'));
-                       } else {
-                               $cur = common_current_user();
-                               if (!$this->connect_user($cur, $display, $canonical)) {
-                                       $this->message(_t('Error connecting user'));
-                                       return;
-                               }
-                               if ($sreg) {
-                                       if (!$this->update_user($cur, $sreg)) {
-                                               $this->message(_t('Error updating profile'));
-                                               return;
-                                       }
-                               }
-                               # success!
-                               common_redirect(common_local_url('openidsettings'));
-                       }
-               }
-       }
-
-       function message($msg) {
-               common_show_header(_t('OpenID Login'));
-               common_element('p', NULL, $msg);
-               common_show_footer();
-       }
-
-       function get_user($canonical) {
-               $user = NULL;
-               $oid = User_openid::staticGet('canonical', $canonical);
-               if ($oid) {
-                       $user = User::staticGet('id', $oid->user_id);
-               }
-               return $user;
-       }
-
-       function update_user($user, $sreg) {
-
-               $profile = $user->getProfile();
-
-               $orig_profile = clone($profile);
-
-               if ($sreg['fullname'] && strlen($sreg['fullname']) <= 255) {
-                       $profile->fullname = $sreg['fullname'];
-               }
-
-               if ($sreg['country']) {
-                       if ($sreg['postcode']) {
-                               # XXX: use postcode to get city and region
-                               # XXX: also, store postcode somewhere -- it's valuable!
-                               $profile->location = $sreg['postcode'] . ', ' . $sreg['country'];
-                       } else {
-                               $profile->location = $sreg['country'];
-                       }
-               }
-
-               # XXX save language if it's passed
-               # XXX save timezone if it's passed
-
-               if (!$profile->update($orig_profile)) {
-                       common_server_error(_t('Error saving the profile.'));
-                       return false;
-               }
-
-               $orig_user = clone($user);
-
-               if ($sreg['email'] && Validate::email($sreg['email'], true)) {
-                       $user->email = $sreg['email'];
-               }
-
-               if (!$user->update($orig_user)) {
-                       common_server_error(_t('Error saving the user.'));
-                       return false;
-               }
-               
-               return true;
-       }
-
-       function connect_user($user, $display, $canonical) {
-
-               $id = $user->id;
-               
-               $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) {
-                       $err = PEAR::getStaticProperty('DB_DataObject','lastError');
-                       common_debug('DB error ' . $err->code . ': ' . $err->message, __FILE__);
-                       return false;
-               }
-               return true;
-       }
+class FinishaddopenidAction extends Action
+{
+
+    function handle($args)
+    {
+        parent::handle($args);
+        if (!common_logged_in()) {
+            common_user_error(_('Not logged in.'));
+        } else {
+            $this->try_login();
+        }
+    }
+    
+    function try_login()
+    {
+
+        $consumer =& oid_consumer();
+
+        $response = $consumer->complete(common_local_url('finishaddopenid'));
+
+        if ($response->status == Auth_OpenID_CANCEL) {
+            $this->message(_('OpenID authentication cancelled.'));
+            return;
+        } else if ($response->status == Auth_OpenID_FAILURE) {
+            // Authentication failed; display the error message.
+            $this->message(sprintf(_('OpenID authentication failed: %s'), $response->message));
+        } else if ($response->status == Auth_OpenID_SUCCESS) {
+
+            $display = $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();
+            }
+
+            $cur =& common_current_user();
+            $other = oid_get_user($canonical);
+
+            if ($other) {
+                if ($other->id == $cur->id) {
+                    $this->message(_('You already have this OpenID!'));
+                } else {
+                    $this->message(_('Someone else already has this OpenID.'));
+                }
+                return;
+            }
+
+            # start a transaction
+
+            $cur->query('BEGIN');
+
+            $result = oid_link_user($cur->id, $canonical, $display);
+
+            if (!$result) {
+                $this->message(_('Error connecting user.'));
+                return;
+            }
+            if ($sreg) {
+                if (!oid_update_user($cur, $sreg)) {
+                    $this->message(_('Error updating profile'));
+                    return;
+                }
+            }
+
+            # success!
+
+            $cur->query('COMMIT');
+
+            oid_set_last($display);
+
+            common_redirect(common_local_url('openidsettings'));
+        }
+    }
+
+    function message($msg)
+    {
+        common_show_header(_('OpenID Login'));
+        common_element('p', null, $msg);
+        common_show_footer();
+    }
 }