Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-04-26 09:19:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use PHP 8 functions

Browse Source
This commit is contained in:
slawkens 2024-09-14 11:48:56 +02:00
parent a7fe400614
commit 95a7c23a70
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
system/src/Validator.php
View File

@ -178,8 +178,7 @@ class Validator
*/ */
public static function characterName($name) public static function characterName($name)
{ {
if(!isset($name[0])) if(empty($name)) {
{
self::$lastError = 'Please enter character name.'; self::$lastError = 'Please enter character name.';
return false; return false;
} }
@ -250,7 +249,7 @@ class Validator
} }
} }
if(substr($name_lower, -1) == "'" || substr($name_lower, -1) == "-") { if(str_ends_with($name_lower, "'") || str_ends_with($name_lower, "-")) {
self::$lastError = 'Your name contains illegal characters.'; self::$lastError = 'Your name contains illegal characters.';
return false; return false;
} }
@ -285,7 +284,7 @@ class Validator
$words_blocked = array_merge(['--', "''","' ", " '", '- ', ' -', "-'", "'-"], setting('core.create_character_name_blocked_words')); $words_blocked = array_merge(['--', "''","' ", " '", '- ', ' -', "-'", "'-"], setting('core.create_character_name_blocked_words'));
foreach($words_blocked as $word) { foreach($words_blocked as $word) {
if(!(strpos($name_lower, $word) === false)) { if(str_contains($name_lower, $word)) {
self::$lastError = 'Your name contains illegal words.'; self::$lastError = 'Your name contains illegal words.';
return false; return false;
} }
@ -335,7 +334,7 @@ class Validator
NPCs::load(); NPCs::load();
if(NPCs::$npcs) { if(NPCs::$npcs) {
foreach (NPCs::$npcs as $npc) { foreach (NPCs::$npcs as $npc) {
if(strpos($name_lower, $npc) !== false) { if(str_contains($name_lower, $npc)) {
self::$lastError = 'Your name cannot contains NPC name.'; self::$lastError = 'Your name cannot contains NPC name.';
return false; return false;
} }