From 6dba2f563df82b3d4ecbdf979a84327ad8344a36 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 25 Jan 2026 15:45:02 +0100 Subject: [PATCH] Check for address validity before checking domain existence get_domain_properties might throw. Signed-off-by: Sven Strickroth --- model/AliasHandler.php | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/model/AliasHandler.php b/model/AliasHandler.php index cc376497..a0551b44 100644 --- a/model/AliasHandler.php +++ b/model/AliasHandler.php @@ -188,30 +188,26 @@ class AliasHandler extends PFAHandler { list($local_part, $domain) = explode('@', $this->id); - if (!$this->create_allowed($domain)) { - $this->errormsg[$this->id_field] = Config::lang('pCreate_alias_address_text_error3'); - return false; - } - # TODO: already checked in set() - does it make sense to check it here also? Only advantage: it's an early check # if (!in_array($domain, $this->allowed_domains)) { # $this->errormsg[] = Config::lang('pCreate_alias_address_text_error1'); # return false; # } - if ($local_part == '') { # catchall - $valid = true; - } else { + if ($local_part != '') { # catchall $email_check = check_email($this->id); - if ($email_check == '') { - $valid = true; - } else { + if ($email_check != '') { $this->errormsg[$this->id_field] = $email_check; - $valid = false; + return false; } } - return $valid; + if (!$this->create_allowed($domain)) { + $this->errormsg[$this->id_field] = Config::lang('pCreate_alias_address_text_error3'); + return false; + } + + return true; } /**