Merge branch 'master' into 1.1.x

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

diff --git a/plugins/OpenID/openidserver.php b/plugins/OpenID/openidserver.php
index dab97c93ed281d3cbc03187002d56d1501e4d874..847eb48c65fbb773b7a9d585eea81951a1bf414a 100644 (file)
--- a/plugins/OpenID/openidserver.php
+++ b/plugins/OpenID/openidserver.php
@@ -23,17 +23,16 @@
  * @package   StatusNet
  * @author   Craig Andrews <candrews@integralblue.com>
  * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/action.php';
 require_once INSTALLDIR.'/plugins/OpenID/openid.php';
-require_once(INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php');
 
 /**
  * Settings for OpenID
@@ -43,6 +42,7 @@ require_once(INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php');
  * @category Settings
  * @package  StatusNet
  * @author   Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
@@ -69,9 +69,13 @@ class OpenidserverAction extends Action
                     //cannot prompt the user to login in immediate mode, so answer false
                     $response = $this->generateDenyResponse($request);
                 }else{
-                    /* Go log in, and then come back. */
+                    // Go log in, and then come back.
+                    //
+                    // Note: 303 redirect rather than 307 to avoid
+                    // prompting user for form resubmission if we
+                    // were POSTed here.
                     common_set_returnto($_SERVER['REQUEST_URI']);
-                    common_redirect(common_local_url('login'));
+                    common_redirect(common_local_url('login'), 303);
                     return;
                 }
             }else if(common_profile_url($user->nickname) == $request->identity || $request->idSelect()){
@@ -90,8 +94,13 @@ class OpenidserverAction extends Action
                         $this->oserver->encodeResponse($denyResponse); //sign the response
                         $_SESSION['openid_allow_url'] = $allowResponse->encodeToUrl();
                         $_SESSION['openid_deny_url'] = $denyResponse->encodeToUrl();
-                        //ask the user to trust this trust root
-                        common_redirect(common_local_url('openidtrust'));
+
+                        // Ask the user to trust this trust root...
+                        //
+                        // Note: 303 redirect rather than 307 to avoid
+                        // prompting user for form resubmission if we
+                        // were POSTed here.
+                        common_redirect(common_local_url('openidtrust'), 303);
                         return;
                     }
                 }else{
@@ -103,7 +112,9 @@ class OpenidserverAction extends Action
                 $response = $this->generateDenyResponse($request);
             } else {
                 //invalid
-                $this->clientError(sprintf(_('You are not authorized to use the identity %s'),$request->identity),$code=403);
+                // TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+                // TRANS: %s is a request identity.
+                $this->clientError(sprintf(_m('You are not authorized to use the identity %s.'),$request->identity),$code=403);
             }
         } else {
             $response = $this->oserver->handleRequest($request);
@@ -123,13 +134,14 @@ class OpenidserverAction extends Action
             }
             $this->raw($response->body);
         }else{
-            $this->clientError(_('Just an OpenID provider. Nothing to see here, move along...'),$code=500);
+            // TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+            $this->clientError(_m('Just an OpenID provider. Nothing to see here, move along...'),$code=500);
         }
     }
 
     function generateAllowResponse($request, $user){
         $response = $request->answer(true, null, common_profile_url($user->nickname));
-        
+
         $profile = $user->getProfile();
         $sreg_data = array(
             'fullname' => $profile->fullname,