Merge branch '1.1.x'

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

diff --git a/plugins/OpenID/finishaddopenid.php b/plugins/OpenID/finishaddopenid.php
index 18e150a83cbe3288773cdd3c8175495900a163ce..5182e50778736d2325f3e6a20de29bfcf8ae07df 100644 (file)
--- a/plugins/OpenID/finishaddopenid.php
+++ b/plugins/OpenID/finishaddopenid.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -44,7 +44,6 @@ require_once INSTALLDIR.'/plugins/OpenID/openid.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class FinishaddopenidAction extends Action
 {
     var $msg = null;
@@ -59,11 +58,11 @@ class FinishaddopenidAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
         if (!common_logged_in()) {
+            // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
             $this->clientError(_m('Not logged in.'));
         } else {
             $this->tryLogin();
@@ -77,7 +76,6 @@ class FinishaddopenidAction extends Action
      *
      * @return void
      */
-
     function tryLogin()
     {
         $consumer = oid_consumer();
@@ -85,11 +83,13 @@ class FinishaddopenidAction extends Action
         $response = $consumer->complete(common_local_url('finishaddopenid'));
 
         if ($response->status == Auth_OpenID_CANCEL) {
+            // 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(_m('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,14 +103,23 @@ class FinishaddopenidAction extends Action
                 $sreg = $sreg_resp->contents();
             }
 
+            // Launchpad teams extension
+            if (!oid_check_teams($response)) {
+                // TRANS: OpenID authentication error.
+                $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) {
+                    // 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 {
+                    // 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,13 +132,15 @@ class FinishaddopenidAction extends Action
             $result = oid_link_user($cur->id, $canonical, $display);
 
             if (!$result) {
+                // TRANS: Message in case the OpenID object cannot be connected to the user.
                 $this->message(_m('Error connecting user.'));
                 return;
             }
             if (Event::handle('StartOpenIDUpdateUser', array($cur, $canonical, &$sreg))) {
                 if ($sreg) {
                     if (!oid_update_user($cur, $sreg)) {
-                        $this->message(_m('Error updating profile'));
+                        // TRANS: Message in case the user or the user profile cannot be saved in StatusNet.
+                        $this->message(_m('Error updating profile.'));
                         return;
                     }
                 }
@@ -155,7 +166,6 @@ class FinishaddopenidAction extends Action
      *
      * @return void
      */
-
     function message($msg)
     {
         $this->message = $msg;
@@ -167,9 +177,9 @@ class FinishaddopenidAction extends Action
      *
      * @return string title
      */
-
     function title()
     {
+        // TRANS: Title after getting the status of the OpenID authorisation request.
         return _m('OpenID Login');
     }
 
@@ -178,7 +188,6 @@ class FinishaddopenidAction extends Action
      *
      * @return void
      */
-
     function showPageNotice()
     {
         if ($this->message) {