From 255c44bbf0653fae992fc85d33c917a55c5c2fa0 Mon Sep 17 00:00:00 2001 From: Hugo Sales Date: Sat, 26 Feb 2022 14:43:57 +0000 Subject: [PATCH] [ENTITY][LocalUser] Don't use FILTER_SANITIZE_EMAIL, use just want to validate. Up to the user to fix any errors. Use setter, rather than duplicate it's code --- src/Entity/LocalUser.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/Entity/LocalUser.php b/src/Entity/LocalUser.php index a7fe98357d..7db1a1fcf6 100644 --- a/src/Entity/LocalUser.php +++ b/src/Entity/LocalUser.php @@ -379,12 +379,10 @@ class LocalUser extends Entity implements UserInterface, PasswordAuthenticatedUs */ public function setOutgoingEmailSanitized(?string $email): self { - $sanitized_email = filter_var($email, FILTER_SANITIZE_EMAIL); - if (!is_null($email) && !filter_var($sanitized_email, FILTER_VALIDATE_EMAIL)) { + if (is_null($email) || filter_var($email, FILTER_VALIDATE_EMAIL) === false) { throw new EmailException('Invalid email entry, please use a valid email'); } - $this->outgoing_email = \is_null($sanitized_email) ? null : \mb_substr($sanitized_email, 0, 191); - return $this; + return $this->setOutgoingEmail($email); } /** @@ -396,12 +394,10 @@ class LocalUser extends Entity implements UserInterface, PasswordAuthenticatedUs */ public function setIncomingEmailSanitized(?string $email): self { - $sanitized_email = filter_var($email, FILTER_SANITIZE_EMAIL); - if (!is_null($email) && !filter_var($sanitized_email, FILTER_VALIDATE_EMAIL)) { + if (is_null($email) || filter_var($email, FILTER_VALIDATE_EMAIL) === false) { throw new EmailException('Invalid email entry, please use a valid email'); } - $this->incoming_email = \is_null($sanitized_email) ? null : \mb_substr($sanitized_email, 0, 191); - return $this; + return $this->setIncomingEmail($email); } public function getActor(): Actor