OptionManager::ValidateUserEntryUname()
trunk/include/controller/user_manager_class.php (diff) trunk/include/data/option_filter_data_class.php (diff) trunk/include/option/necessary_name.php (diff) trunk/include/option/necessary_trip.php (diff) trunk/include/option/option_class.php (diff)| @@ -182,12 +182,10 @@ | ||
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | //ユーザ名・村人名 |
| 185 | - if (DB::$ROOM->IsOption('necessary_name') && Text::IsPrefix($uname, Message::TRIP)) { | |
| 186 | - self::OutputError($title, UserManagerMessage::ERROR_INPUT_UNAME . $back_url); | |
| 185 | + $error_message = OptionManager::ValidateUserEntryUname($uname); | |
| 186 | + if (null !== $error_message) { | |
| 187 | + self::OutputError($title, $error_message . $back_url); | |
| 187 | 188 | } |
| 188 | - if (DB::$ROOM->IsOption('necessary_trip') && ! Text::Search($uname, Message::TRIP)) { | |
| 189 | - self::OutputError($title, UserManagerMessage::ERROR_INPUT_TRIP . $back_url); | |
| 190 | - } | |
| 191 | 189 | |
| 192 | 190 | if (UserDB::IsKick($uname)) { //キックされた人と同じユーザ名 |
| 193 | 191 | self::OutputError($title, UserManagerMessage::ERROR_INPUT_KICK . $footer); |
| @@ -66,8 +66,8 @@ | ||
| 66 | 66 | ]; |
| 67 | 67 | |
| 68 | 68 | //-- UserManager --// |
| 69 | - //ユーザー名入力欄注意事項 (順番依存あり) | |
| 70 | - public static $user_entry_uname_warning = ['necessary_name', 'necessary_trip']; | |
| 69 | + //ユーザー名入力制限 (注意事項表示処理は順番依存あり) | |
| 70 | + public static $user_entry_uname = ['necessary_name', 'necessary_trip']; | |
| 71 | 71 | |
| 72 | 72 | //追加希望役職 |
| 73 | 73 | public static $add_wish_role = [ |
| @@ -33,4 +33,13 @@ | ||
| 33 | 33 | } |
| 34 | 34 | return Text::BR . HTML::GenerateSpan($message); |
| 35 | 35 | } |
| 36 | + | |
| 37 | + //ユーザー名入力エラーチェック | |
| 38 | + public function ValidateUserEntryUname($uname) { | |
| 39 | + if (Text::IsPrefix($uname, Message::TRIP)) { | |
| 40 | + return UserManagerMessage::ERROR_INPUT_UNAME; | |
| 41 | + } else { | |
| 42 | + return null; | |
| 43 | + } | |
| 44 | + } | |
| 36 | 45 | } |
| @@ -28,4 +28,13 @@ | ||
| 28 | 28 | //ユーザ名必須と同時設定時の処理は necessary_name に委譲 |
| 29 | 29 | return Text::BR . HTML::GenerateSpan(UserManagerMessage::NECESSARY_TRIP); |
| 30 | 30 | } |
| 31 | + | |
| 32 | + //ユーザー名入力エラーチェック | |
| 33 | + public function ValidateUserEntryUname($uname) { | |
| 34 | + if (Text::Search($uname, Message::TRIP)) { | |
| 35 | + return null; | |
| 36 | + } else { | |
| 37 | + return UserManagerMessage::ERROR_INPUT_TRIP; | |
| 38 | + } | |
| 39 | + } | |
| 31 | 40 | } |
| @@ -154,7 +154,7 @@ | ||
| 154 | 154 | //-- UserManager --// |
| 155 | 155 | //ユーザー名入力欄注意事項取得 |
| 156 | 156 | public static function GetUserEntryUnameWarning() { |
| 157 | - $filter = self::GetFilter('user_entry_uname_warning'); | |
| 157 | + $filter = self::GetFilter('user_entry_uname'); | |
| 158 | 158 | if (null === $filter) { |
| 159 | 159 | return ''; |
| 160 | 160 | } else { |
| @@ -162,6 +162,19 @@ | ||
| 162 | 162 | } |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | + //ユーザー名入力エラーチェック | |
| 166 | + public static function ValidateUserEntryUname($uname) { | |
| 167 | + foreach (OptionFilterData::$user_entry_uname as $option) { | |
| 168 | + if (self::CanLoad($option)) { | |
| 169 | + $error_message = OptionLoader::Load($option)->ValidateUserEntryUname($uname); | |
| 170 | + if (null !== $error_message) { | |
| 171 | + return $error_message; | |
| 172 | + } | |
| 173 | + } | |
| 174 | + } | |
| 175 | + return null; | |
| 176 | + } | |
| 177 | + | |
| 165 | 178 | //希望役職リスト取得 |
| 166 | 179 | public static function GetWishRoleList() { |
| 167 | 180 | return OptionLoader::Load('wish_role')->GetWishRole(); |
