diff --git a/app/Http/Controllers/ClientPortal/InvitationController.php b/app/Http/Controllers/ClientPortal/InvitationController.php index c8ae1a00cec4..460020db838b 100644 --- a/app/Http/Controllers/ClientPortal/InvitationController.php +++ b/app/Http/Controllers/ClientPortal/InvitationController.php @@ -47,14 +47,10 @@ class InvitationController extends Controller $entity_obj = 'App\Models\\'.ucfirst(Str::camel($entity)).'Invitation'; -nlog($entity); -nlog($entity_obj); - $invitation = $entity_obj::whereRaw('BINARY `key`= ?', [$invitation_key]) ->with('contact.client') ->firstOrFail(); -nlog($invitation->getLink()); /* Return early if we have the correct client_hash embedded */ diff --git a/app/Http/Requests/User/StoreUserRequest.php b/app/Http/Requests/User/StoreUserRequest.php index 0e1e5511bf39..0786dda42de9 100644 --- a/app/Http/Requests/User/StoreUserRequest.php +++ b/app/Http/Requests/User/StoreUserRequest.php @@ -39,9 +39,9 @@ class StoreUserRequest extends Request $rules['last_name'] = 'required|string|max:100'; if (config('ninja.db.multi_db_enabled')) { - $rules['email'] = ['email:rfc,dns', new ValidUserForCompany(), Rule::unique('users')]; + $rules['email'] = ['email', new ValidUserForCompany(), Rule::unique('users')]; } else { - $rules['email'] = ['email:rfc,dns',Rule::unique('users')]; + $rules['email'] = ['email',Rule::unique('users')]; } diff --git a/app/Http/Requests/User/UpdateUserRequest.php b/app/Http/Requests/User/UpdateUserRequest.php index 04adff66a7a1..cb2ca75f3fa9 100644 --- a/app/Http/Requests/User/UpdateUserRequest.php +++ b/app/Http/Requests/User/UpdateUserRequest.php @@ -35,7 +35,7 @@ class UpdateUserRequest extends Request ]; if (isset($input['email'])) { - $rules['email'] = ['email:rfc,dns', 'sometimes', new UniqueUserRule($this->user, $input['email'])]; + $rules['email'] = ['email', 'sometimes', new UniqueUserRule($this->user, $input['email'])]; } return $rules;