From b72252d1099962f14b5325677321f9e6a0ded136 Mon Sep 17 00:00:00 2001 From: printempw Date: Sun, 7 Aug 2016 17:09:34 +0800 Subject: [PATCH] fix support for chinese player names --- app/Controllers/TextureController.php | 4 ++++ config/routes.php | 20 ++++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/Controllers/TextureController.php b/app/Controllers/TextureController.php index 1eaefdc3..220c1dfb 100644 --- a/app/Controllers/TextureController.php +++ b/app/Controllers/TextureController.php @@ -41,6 +41,8 @@ class TextureController extends BaseController public function skin($player_name, $model = "") { + $player_name = \Option::get('allow_chinese_playername') ? $GLOBALS['player_name'] : $player_name; + $player = new Player(0, $player_name); if ($player->is_banned) @@ -55,6 +57,8 @@ class TextureController extends BaseController public function cape($player_name) { + $player_name = \Option::get('allow_chinese_playername') ? $GLOBALS['player_name'] : $player_name; + $player = new Player(0, $player_name); if ($player->is_banned) diff --git a/config/routes.php b/config/routes.php index ebdebfb0..ba11137d 100644 --- a/config/routes.php +++ b/config/routes.php @@ -113,12 +113,20 @@ Route::group(['middleware' => 'App\Middlewares\CheckAdminMiddl */ Route::group(['middleware' => 'App\Middlewares\CheckPlayerExistMiddleware'], function() { - // Json profile - Route::get('/{player_name}.json', 'TextureController@json')->where(['player_name' => '[^\\/]+?']); - Route::get('/{api}/{player_name}.json', 'TextureController@jsonWithApi')->where(['player_name' => '[^\\/]+?']); - // Legacy links - Route::get('/skin/{player_name}.png', 'TextureController@skin'); - Route::get('/cape/{player_name}.png', 'TextureController@cape'); + // Fix for fucking chinese player names + if (Option::get('allow_chinese_playername')) { + // Json profile + Route::get('/{player_name}.json', 'TextureController@json')->where(['player_name' => '[^\\/]+?']); + Route::get('/{api}/{player_name}.json', 'TextureController@jsonWithApi')->where(['player_name' => '[^\\/]+?']); + // Legacy links + Route::get('/skin/{player_name}.png', 'TextureController@skin')->where(['player_name' => '[^\\/]+?']); + Route::get('/cape/{player_name}.png', 'TextureController@cape')->where(['player_name' => '[^\\/]+?']); + } else { + Route::get('/{player_name}.json', 'TextureController@json'); + Route::get('/{api}/{player_name}.json', 'TextureController@jsonWithApi'); + Route::get('/skin/{player_name}.png', 'TextureController@skin'); + Route::get('/cape/{player_name}.png', 'TextureController@cape'); + } }); Route::get('/avatar/{base64_email}.png', 'TextureController@avatar');