@@ -27,268 +27,268 @@ |
||
| 27 | 27 | class InvisibleRecaptcha |
| 28 | 28 | { |
| 29 | 29 | |
| 30 | - const URL_GOOGLE_RECAPTCHA_API = 'https://www.google.com/recaptcha/api/siteverify'; |
|
| 30 | + const URL_GOOGLE_RECAPTCHA_API = 'https://www.google.com/recaptcha/api/siteverify'; |
|
| 31 | 31 | |
| 32 | - const SESSION_DATA_KEY_RECAPTCHA_PASSED = 'recaptcha_passed'; |
|
| 32 | + const SESSION_DATA_KEY_RECAPTCHA_PASSED = 'recaptcha_passed'; |
|
| 33 | 33 | |
| 34 | - /** |
|
| 35 | - * @var EE_Registration_Config $config |
|
| 36 | - */ |
|
| 37 | - private $config; |
|
| 34 | + /** |
|
| 35 | + * @var EE_Registration_Config $config |
|
| 36 | + */ |
|
| 37 | + private $config; |
|
| 38 | 38 | |
| 39 | - /** |
|
| 40 | - * @var EE_Session $session |
|
| 41 | - */ |
|
| 42 | - private $session; |
|
| 39 | + /** |
|
| 40 | + * @var EE_Session $session |
|
| 41 | + */ |
|
| 42 | + private $session; |
|
| 43 | 43 | |
| 44 | - /** |
|
| 45 | - * @var boolean $recaptcha_passed |
|
| 46 | - */ |
|
| 47 | - private $recaptcha_passed; |
|
| 44 | + /** |
|
| 45 | + * @var boolean $recaptcha_passed |
|
| 46 | + */ |
|
| 47 | + private $recaptcha_passed; |
|
| 48 | 48 | |
| 49 | 49 | |
| 50 | - /** |
|
| 51 | - * InvisibleRecaptcha constructor. |
|
| 52 | - * |
|
| 53 | - * @param EE_Registration_Config $registration_config |
|
| 54 | - * @param EE_Session $session |
|
| 55 | - */ |
|
| 56 | - public function __construct(EE_Registration_Config $registration_config, EE_Session $session) |
|
| 57 | - { |
|
| 58 | - $this->config = $registration_config; |
|
| 59 | - $this->session = $session; |
|
| 60 | - } |
|
| 50 | + /** |
|
| 51 | + * InvisibleRecaptcha constructor. |
|
| 52 | + * |
|
| 53 | + * @param EE_Registration_Config $registration_config |
|
| 54 | + * @param EE_Session $session |
|
| 55 | + */ |
|
| 56 | + public function __construct(EE_Registration_Config $registration_config, EE_Session $session) |
|
| 57 | + { |
|
| 58 | + $this->config = $registration_config; |
|
| 59 | + $this->session = $session; |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | 62 | |
| 63 | - /** |
|
| 64 | - * @return boolean |
|
| 65 | - */ |
|
| 66 | - public function useInvisibleRecaptcha() |
|
| 67 | - { |
|
| 68 | - return $this->config->use_captcha && $this->config->recaptcha_theme === 'invisible'; |
|
| 69 | - } |
|
| 63 | + /** |
|
| 64 | + * @return boolean |
|
| 65 | + */ |
|
| 66 | + public function useInvisibleRecaptcha() |
|
| 67 | + { |
|
| 68 | + return $this->config->use_captcha && $this->config->recaptcha_theme === 'invisible'; |
|
| 69 | + } |
|
| 70 | 70 | |
| 71 | 71 | |
| 72 | - /** |
|
| 73 | - * @param array $input_settings |
|
| 74 | - * @return EE_Invisible_Recaptcha_Input |
|
| 75 | - * @throws InvalidDataTypeException |
|
| 76 | - * @throws InvalidInterfaceException |
|
| 77 | - * @throws InvalidArgumentException |
|
| 78 | - * @throws DomainException |
|
| 79 | - */ |
|
| 80 | - public function getInput(array $input_settings = array()) |
|
| 81 | - { |
|
| 82 | - return new EE_Invisible_Recaptcha_Input( |
|
| 83 | - $input_settings, |
|
| 84 | - $this->config |
|
| 85 | - ); |
|
| 86 | - } |
|
| 72 | + /** |
|
| 73 | + * @param array $input_settings |
|
| 74 | + * @return EE_Invisible_Recaptcha_Input |
|
| 75 | + * @throws InvalidDataTypeException |
|
| 76 | + * @throws InvalidInterfaceException |
|
| 77 | + * @throws InvalidArgumentException |
|
| 78 | + * @throws DomainException |
|
| 79 | + */ |
|
| 80 | + public function getInput(array $input_settings = array()) |
|
| 81 | + { |
|
| 82 | + return new EE_Invisible_Recaptcha_Input( |
|
| 83 | + $input_settings, |
|
| 84 | + $this->config |
|
| 85 | + ); |
|
| 86 | + } |
|
| 87 | 87 | |
| 88 | 88 | |
| 89 | - /** |
|
| 90 | - * @param array $input_settings |
|
| 91 | - * @return string |
|
| 92 | - * @throws EE_Error |
|
| 93 | - * @throws InvalidDataTypeException |
|
| 94 | - * @throws InvalidInterfaceException |
|
| 95 | - * @throws InvalidArgumentException |
|
| 96 | - * @throws DomainException |
|
| 97 | - */ |
|
| 98 | - public function getInputHtml(array $input_settings = array()) |
|
| 99 | - { |
|
| 100 | - return $this->getInput($input_settings)->get_html_for_input(); |
|
| 101 | - } |
|
| 89 | + /** |
|
| 90 | + * @param array $input_settings |
|
| 91 | + * @return string |
|
| 92 | + * @throws EE_Error |
|
| 93 | + * @throws InvalidDataTypeException |
|
| 94 | + * @throws InvalidInterfaceException |
|
| 95 | + * @throws InvalidArgumentException |
|
| 96 | + * @throws DomainException |
|
| 97 | + */ |
|
| 98 | + public function getInputHtml(array $input_settings = array()) |
|
| 99 | + { |
|
| 100 | + return $this->getInput($input_settings)->get_html_for_input(); |
|
| 101 | + } |
|
| 102 | 102 | |
| 103 | 103 | |
| 104 | - /** |
|
| 105 | - * @param EE_Form_Section_Proper $form |
|
| 106 | - * @param array $input_settings |
|
| 107 | - * @throws EE_Error |
|
| 108 | - * @throws InvalidArgumentException |
|
| 109 | - * @throws InvalidDataTypeException |
|
| 110 | - * @throws InvalidInterfaceException |
|
| 111 | - * @throws DomainException |
|
| 112 | - */ |
|
| 113 | - public function addToFormSection(EE_Form_Section_Proper $form, array $input_settings = array()) |
|
| 114 | - { |
|
| 115 | - $form->add_subsections( |
|
| 116 | - array( |
|
| 117 | - 'espresso_recaptcha' => $this->getInput($input_settings), |
|
| 118 | - ), |
|
| 119 | - null, |
|
| 120 | - false |
|
| 121 | - ); |
|
| 122 | - } |
|
| 104 | + /** |
|
| 105 | + * @param EE_Form_Section_Proper $form |
|
| 106 | + * @param array $input_settings |
|
| 107 | + * @throws EE_Error |
|
| 108 | + * @throws InvalidArgumentException |
|
| 109 | + * @throws InvalidDataTypeException |
|
| 110 | + * @throws InvalidInterfaceException |
|
| 111 | + * @throws DomainException |
|
| 112 | + */ |
|
| 113 | + public function addToFormSection(EE_Form_Section_Proper $form, array $input_settings = array()) |
|
| 114 | + { |
|
| 115 | + $form->add_subsections( |
|
| 116 | + array( |
|
| 117 | + 'espresso_recaptcha' => $this->getInput($input_settings), |
|
| 118 | + ), |
|
| 119 | + null, |
|
| 120 | + false |
|
| 121 | + ); |
|
| 122 | + } |
|
| 123 | 123 | |
| 124 | 124 | |
| 125 | - /** |
|
| 126 | - * @param RequestInterface $request |
|
| 127 | - * @return boolean |
|
| 128 | - * @throws InvalidArgumentException |
|
| 129 | - * @throws InvalidDataTypeException |
|
| 130 | - * @throws InvalidInterfaceException |
|
| 131 | - * @throws RuntimeException |
|
| 132 | - */ |
|
| 133 | - public function verifyToken(RequestInterface $request) |
|
| 134 | - { |
|
| 135 | - static $previous_recaptcha_response = array(); |
|
| 136 | - $grecaptcha_response = $request->getRequestParam('g-recaptcha-response'); |
|
| 137 | - // if this token has already been verified, then return previous response |
|
| 138 | - if (isset($previous_recaptcha_response[ $grecaptcha_response ])) { |
|
| 139 | - return $previous_recaptcha_response[ $grecaptcha_response ]; |
|
| 140 | - } |
|
| 141 | - // still here but no g-recaptcha-response ? - verification failed |
|
| 142 | - if (! $grecaptcha_response) { |
|
| 143 | - EE_Error::add_error( |
|
| 144 | - sprintf( |
|
| 145 | - /* translators: 1: missing parameter */ |
|
| 146 | - esc_html__( |
|
| 147 | - // @codingStandardsIgnoreStart |
|
| 148 | - 'We\'re sorry but an attempt to verify the form\'s reCAPTCHA has failed. Missing "%1$s". Please try again.', |
|
| 149 | - // @codingStandardsIgnoreEnd |
|
| 150 | - 'event_espresso' |
|
| 151 | - ), |
|
| 152 | - 'g-recaptcha-response' |
|
| 153 | - ), |
|
| 154 | - __FILE__, |
|
| 155 | - __FUNCTION__, |
|
| 156 | - __LINE__ |
|
| 157 | - ); |
|
| 158 | - return false; |
|
| 159 | - } |
|
| 160 | - // will update to true if everything passes |
|
| 161 | - $previous_recaptcha_response[ $grecaptcha_response ] = false; |
|
| 162 | - $response = wp_safe_remote_post( |
|
| 163 | - InvisibleRecaptcha::URL_GOOGLE_RECAPTCHA_API, |
|
| 164 | - array( |
|
| 165 | - 'body' => array( |
|
| 166 | - 'secret' => $this->config->recaptcha_privatekey, |
|
| 167 | - 'response' => $grecaptcha_response, |
|
| 168 | - 'remoteip' => $request->ipAddress(), |
|
| 169 | - ), |
|
| 170 | - ) |
|
| 171 | - ); |
|
| 172 | - if ($response instanceof WP_Error) { |
|
| 173 | - $this->generateError($response->get_error_messages()); |
|
| 174 | - return false; |
|
| 175 | - } |
|
| 176 | - $results = json_decode(wp_remote_retrieve_body($response), true); |
|
| 177 | - if (filter_var($results['success'], FILTER_VALIDATE_BOOLEAN) !== true) { |
|
| 178 | - $errors = array_map( |
|
| 179 | - array($this, 'getErrorCode'), |
|
| 180 | - $results['error-codes'] |
|
| 181 | - ); |
|
| 182 | - if (isset($results['challenge_ts'])) { |
|
| 183 | - $errors[] = 'challenge timestamp: ' . $results['challenge_ts'] . '.'; |
|
| 184 | - } |
|
| 185 | - $this->generateError(implode(' ', $errors), true); |
|
| 186 | - } |
|
| 187 | - $previous_recaptcha_response[ $grecaptcha_response ] = true; |
|
| 188 | - add_action('shutdown', array($this, 'setSessionData')); |
|
| 189 | - return true; |
|
| 190 | - } |
|
| 125 | + /** |
|
| 126 | + * @param RequestInterface $request |
|
| 127 | + * @return boolean |
|
| 128 | + * @throws InvalidArgumentException |
|
| 129 | + * @throws InvalidDataTypeException |
|
| 130 | + * @throws InvalidInterfaceException |
|
| 131 | + * @throws RuntimeException |
|
| 132 | + */ |
|
| 133 | + public function verifyToken(RequestInterface $request) |
|
| 134 | + { |
|
| 135 | + static $previous_recaptcha_response = array(); |
|
| 136 | + $grecaptcha_response = $request->getRequestParam('g-recaptcha-response'); |
|
| 137 | + // if this token has already been verified, then return previous response |
|
| 138 | + if (isset($previous_recaptcha_response[ $grecaptcha_response ])) { |
|
| 139 | + return $previous_recaptcha_response[ $grecaptcha_response ]; |
|
| 140 | + } |
|
| 141 | + // still here but no g-recaptcha-response ? - verification failed |
|
| 142 | + if (! $grecaptcha_response) { |
|
| 143 | + EE_Error::add_error( |
|
| 144 | + sprintf( |
|
| 145 | + /* translators: 1: missing parameter */ |
|
| 146 | + esc_html__( |
|
| 147 | + // @codingStandardsIgnoreStart |
|
| 148 | + 'We\'re sorry but an attempt to verify the form\'s reCAPTCHA has failed. Missing "%1$s". Please try again.', |
|
| 149 | + // @codingStandardsIgnoreEnd |
|
| 150 | + 'event_espresso' |
|
| 151 | + ), |
|
| 152 | + 'g-recaptcha-response' |
|
| 153 | + ), |
|
| 154 | + __FILE__, |
|
| 155 | + __FUNCTION__, |
|
| 156 | + __LINE__ |
|
| 157 | + ); |
|
| 158 | + return false; |
|
| 159 | + } |
|
| 160 | + // will update to true if everything passes |
|
| 161 | + $previous_recaptcha_response[ $grecaptcha_response ] = false; |
|
| 162 | + $response = wp_safe_remote_post( |
|
| 163 | + InvisibleRecaptcha::URL_GOOGLE_RECAPTCHA_API, |
|
| 164 | + array( |
|
| 165 | + 'body' => array( |
|
| 166 | + 'secret' => $this->config->recaptcha_privatekey, |
|
| 167 | + 'response' => $grecaptcha_response, |
|
| 168 | + 'remoteip' => $request->ipAddress(), |
|
| 169 | + ), |
|
| 170 | + ) |
|
| 171 | + ); |
|
| 172 | + if ($response instanceof WP_Error) { |
|
| 173 | + $this->generateError($response->get_error_messages()); |
|
| 174 | + return false; |
|
| 175 | + } |
|
| 176 | + $results = json_decode(wp_remote_retrieve_body($response), true); |
|
| 177 | + if (filter_var($results['success'], FILTER_VALIDATE_BOOLEAN) !== true) { |
|
| 178 | + $errors = array_map( |
|
| 179 | + array($this, 'getErrorCode'), |
|
| 180 | + $results['error-codes'] |
|
| 181 | + ); |
|
| 182 | + if (isset($results['challenge_ts'])) { |
|
| 183 | + $errors[] = 'challenge timestamp: ' . $results['challenge_ts'] . '.'; |
|
| 184 | + } |
|
| 185 | + $this->generateError(implode(' ', $errors), true); |
|
| 186 | + } |
|
| 187 | + $previous_recaptcha_response[ $grecaptcha_response ] = true; |
|
| 188 | + add_action('shutdown', array($this, 'setSessionData')); |
|
| 189 | + return true; |
|
| 190 | + } |
|
| 191 | 191 | |
| 192 | 192 | |
| 193 | - /** |
|
| 194 | - * @param string $error_response |
|
| 195 | - * @param bool $show_errors |
|
| 196 | - * @return void |
|
| 197 | - * @throws RuntimeException |
|
| 198 | - */ |
|
| 199 | - public function generateError($error_response = '', $show_errors = false) |
|
| 200 | - { |
|
| 201 | - throw new RuntimeException( |
|
| 202 | - sprintf( |
|
| 203 | - esc_html__( |
|
| 204 | - 'We\'re sorry but an attempt to verify the form\'s reCAPTCHA has failed. %1$s %2$s Please try again.', |
|
| 205 | - 'event_espresso' |
|
| 206 | - ), |
|
| 207 | - '<br />', |
|
| 208 | - $show_errors || current_user_can('manage_options') ? $error_response : '' |
|
| 209 | - ) |
|
| 210 | - ); |
|
| 211 | - } |
|
| 193 | + /** |
|
| 194 | + * @param string $error_response |
|
| 195 | + * @param bool $show_errors |
|
| 196 | + * @return void |
|
| 197 | + * @throws RuntimeException |
|
| 198 | + */ |
|
| 199 | + public function generateError($error_response = '', $show_errors = false) |
|
| 200 | + { |
|
| 201 | + throw new RuntimeException( |
|
| 202 | + sprintf( |
|
| 203 | + esc_html__( |
|
| 204 | + 'We\'re sorry but an attempt to verify the form\'s reCAPTCHA has failed. %1$s %2$s Please try again.', |
|
| 205 | + 'event_espresso' |
|
| 206 | + ), |
|
| 207 | + '<br />', |
|
| 208 | + $show_errors || current_user_can('manage_options') ? $error_response : '' |
|
| 209 | + ) |
|
| 210 | + ); |
|
| 211 | + } |
|
| 212 | 212 | |
| 213 | 213 | |
| 214 | - /** |
|
| 215 | - * @param string $error_code |
|
| 216 | - * @return string |
|
| 217 | - */ |
|
| 218 | - public function getErrorCode(&$error_code) |
|
| 219 | - { |
|
| 220 | - $error_codes = array( |
|
| 221 | - 'missing-input-secret' => 'The secret parameter is missing.', |
|
| 222 | - 'invalid-input-secret' => 'The secret parameter is invalid or malformed.', |
|
| 223 | - 'missing-input-response' => 'The response parameter is missing.', |
|
| 224 | - 'invalid-input-response' => 'The response parameter is invalid or malformed.', |
|
| 225 | - 'bad-request' => 'The request is invalid or malformed.', |
|
| 226 | - 'timeout-or-duplicate' => 'The request took too long to be sent or was a duplicate of a previous request.', |
|
| 227 | - ); |
|
| 228 | - return isset($error_codes[ $error_code ]) ? $error_codes[ $error_code ] : ''; |
|
| 229 | - } |
|
| 214 | + /** |
|
| 215 | + * @param string $error_code |
|
| 216 | + * @return string |
|
| 217 | + */ |
|
| 218 | + public function getErrorCode(&$error_code) |
|
| 219 | + { |
|
| 220 | + $error_codes = array( |
|
| 221 | + 'missing-input-secret' => 'The secret parameter is missing.', |
|
| 222 | + 'invalid-input-secret' => 'The secret parameter is invalid or malformed.', |
|
| 223 | + 'missing-input-response' => 'The response parameter is missing.', |
|
| 224 | + 'invalid-input-response' => 'The response parameter is invalid or malformed.', |
|
| 225 | + 'bad-request' => 'The request is invalid or malformed.', |
|
| 226 | + 'timeout-or-duplicate' => 'The request took too long to be sent or was a duplicate of a previous request.', |
|
| 227 | + ); |
|
| 228 | + return isset($error_codes[ $error_code ]) ? $error_codes[ $error_code ] : ''; |
|
| 229 | + } |
|
| 230 | 230 | |
| 231 | 231 | |
| 232 | - /** |
|
| 233 | - * @return array |
|
| 234 | - * @throws InvalidInterfaceException |
|
| 235 | - * @throws InvalidDataTypeException |
|
| 236 | - * @throws InvalidArgumentException |
|
| 237 | - */ |
|
| 238 | - public function getLocalizedVars() |
|
| 239 | - { |
|
| 240 | - return (array) apply_filters( |
|
| 241 | - 'FHEE__EventEspresso_caffeinated_modules_recaptcha_invisible_InvisibleRecaptcha__getLocalizedVars__localized_vars', |
|
| 242 | - array( |
|
| 243 | - 'siteKey' => $this->config->recaptcha_publickey, |
|
| 244 | - 'recaptcha_passed' => $this->recaptchaPassed(), |
|
| 245 | - 'wp_debug' => WP_DEBUG, |
|
| 246 | - 'disable_submit' => defined('EE_EVENT_QUEUE_BASE_URL'), |
|
| 247 | - 'failed_message' => esc_html__( |
|
| 248 | - 'We\'re sorry but an attempt to verify the form\'s reCAPTCHA has failed. Please try again.', |
|
| 249 | - 'event_espresso' |
|
| 250 | - ) |
|
| 251 | - ) |
|
| 252 | - ); |
|
| 253 | - } |
|
| 232 | + /** |
|
| 233 | + * @return array |
|
| 234 | + * @throws InvalidInterfaceException |
|
| 235 | + * @throws InvalidDataTypeException |
|
| 236 | + * @throws InvalidArgumentException |
|
| 237 | + */ |
|
| 238 | + public function getLocalizedVars() |
|
| 239 | + { |
|
| 240 | + return (array) apply_filters( |
|
| 241 | + 'FHEE__EventEspresso_caffeinated_modules_recaptcha_invisible_InvisibleRecaptcha__getLocalizedVars__localized_vars', |
|
| 242 | + array( |
|
| 243 | + 'siteKey' => $this->config->recaptcha_publickey, |
|
| 244 | + 'recaptcha_passed' => $this->recaptchaPassed(), |
|
| 245 | + 'wp_debug' => WP_DEBUG, |
|
| 246 | + 'disable_submit' => defined('EE_EVENT_QUEUE_BASE_URL'), |
|
| 247 | + 'failed_message' => esc_html__( |
|
| 248 | + 'We\'re sorry but an attempt to verify the form\'s reCAPTCHA has failed. Please try again.', |
|
| 249 | + 'event_espresso' |
|
| 250 | + ) |
|
| 251 | + ) |
|
| 252 | + ); |
|
| 253 | + } |
|
| 254 | 254 | |
| 255 | 255 | |
| 256 | - /** |
|
| 257 | - * @return boolean |
|
| 258 | - * @throws InvalidInterfaceException |
|
| 259 | - * @throws InvalidDataTypeException |
|
| 260 | - * @throws InvalidArgumentException |
|
| 261 | - */ |
|
| 262 | - public function recaptchaPassed() |
|
| 263 | - { |
|
| 264 | - if ($this->recaptcha_passed !== null) { |
|
| 265 | - return $this->recaptcha_passed; |
|
| 266 | - } |
|
| 267 | - // logged in means you have already passed a turing test of sorts |
|
| 268 | - if ($this->useInvisibleRecaptcha() === false || is_user_logged_in()) { |
|
| 269 | - $this->recaptcha_passed = true; |
|
| 270 | - return $this->recaptcha_passed; |
|
| 271 | - } |
|
| 272 | - // was test already passed? |
|
| 273 | - $this->recaptcha_passed = filter_var( |
|
| 274 | - $this->session->get_session_data( |
|
| 275 | - InvisibleRecaptcha::SESSION_DATA_KEY_RECAPTCHA_PASSED |
|
| 276 | - ), |
|
| 277 | - FILTER_VALIDATE_BOOLEAN |
|
| 278 | - ); |
|
| 279 | - return $this->recaptcha_passed; |
|
| 280 | - } |
|
| 256 | + /** |
|
| 257 | + * @return boolean |
|
| 258 | + * @throws InvalidInterfaceException |
|
| 259 | + * @throws InvalidDataTypeException |
|
| 260 | + * @throws InvalidArgumentException |
|
| 261 | + */ |
|
| 262 | + public function recaptchaPassed() |
|
| 263 | + { |
|
| 264 | + if ($this->recaptcha_passed !== null) { |
|
| 265 | + return $this->recaptcha_passed; |
|
| 266 | + } |
|
| 267 | + // logged in means you have already passed a turing test of sorts |
|
| 268 | + if ($this->useInvisibleRecaptcha() === false || is_user_logged_in()) { |
|
| 269 | + $this->recaptcha_passed = true; |
|
| 270 | + return $this->recaptcha_passed; |
|
| 271 | + } |
|
| 272 | + // was test already passed? |
|
| 273 | + $this->recaptcha_passed = filter_var( |
|
| 274 | + $this->session->get_session_data( |
|
| 275 | + InvisibleRecaptcha::SESSION_DATA_KEY_RECAPTCHA_PASSED |
|
| 276 | + ), |
|
| 277 | + FILTER_VALIDATE_BOOLEAN |
|
| 278 | + ); |
|
| 279 | + return $this->recaptcha_passed; |
|
| 280 | + } |
|
| 281 | 281 | |
| 282 | 282 | |
| 283 | - /** |
|
| 284 | - * @throws InvalidArgumentException |
|
| 285 | - * @throws InvalidDataTypeException |
|
| 286 | - * @throws InvalidInterfaceException |
|
| 287 | - */ |
|
| 288 | - public function setSessionData() |
|
| 289 | - { |
|
| 290 | - $this->session->set_session_data( |
|
| 291 | - array(InvisibleRecaptcha::SESSION_DATA_KEY_RECAPTCHA_PASSED => true) |
|
| 292 | - ); |
|
| 293 | - } |
|
| 283 | + /** |
|
| 284 | + * @throws InvalidArgumentException |
|
| 285 | + * @throws InvalidDataTypeException |
|
| 286 | + * @throws InvalidInterfaceException |
|
| 287 | + */ |
|
| 288 | + public function setSessionData() |
|
| 289 | + { |
|
| 290 | + $this->session->set_session_data( |
|
| 291 | + array(InvisibleRecaptcha::SESSION_DATA_KEY_RECAPTCHA_PASSED => true) |
|
| 292 | + ); |
|
| 293 | + } |
|
| 294 | 294 | } |
@@ -135,11 +135,11 @@ discard block |
||
| 135 | 135 | static $previous_recaptcha_response = array(); |
| 136 | 136 | $grecaptcha_response = $request->getRequestParam('g-recaptcha-response'); |
| 137 | 137 | // if this token has already been verified, then return previous response |
| 138 | - if (isset($previous_recaptcha_response[ $grecaptcha_response ])) { |
|
| 139 | - return $previous_recaptcha_response[ $grecaptcha_response ]; |
|
| 138 | + if (isset($previous_recaptcha_response[$grecaptcha_response])) { |
|
| 139 | + return $previous_recaptcha_response[$grecaptcha_response]; |
|
| 140 | 140 | } |
| 141 | 141 | // still here but no g-recaptcha-response ? - verification failed |
| 142 | - if (! $grecaptcha_response) { |
|
| 142 | + if ( ! $grecaptcha_response) { |
|
| 143 | 143 | EE_Error::add_error( |
| 144 | 144 | sprintf( |
| 145 | 145 | /* translators: 1: missing parameter */ |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | return false; |
| 159 | 159 | } |
| 160 | 160 | // will update to true if everything passes |
| 161 | - $previous_recaptcha_response[ $grecaptcha_response ] = false; |
|
| 161 | + $previous_recaptcha_response[$grecaptcha_response] = false; |
|
| 162 | 162 | $response = wp_safe_remote_post( |
| 163 | 163 | InvisibleRecaptcha::URL_GOOGLE_RECAPTCHA_API, |
| 164 | 164 | array( |
@@ -175,16 +175,16 @@ discard block |
||
| 175 | 175 | } |
| 176 | 176 | $results = json_decode(wp_remote_retrieve_body($response), true); |
| 177 | 177 | if (filter_var($results['success'], FILTER_VALIDATE_BOOLEAN) !== true) { |
| 178 | - $errors = array_map( |
|
| 178 | + $errors = array_map( |
|
| 179 | 179 | array($this, 'getErrorCode'), |
| 180 | 180 | $results['error-codes'] |
| 181 | 181 | ); |
| 182 | 182 | if (isset($results['challenge_ts'])) { |
| 183 | - $errors[] = 'challenge timestamp: ' . $results['challenge_ts'] . '.'; |
|
| 183 | + $errors[] = 'challenge timestamp: '.$results['challenge_ts'].'.'; |
|
| 184 | 184 | } |
| 185 | 185 | $this->generateError(implode(' ', $errors), true); |
| 186 | 186 | } |
| 187 | - $previous_recaptcha_response[ $grecaptcha_response ] = true; |
|
| 187 | + $previous_recaptcha_response[$grecaptcha_response] = true; |
|
| 188 | 188 | add_action('shutdown', array($this, 'setSessionData')); |
| 189 | 189 | return true; |
| 190 | 190 | } |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | 'bad-request' => 'The request is invalid or malformed.', |
| 226 | 226 | 'timeout-or-duplicate' => 'The request took too long to be sent or was a duplicate of a previous request.', |
| 227 | 227 | ); |
| 228 | - return isset($error_codes[ $error_code ]) ? $error_codes[ $error_code ] : ''; |
|
| 228 | + return isset($error_codes[$error_code]) ? $error_codes[$error_code] : ''; |
|
| 229 | 229 | } |
| 230 | 230 | |
| 231 | 231 | |