Merge branch '2828' into 0.9.x

[quix0rs-gnu-social.git] / plugins / OpenID / finishaddopenid.php

diff --git a/plugins/OpenID/finishaddopenid.php b/plugins/OpenID/finishaddopenid.php
index 7753158d5d458dde42988307a10bd1164e9e17e3..6eb2f2d20637ec65c101326a090b55e3787b728a 100644 (file)
--- a/plugins/OpenID/finishaddopenid.php
+++ b/plugins/OpenID/finishaddopenid.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Complete adding an OpenID
  *
@@ -20,14 +20,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Settings
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2008-2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -39,10 +39,10 @@ require_once INSTALLDIR.'/plugins/OpenID/openid.php';
  * Handle the return from an OpenID verification
  *
  * @category Settings
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class FinishaddopenidAction extends Action
@@ -64,7 +64,8 @@ class FinishaddopenidAction extends Action
     {
         parent::handle($args);
         if (!common_logged_in()) {
-            $this->clientError(_('Not logged in.'));
+            // TRANS: Client error message
+            $this->clientError(_m('Not logged in.'));
         } else {
             $this->tryLogin();
         }
@@ -80,16 +81,18 @@ class FinishaddopenidAction extends Action
 
     function tryLogin()
     {
-        $consumer =& oid_consumer();
+        $consumer = oid_consumer();
 
         $response = $consumer->complete(common_local_url('finishaddopenid'));
 
         if ($response->status == Auth_OpenID_CANCEL) {
-            $this->message(_('OpenID authentication cancelled.'));
+            // TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
+            $this->message(_m('OpenID authentication cancelled.'));
             return;
         } else if ($response->status == Auth_OpenID_FAILURE) {
-            // Authentication failed; display the error message.
-            $this->message(sprintf(_('OpenID authentication failed: %s'),
+            // TRANS: OpenID authentication failed; display the error message.
+            // TRANS: %s is the error message.
+            $this->message(sprintf(_m('OpenID authentication failed: %s'),
                                    $response->message));
         } else if ($response->status == Auth_OpenID_SUCCESS) {
 
@@ -103,15 +106,23 @@ class FinishaddopenidAction extends Action
                 $sreg = $sreg_resp->contents();
             }
 
-            $cur =& common_current_user();
+            // Launchpad teams extension
+            if (!oid_check_teams($response)) {
+                $this->message(_m('OpenID authentication aborted: you are not allowed to login to this site.'));
+                return;
+            }
+
+            $cur = common_current_user();
 
             $other = oid_get_user($canonical);
 
             if ($other) {
                 if ($other->id == $cur->id) {
-                    $this->message(_('You already have this OpenID!'));
+                    // TRANS: message in case a user tries to add an OpenID that is already connected to them.
+                    $this->message(_m('You already have this OpenID!'));
                 } else {
-                    $this->message(_('Someone else already has this OpenID.'));
+                    // TRANS: message in case a user tries to add an OpenID that is already used by another user.
+                    $this->message(_m('Someone else already has this OpenID.'));
                 }
                 return;
             }
@@ -123,15 +134,20 @@ class FinishaddopenidAction extends Action
             $result = oid_link_user($cur->id, $canonical, $display);
 
             if (!$result) {
-                $this->message(_('Error connecting user.'));
+                // TRANS: message in case the OpenID object cannot be connected to the user.
+                $this->message(_m('Error connecting user.'));
                 return;
             }
-            if ($sreg) {
-                if (!oid_update_user($cur, $sreg)) {
-                    $this->message(_('Error updating profile'));
-                    return;
+            if (Event::handle('StartOpenIDUpdateUser', array($cur, $canonical, &$sreg))) {
+                if ($sreg) {
+                    if (!oid_update_user($cur, $sreg)) {
+                        // TRANS: message in case the user or the user profile cannot be saved in StatusNet.
+                        $this->message(_m('Error updating profile'));
+                        return;
+                    }
                 }
             }
+            Event::handle('EndOpenIDUpdateUser', array($cur, $canonical, $sreg));
 
             // success!
 
@@ -167,7 +183,8 @@ class FinishaddopenidAction extends Action
 
     function title()
     {
-        return _('OpenID Login');
+        // TRANS: Title after getting the status of the OpenID authorisation request.
+        return _m('OpenID Login');
     }
 
     /**