Merge branch 'master' into 1.0.x

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

diff --git a/plugins/OpenID/openidlogin.php b/plugins/OpenID/openidlogin.php
index ffedc6481008a88da7e3a7e1a490fdc9f3e14f90..86ebcae2e1d26335944938d1b1a20afb73d777a5 100644 (file)
--- a/plugins/OpenID/openidlogin.php
+++ b/plugins/OpenID/openidlogin.php
@@ -17,7 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) {
+    exit(1);
+}
 
 require_once INSTALLDIR.'/plugins/OpenID/openid.php';
 
@@ -27,6 +29,7 @@ class OpenidloginAction extends Action
     {
         parent::handle($args);
         if (common_is_real_login()) {
+            // TRANS: Client error message trying to log on with OpenID while already logged on.
             $this->clientError(_m('Already logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $provider = common_config('openid', 'trusted_provider');
@@ -41,13 +44,6 @@ class OpenidloginAction extends Action
 
             oid_assert_allowed($openid_url);
 
-            # CSRF protection
-            $token = $this->trimmed('token');
-            if (!$token || $token != common_session_token()) {
-                $this->showForm(_m('There was a problem with your session token. Try again, please.'), $openid_url);
-                return;
-            }
-
             $rememberme = $this->boolean('rememberme');
 
             common_ensure_session();
@@ -73,10 +69,14 @@ class OpenidloginAction extends Action
             common_get_returnto()) {
             // rememberme logins have to reauthenticate before
             // changing any profile settings (cookie-stealing protection)
+            // TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
+            // TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
             return _m('For security reasons, please re-login with your ' .
                      '[OpenID](%%doc.openid%%) ' .
                      'before changing your settings.');
         } else {
+            // TRANS: OpenID plugin message.
+            // TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
             return _m('Login with an [OpenID](%%doc.openid%%) account.');
         }
     }
@@ -110,7 +110,8 @@ class OpenidloginAction extends Action
 
     function title()
     {
-        return _m('OpenID Login');
+        // TRANS: OpenID plugin message. Title.
+        return _m('TITLE','OpenID Login');
     }
 
     function showForm($error=null, $openid_url)
@@ -127,15 +128,16 @@ class OpenidloginAction extends Action
                                            'class' => 'form_settings',
                                            'action' => $formaction));
         $this->elementStart('fieldset');
-        $this->element('legend', null, _m('OpenID login'));
-        $this->hidden('token', common_session_token());
+        // TRANS: OpenID plugin logon form legend.
+        $this->element('legend', null, _m('LEGEND','OpenID login'));
 
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $provider = common_config('openid', 'trusted_provider');
         $appendUsername = common_config('openid', 'append_username');
         if ($provider) {
-            $this->element('label', array(), _m('OpenID provider'));
+            // TRANS: Field label.
+            $this->element('label', array(), _m('LABEL','OpenID provider'));
             $this->element('span', array(), $provider);
             if ($appendUsername) {
                 $this->element('input', array('id' => 'openid_username',
@@ -143,22 +145,29 @@ class OpenidloginAction extends Action
                                               'style' => 'float: none'));
             }
             $this->element('p', 'form_guide',
+                           // TRANS: Form guide.
                            ($appendUsername ? _m('Enter your username.') . ' ' : '') .
+                           // TRANS: Form guide.
                            _m('You will be sent to the provider\'s site for authentication.'));
             $this->hidden('openid_url', $provider);
         } else {
+            // TRANS: OpenID plugin logon form field label.
             $this->input('openid_url', _m('OpenID URL'),
                          $this->openid_url,
-                         _m('Your OpenID URL'));
+                        // TRANS: OpenID plugin logon form field title.
+                         _m('Your OpenID URL.'));
         }
         $this->elementEnd('li');
         $this->elementStart('li', array('id' => 'settings_rememberme'));
+        // TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
         $this->checkbox('rememberme', _m('Remember me'), false,
+                        // TRANS: OpenID plugin logon form field title.
                         _m('Automatically login in the future; ' .
                            'not for shared computers!'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
-        $this->submit('submit', _m('Login'));
+        // TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
+        $this->submit('submit', _m('BUTTON', 'Login'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
@@ -168,4 +177,12 @@ class OpenidloginAction extends Action
         $nav = new LoginGroupNav($this);
         $nav->show();
     }
+
+    function showNoticeForm()
+    {
+    }
+
+    function showProfileBlock()
+    {
+    }
 }