From 786dfccbfdc68c339c2689de1e991e3823a867bf Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Mon, 19 Sep 2022 14:39:43 +0800 Subject: [PATCH] fixed email validation --- .../Admin/Http/Requests/AdminUserRequest.php | 4 +- beike/Admin/Http/Requests/CustomerRequest.php | 4 +- beike/Installer/config.php | 41 +++++++++++-------- beike/Shop/Http/Requests/EditRequest.php | 2 +- beike/Shop/Http/Requests/LoginRequest.php | 2 +- beike/Shop/Http/Requests/RegisterRequest.php | 2 +- 6 files changed, 31 insertions(+), 24 deletions(-) diff --git a/beike/Admin/Http/Requests/AdminUserRequest.php b/beike/Admin/Http/Requests/AdminUserRequest.php index 4ff8b73d..851d7437 100644 --- a/beike/Admin/Http/Requests/AdminUserRequest.php +++ b/beike/Admin/Http/Requests/AdminUserRequest.php @@ -33,9 +33,9 @@ class AdminUserRequest extends FormRequest public function rules(): array { if (!$this->id) { - $rules['email'] = 'required|email:rfc,dns|unique:admin_users,email'; + $rules['email'] = 'required|email:rfc|unique:admin_users,email'; } else { - $rules['email'] = 'required|email:rfc,dns|unique:admin_users,email,' . $this->id; + $rules['email'] = 'required|email:rfc|unique:admin_users,email,' . $this->id; } return $rules; diff --git a/beike/Admin/Http/Requests/CustomerRequest.php b/beike/Admin/Http/Requests/CustomerRequest.php index 79dbac7c..497e3804 100644 --- a/beike/Admin/Http/Requests/CustomerRequest.php +++ b/beike/Admin/Http/Requests/CustomerRequest.php @@ -34,13 +34,13 @@ class CustomerRequest extends FormRequest { $rules = [ 'name' => 'required|max:64', - 'email' => 'required|email:rfc,dns|unique:customers', + 'email' => 'required|email:rfc|unique:customers', 'customer_group_id' => 'required|exists:customer_groups,id', ]; if (!$this->id) { $rules['password'] = 'required|max:64'; } else { - $rules['email'] = 'required|email:rfc,dns|unique:customers,email,' . $this->id; + $rules['email'] = 'required|email:rfc|unique:customers,email,' . $this->id; } return $rules; } diff --git a/beike/Installer/config.php b/beike/Installer/config.php index c46ec533..9408cf7a 100644 --- a/beike/Installer/config.php +++ b/beike/Installer/config.php @@ -21,12 +21,19 @@ return [ ], 'requirements' => [ 'php' => [ - 'openssl', - 'pdo', - 'mbstring', - 'tokenizer', - 'JSON', + 'BCMath', + 'Ctype', 'cURL', + 'DOM', + 'Intl', + 'Fileinfo', + 'JSON', + 'Mbstring', + 'OpenSSL', + 'PCRE', + 'PDO', + 'Tokenizer', + 'XML', ], 'apache' => [ 'mod_rewrite', @@ -43,10 +50,10 @@ return [ | */ 'permissions' => [ - 'storage/framework/' => '755', - 'storage/logs/' => '755', - 'bootstrap/cache/' => '755', - '.env' => '755', + 'storage/framework/' => '755', + 'storage/logs/' => '755', + 'bootstrap/cache/' => '755', + '.env' => '755', ], /* @@ -61,14 +68,14 @@ return [ 'environment' => [ 'form' => [ 'rules' => [ - 'database_connection' => 'required|string|max:50', - 'database_hostname' => 'required|string|max:50', - 'database_port' => 'required|numeric', - 'database_name' => 'required|string|max:50', - 'database_username' => 'required|string|max:50', - 'database_password' => 'nullable|string|max:50', - 'admin_email' => 'required|email:rfc,dns', - 'admin_password' => 'required|string|max:50', + 'database_connection' => 'required|string|max:50', + 'database_hostname' => 'required|string|max:50', + 'database_port' => 'required|numeric', + 'database_name' => 'required|string|max:50', + 'database_username' => 'required|string|max:50', + 'database_password' => 'nullable|string|max:50', + 'admin_email' => 'required|email:rfc', + 'admin_password' => 'required|string|max:50', ], ], ], diff --git a/beike/Shop/Http/Requests/EditRequest.php b/beike/Shop/Http/Requests/EditRequest.php index d7691732..44a5569d 100644 --- a/beike/Shop/Http/Requests/EditRequest.php +++ b/beike/Shop/Http/Requests/EditRequest.php @@ -25,7 +25,7 @@ class EditRequest extends FormRequest { return [ 'name' => 'required|string|min:2|max:16', - 'email' => 'required|email:rfc,dns|unique:customers,email,' . current_customer()->id, + 'email' => 'required|email:rfc|unique:customers,email,' . current_customer()->id, ]; } diff --git a/beike/Shop/Http/Requests/LoginRequest.php b/beike/Shop/Http/Requests/LoginRequest.php index 0b32bd7b..d0421a74 100644 --- a/beike/Shop/Http/Requests/LoginRequest.php +++ b/beike/Shop/Http/Requests/LoginRequest.php @@ -24,7 +24,7 @@ class LoginRequest extends FormRequest public function rules() { return [ - 'email' => 'required|email:rfc,dns', + 'email' => 'required|email:rfc', 'password' => 'required', ]; } diff --git a/beike/Shop/Http/Requests/RegisterRequest.php b/beike/Shop/Http/Requests/RegisterRequest.php index 1d8bd66f..0212b5a2 100644 --- a/beike/Shop/Http/Requests/RegisterRequest.php +++ b/beike/Shop/Http/Requests/RegisterRequest.php @@ -24,7 +24,7 @@ class RegisterRequest extends FormRequest public function rules() { return [ - 'email' => 'required|email:rfc,dns|unique:customers,email', + 'email' => 'required|email:rfc|unique:customers,email', 'password' => 'required|confirmed', ]; }