Fix CS

lib/classes/API/OAuth2/Adapter.class.php

@@ -195,6 +195,7 @@ class API_OAuth2_Adapter extends OAuth2
       $application = API_OAuth2_Application::load_from_client_id($this->appbox, $client_id);
 
       if ($client_secret === NULL)
+
         return true;
 
       $crypted = $this->crypt_secret($client_secret, $application->get_nonce());
@@ -203,7 +204,7 @@ class API_OAuth2_Adapter extends OAuth2
     }
     catch (Exception $e)
     {
-      
+
     }
 
     return false;
@@ -248,7 +249,7 @@ class API_OAuth2_Adapter extends OAuth2
     }
     catch (Exception $e)
     {
-      
+
     }
 
     return $result;
@@ -321,7 +322,7 @@ class API_OAuth2_Adapter extends OAuth2
     }
     catch (Exception $e)
     {
-      
+
     }
 
     return null;
@@ -375,7 +376,7 @@ class API_OAuth2_Adapter extends OAuth2
     }
     catch (Exception $e)
     {
-      
+
     }
 
     return null;
@@ -498,7 +499,7 @@ class API_OAuth2_Adapter extends OAuth2
       $input["redirect_uri"] = $redirect_uri;
     }
 
-    
+
     /**
      * Check response_type
      */
@@ -507,7 +508,7 @@ class API_OAuth2_Adapter extends OAuth2
       $this->errorDoRedirectUriCallback($input["redirect_uri"], OAUTH2_ERROR_INVALID_REQUEST, 'Invalid response type.', NULL, $input["state"]);
     }
 
-    
+
     /**
      * Check requested auth response type against the list of supported types
      */
@@ -521,7 +522,7 @@ class API_OAuth2_Adapter extends OAuth2
     if ($this->checkRestrictedAuthResponseType($input["client_id"], $input["response_type"]) === FALSE)
       $this->errorDoRedirectUriCallback($input["redirect_uri"], OAUTH2_ERROR_UNAUTHORIZED_CLIENT, NULL, NULL, $input["state"]);
 
-    
+
     /**
      * Validate that the requested scope is supported
      */
@@ -628,7 +629,7 @@ class API_OAuth2_Adapter extends OAuth2
     }
     catch (Exception $e)
     {
-      
+
     }
 
     return false;
@@ -640,11 +641,13 @@ class API_OAuth2_Adapter extends OAuth2
 
 
     if ($token_param === FALSE) // Access token was not provided
+
       return $exit_not_present ? $this->errorWWWAuthenticateResponseHeader(OAUTH2_HTTP_BAD_REQUEST, $realm, OAUTH2_ERROR_INVALID_REQUEST, 'The request is missing a required parameter, includes an unsupported parameter or parameter value, repeats the same parameter, uses more than one method for including an access token, or is otherwise malformed.', NULL, $scope) : FALSE;
     // Get the stored token data (from the implementing subclass)
     $token = $this->getAccessToken($token_param);
 
     if ($token === NULL)
+
       return $exit_invalid ? $this->errorWWWAuthenticateResponseHeader(OAUTH2_HTTP_UNAUTHORIZED, $realm, OAUTH2_ERROR_INVALID_TOKEN, 'The access token provided is invalid.', NULL, $scope) : FALSE;
 
     if (isset($token['revoked']) && $token['revoked'])
@@ -656,11 +659,13 @@ class API_OAuth2_Adapter extends OAuth2
     {
       // Check token expiration (I'm leaving this check separated, later we'll fill in better error messages)
       if (isset($token["expires"]) && time() > $token["expires"])
+
         return $exit_expired ? $this->errorWWWAuthenticateResponseHeader(OAUTH2_HTTP_UNAUTHORIZED, $realm, OAUTH2_ERROR_EXPIRED_TOKEN, 'The access token provided has expired.', NULL, $scope) : FALSE;
     }
     // Check scope, if provided
     // If token doesn't have a scope, it's NULL/empty, or it's insufficient, then throw an error
     if ($scope && ( ! isset($token["scope"]) || ! $token["scope"] || ! $this->checkScope($scope, $token["scope"])))
+
       return $exit_scope ? $this->errorWWWAuthenticateResponseHeader(OAUTH2_HTTP_FORBIDDEN, $realm, OAUTH2_ERROR_INSUFFICIENT_SCOPE, 'The request requires higher privileges than provided by the access token.', NULL, $scope) : FALSE;
 
     //save token's linked ses_id
@@ -729,7 +734,7 @@ class API_OAuth2_Adapter extends OAuth2
 
     if ( ! $this->checkRestrictedGrantType($client[0], $input["grant_type"]))
       $this->errorJsonResponse(OAUTH2_HTTP_BAD_REQUEST, OAUTH2_ERROR_UNAUTHORIZED_CLIENT);
-    
+
     // Do the granting
     switch ($input["grant_type"])
     {
@@ -839,9 +844,9 @@ class API_OAuth2_Adapter extends OAuth2
       $auth = new \Session_Authentication_Native($appbox, $username, $password);
 
       $auth->challenge_password();
-      
+
       $account = API_OAuth2_Account::load_with_user($appbox, $application, $auth->get_user());
-       
+
       return array(
           'redirect_uri' => $application->get_redirect_uri()
           , 'client_id' => $application->get_client_id()

lib/classes/API/V1/adapter.class.php

@@ -1156,6 +1156,7 @@ class API_V1_adapter extends API_V1_Abstract
      * @todo  ajouter une option pour avoir les values serialisées
      *        dans un cas multi
      */
+
     return array(
       'meta_id'           => $value->getId()
       , 'meta_structure_id' => $field->get_meta_struct_id()

lib/classes/API/V1/result.class.php

@@ -115,6 +115,7 @@ class API_V1_result
   protected function parse_response_type()
   {
     if (trim($this->request->get('callback')) !== '')
+
       return $this->response_type = self::FORMAT_JSONP;
 
     $accept         = $this->request->getAcceptableContentTypes();