From 1aac6f8a41a236864e426fd94a1725d9d44be2db Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Thu, 13 Feb 2025 22:19:22 +0900
Subject: [PATCH] Allow space in user name #2466

---
 modules/member/member.admin.controller.php | 10 ++++++++--
 modules/member/member.controller.php       | 20 ++++++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index 0fb94a9a8..7d5d16f21 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -123,14 +123,20 @@ class MemberAdminController extends Member
 		}
 
 		// remove whitespace
-		$checkInfos = array('user_id', 'user_name', 'nick_name', 'email_address');
-		foreach($checkInfos as $val)
+		foreach(['user_id', 'nick_name', 'email_address'] as $val)
 		{
 			if(isset($args->{$val}))
 			{
 				$args->{$val} = preg_replace('/[\pZ\pC]+/u', '', utf8_clean(html_entity_decode($args->{$val})));
 			}
 		}
+		foreach(['user_name'] as $val)
+		{
+			if(isset($args->{$val}))
+			{
+				$args->{$val} = utf8_normalize_spaces(utf8_clean(html_entity_decode($args->{$val})));
+			}
+		}
 
 		// 실제로 디비쿼리시 빈값이 없다면 해당 쿼리를 무시하고 업데이트 하기 때문에 메모의 내용이 삭제가 되지 않습니다.
 		if(!isset($args->description))
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index e74e7097b..90ea49a45 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -796,14 +796,20 @@ class MemberController extends Member
 		}
 
 		// remove whitespace
-		$checkInfos = array('user_id', 'user_name', 'nick_name', 'email_address');
-		foreach($checkInfos as $val)
+		foreach(['user_id', 'nick_name', 'email_address'] as $val)
 		{
 			if(isset($args->{$val}))
 			{
 				$args->{$val} = preg_replace('/[\pZ\pC]+/u', '', utf8_clean(html_entity_decode($args->{$val})));
 			}
 		}
+		foreach(['user_name'] as $val)
+		{
+			if(isset($args->{$val}))
+			{
+				$args->{$val} = utf8_normalize_spaces(utf8_clean(html_entity_decode($args->{$val})));
+			}
+		}
 
 		// Check symbols in nickname
 		if($config->nickname_symbols === 'N')
@@ -1080,14 +1086,20 @@ class MemberController extends Member
 		$args->extra_vars = serialize($extra_vars);
 
 		// remove whitespace
-		$checkInfos = array('user_id', 'user_name', 'nick_name', 'email_address');
-		foreach($checkInfos as $val)
+		foreach(['user_id', 'nick_name', 'email_address'] as $val)
 		{
 			if(isset($args->{$val}))
 			{
 				$args->{$val} = preg_replace('/[\pZ\pC]+/u', '', utf8_clean(html_entity_decode($args->{$val})));
 			}
 		}
+		foreach(['user_name'] as $val)
+		{
+			if(isset($args->{$val}))
+			{
+				$args->{$val} = utf8_normalize_spaces(utf8_clean(html_entity_decode($args->{$val})));
+			}
+		}
 
 		// Check if nickname change is allowed
 		if(isset($config->allow_nickname_change) && $config->allow_nickname_change === 'N')