From 9f02cf26c1778be80d7de8fe57ffa0f5fd129849 Mon Sep 17 00:00:00 2001 From: printempw Date: Mon, 29 Aug 2016 23:31:43 +0800 Subject: [PATCH] use custom helpers instead of util classes --- app/Http/Controllers/AuthController.php | 6 +- app/Http/Controllers/PlayerController.php | 2 +- app/Http/Controllers/SkinlibController.php | 8 +- app/Http/Controllers/TextureController.php | 12 +-- .../Middleware/CheckPlayerExistMiddleware.php | 2 +- app/Models/Player.php | 6 +- app/Providers/AppServiceProvider.php | 2 + app/Services/Http.php | 74 ------------------- app/helpers.php | 36 +++++++++ config/app.php | 1 - resources/views/errors/general.tpl | 2 +- .../views/setup/migrations/import-v2-both.tpl | 8 +- .../setup/migrations/import-v2-textures.tpl | 8 +- .../setup/migrations/import-v2-users.tpl | 8 +- resources/views/skinlib/show.tpl | 2 +- setup/bootstrap.php | 16 ++++ 16 files changed, 87 insertions(+), 106 deletions(-) delete mode 100644 app/Services/Http.php create mode 100644 app/helpers.php diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 62066de0..394acb09 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -98,15 +98,17 @@ class AuthController extends BaseController if (!$user->is_registered) { if (Option::get('user_can_register') == 1) { if (Validate::password($_POST['password'])) { + $ip = get_real_ip(); + // If amount of registered accounts of IP is more than allowed amounts, // then reject the register. - if (UserModel::where('ip', Http::getRealIP())->count() < Option::get('regs_per_ip')) + if (UserModel::where('ip', $ip)->count() < Option::get('regs_per_ip')) { if (Validate::nickname(Utils::getValue('nickname', $_POST))) View::json('无效的昵称，昵称不能包含奇怪的字符', 1); // register new user - $user = $user->register($_POST['password'], Http::getRealIP()); + $user = $user->register($_POST['password'], $ip); $user->setNickName($_POST['nickname']); // set cookies diff --git a/app/Http/Controllers/PlayerController.php b/app/Http/Controllers/PlayerController.php index 14f3d199..64c3f579 100644 --- a/app/Http/Controllers/PlayerController.php +++ b/app/Http/Controllers/PlayerController.php @@ -26,7 +26,7 @@ class PlayerController extends BaseController if (isset($_POST['pid'])) { $this->player = new Player($_POST['pid']); if (!$this->player) - \Http::abort(404, '角色不存在'); + abort(404, '角色不存在'); } } diff --git a/app/Http/Controllers/SkinlibController.php b/app/Http/Controllers/SkinlibController.php index 471bd46f..473d39e5 100644 --- a/app/Http/Controllers/SkinlibController.php +++ b/app/Http/Controllers/SkinlibController.php @@ -96,7 +96,7 @@ class SkinlibController extends BaseController public function show() { if (!isset($_GET['tid'])) - Http::abort(404, 'No specified tid.'); + abort(404, 'No specified tid.'); $texture = Texture::find($_GET['tid']); @@ -105,14 +105,14 @@ class SkinlibController extends BaseController if ($texture) $texture->delete(); - Http::abort(404, '请求的材质文件已经被删除'); + abort(404, '请求的材质文件已经被删除'); } - Http::abort(404, '请求的材质文件已经被删除，请联系管理员删除该条目'); + abort(404, '请求的材质文件已经被删除，请联系管理员删除该条目'); } if ($texture->public == "0") { if (is_null($this->user) || ($this->user->uid != $texture->uploader && !$this->user->is_admin)) - Http::abort(404, '请求的材质已经设为隐私，仅上传者和管理员可查看'); + abort(404, '请求的材质已经设为隐私，仅上传者和管理员可查看'); } echo View::make('skinlib.show')->with('texture', $texture)->with('with_out_filter', true)->with('user', $this->user)->render(); diff --git a/app/Http/Controllers/TextureController.php b/app/Http/Controllers/TextureController.php index ff60a57e..f8fa4127 100644 --- a/app/Http/Controllers/TextureController.php +++ b/app/Http/Controllers/TextureController.php @@ -23,7 +23,7 @@ class TextureController extends BaseController $player = new Player(0, $player_name); if ($player->is_banned) - Http::abort(404, '该角色拥有者已被本站封禁。'); + abort(404, '该角色拥有者已被本站封禁。'); if ($api == "csl") { return response($player->getJsonProfile(Player::CSL_API)) @@ -35,7 +35,7 @@ class TextureController extends BaseController return response($player->getJsonProfile(Option::get('api_type'))) ->header('Content-type', 'application/json'); } else { - Http::abort(404, '不支持的 API_TYPE。'); + abort(404, '不支持的 API_TYPE。'); } } @@ -64,7 +64,7 @@ class TextureController extends BaseController $player = new Player(0, $player_name); if ($player->is_banned) - Http::abort(404, '该角色拥有者已被本站封禁。'); + abort(404, '该角色拥有者已被本站封禁。'); if (!$this->checkCache($player_name)) { $model_preference = ($player->getPreference() == "default") ? "steve" : "alex"; @@ -80,7 +80,7 @@ class TextureController extends BaseController $player = new Player(0, $player_name); if ($player->is_banned) - Http::abort(404, '该角色拥有者已被本站封禁。'); + abort(404, '该角色拥有者已被本站封禁。'); if (!$this->checkCache($player_name)) { echo $player->getBinaryTexture('cape'); @@ -146,10 +146,10 @@ class TextureController extends BaseController if (Storage::disk('textures')->has($t->hash)) { return response(Storage::disk('textures')->get($t->hash))->header('Content-Type', 'image/png'); } else { - Http::abort(404, '请求的材质文件已经被删除'); + abort(404, '请求的材质文件已经被删除'); } } else { - Http::abort(404, '材质不存在'); + abort(404, '材质不存在'); } } diff --git a/app/Http/Middleware/CheckPlayerExistMiddleware.php b/app/Http/Middleware/CheckPlayerExistMiddleware.php index 47cfe89e..16f4f80e 100644 --- a/app/Http/Middleware/CheckPlayerExistMiddleware.php +++ b/app/Http/Middleware/CheckPlayerExistMiddleware.php @@ -17,7 +17,7 @@ class CheckPlayerExistMiddleware $player_name = urldecode($matches[1]); if (PlayerModel::where('player_name', $player_name)->get()->isEmpty()) { - \Http::abort(404, '角色不存在'); + abort(404, '角色不存在'); } return $next($request); diff --git a/app/Models/Player.php b/app/Models/Player.php index a3abbcf7..d40d4ca4 100644 --- a/app/Models/Player.php +++ b/app/Models/Player.php @@ -37,7 +37,7 @@ class Player } if (!$this->model) { - \Http::abort(404, '角色不存在'); + abort(404, '角色不存在'); } else { $this->pid = $this->model->pid; } @@ -102,10 +102,10 @@ class Player ->header('Last-Modified', gmdate('D, d M Y H:i:s', $this->getLastModified()).' GMT') ->header('Content-Length', filesize($path)); } else { - \Http::abort(404, '请求的贴图已被删除。'); + abort(404, '请求的贴图已被删除。'); } } else { - \Http::abort(404, '该用户尚未上传请求的贴图类型 '.$type); + abort(404, '该用户尚未上传请求的贴图类型 '.$type); } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 07419136..ddd0e4a8 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -14,6 +14,8 @@ class AppServiceProvider extends ServiceProvider public function boot() { \View::addExtension('tpl', 'blade'); + + require_once BASE_DIR."/app/helpers.php"; } /** diff --git a/app/Services/Http.php b/app/Services/Http.php deleted file mode 100644 index ed2751f9..00000000 --- a/app/Services/Http.php +++ /dev/null @@ -1,74 +0,0 @@ -with('code', $code)->with('message', $msg); - } else { - echo View::make('errors.e')->with('code', $code)->with('message', $msg); - } - exit; - } - } -} diff --git a/app/helpers.php b/app/helpers.php new file mode 100644 index 00000000..4853d54f --- /dev/null +++ b/app/helpers.php @@ -0,0 +1,36 @@ + App\Services\Validate::class, 'Updater' => App\Services\Updater::class, 'Database' => App\Services\Facades\Database::class, - 'Http' => App\Services\Http::class ], diff --git a/resources/views/errors/general.tpl b/resources/views/errors/general.tpl index cb859fdc..6d9c4f17 100644 --- a/resources/views/errors/general.tpl +++ b/resources/views/errors/general.tpl @@ -5,7 +5,7 @@ @yield('title') - Blessing Skin Server - + diff --git a/resources/views/setup/migrations/import-v2-both.tpl b/resources/views/setup/migrations/import-v2-both.tpl index 3978c073..2ec84e2a 100644 --- a/resources/views/setup/migrations/import-v2-both.tpl +++ b/resources/views/setup/migrations/import-v2-both.tpl @@ -65,17 +65,17 @@ diff --git a/resources/views/setup/migrations/import-v2-textures.tpl b/resources/views/setup/migrations/import-v2-textures.tpl index c37f2e31..70d5a9e3 100644 --- a/resources/views/setup/migrations/import-v2-textures.tpl +++ b/resources/views/setup/migrations/import-v2-textures.tpl @@ -73,19 +73,19 @@ diff --git a/resources/views/setup/migrations/import-v2-users.tpl b/resources/views/setup/migrations/import-v2-users.tpl index ccfb32d2..b860e710 100644 --- a/resources/views/setup/migrations/import-v2-users.tpl +++ b/resources/views/setup/migrations/import-v2-users.tpl @@ -43,17 +43,17 @@ diff --git a/resources/views/skinlib/show.tpl b/resources/views/skinlib/show.tpl index 6c166f22..33360771 100644 --- a/resources/views/skinlib/show.tpl +++ b/resources/views/skinlib/show.tpl @@ -146,7 +146,7 @@
@if (Option::get('comment_script') != "") - {!! Utils::getStringReplaced(Option::get('comment_script'), ['{tid}' => $texture->tid, '{name}' => $texture->name, '{url}' => Http::getCurrentUrl()]) !!} + {!! Utils::getStringReplaced(Option::get('comment_script'), ['{tid}' => $texture->tid, '{name}' => $texture->name, '{url}' => get_current_url()]) !!} @else

本站未开启评论服务

diff --git a/setup/bootstrap.php b/setup/bootstrap.php index d4dcd631..fa95f7d8 100644 --- a/setup/bootstrap.php +++ b/setup/bootstrap.php @@ -82,4 +82,20 @@ function checkTableExist() { return true; } +function redirect_to($url, $msg = "") { + if ($msg !== "") { + if (app()->bound('session')) { + Session::flash('msg', $msg); + Session::save(); + } else { + $_SESSION['msg'] = $msg; + } + } + if (!headers_sent()) { + header('Location: '.$url); + } else { + echo ""; + } + exit; +}