From a7fe400614b933d2cc35ea7ed83cdb8124b70f15 Mon Sep 17 00:00:00 2001 From: slawkens Date: Sat, 14 Sep 2024 11:48:43 +0200 Subject: [PATCH] Use Validator::characterName --- system/src/CreateCharacter.php | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/system/src/CreateCharacter.php b/system/src/CreateCharacter.php index c54c515b..3d3ae8ff 100644 --- a/system/src/CreateCharacter.php +++ b/system/src/CreateCharacter.php @@ -23,32 +23,8 @@ class CreateCharacter */ public function checkName($name, &$errors) { - $minLength = setting('core.create_character_name_min_length'); - $maxLength = setting('core.create_character_name_max_length'); - - if(empty($name)) { - $errors['name'] = 'Please enter a name for your character!'; - return false; - } - - if(strlen($name) > $maxLength) { - $errors['name'] = 'Name is too long. Max. length ' . $maxLength . ' letters.'; - return false; - } - - if(strlen($name) < $minLength) { - $errors['name'] = 'Name is too short. Min. length ' . $minLength . ' letters.'; - return false; - } - - $name_length = strlen($name); - if(strspn($name, "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM- '") != $name_length) { - $errors['name'] = 'This name contains invalid letters, words or format. Please use only a-Z, - , \' and space.'; - return false; - } - - if(!preg_match("/[A-z ']/", $name)) { - $errors['name'] = 'Your name contains illegal characters.'; + if (!\Validator::characterName($name)) { + $errors['name'] = \Validator::getLastError(); return false; }