diff --git a/src/MicroweberPackages/Form/Http/Controllers/ApiPublic/FormController.php b/src/MicroweberPackages/Form/Http/Controllers/ApiPublic/FormController.php index c0a3dac329f..2d422ef2afd 100644 --- a/src/MicroweberPackages/Form/Http/Controllers/ApiPublic/FormController.php +++ b/src/MicroweberPackages/Form/Http/Controllers/ApiPublic/FormController.php @@ -17,7 +17,6 @@ public function post(Request $request) $response = mw()->forms_manager->post($request->all()); $responseCode = 200; - if (isset($response['error'])) { $responseCode = 422; } diff --git a/src/MicroweberPackages/Utils/Captcha/Adapters/MicroweberCaptcha.php b/src/MicroweberPackages/Utils/Captcha/Adapters/MicroweberCaptcha.php index 1d72c77f2ff..f6c613122b0 100644 --- a/src/MicroweberPackages/Utils/Captcha/Adapters/MicroweberCaptcha.php +++ b/src/MicroweberPackages/Utils/Captcha/Adapters/MicroweberCaptcha.php @@ -6,12 +6,11 @@ class MicroweberCaptcha { public function validate($key, $captcha_id = null, $unset_if_found = true) { - if ($key == false) { return false; } - $key = trim($key); + $key = trim($key); $old_array = app()->user_manager->session_get('captcha_recent'); if (is_array($old_array)) { @@ -19,11 +18,9 @@ public function validate($key, $captcha_id = null, $unset_if_found = true) return (string)$piece; }, $old_array); } - $existing = app()->user_manager->session_get('captcha'); if (is_array($old_array) and in_array($key, $old_array)) { $found_key = array_search($key, $old_array); - if ($found_key !== false) { if ($unset_if_found) { unset($old_array[$found_key]); @@ -31,17 +28,9 @@ public function validate($key, $captcha_id = null, $unset_if_found = true) app()->user_manager->session_set('captcha_recent', $old_array); return true; } - - } - if ($captcha_id == false) { - $existing = app()->user_manager->session_get('captcha'); - } else { - $existing = app()->user_manager->session_get('captcha_' . $captcha_id); - } - $existing = app()->user_manager->session_get('captcha'); - $existing = app()->user_manager->session_get('captcha_' . $captcha_id); + $existing = app()->user_manager->session_get('captcha_' . $captcha_id); if ($existing == $key) { return true; } else { @@ -58,7 +47,7 @@ public function reset($captcha_id = null) $old = app()->user_manager->session_set('captcha',[]); $old = app()->user_manager->session_set('captcha_recent',[]); if($captcha_id){ - $old = app()->user_manager->session_set('captcha_' . $captcha_id,[]); + $old = app()->user_manager->session_set('captcha_' . $captcha_id,[]); } }