diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index ec7ff29b..d1720d83 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -15,35 +15,7 @@ class AppServiceProvider extends ServiceProvider */ public function boot() { - View::addExtension('tpl', 'blade'); - - Validator::extend('username', function($attribute, $value, $parameters, $validator) { - return preg_match("/^([A-Za-z0-9\x{4e00}-\x{9fa5}_]+)$/u", $value); - }); - - Validator::extend('nickname', function($attribute, $value, $parameters, $validator) { - return $value == addslashes(trim($value)); - }); - - Validator::extend('no_special_chars', function($attribute, $value, $parameters, $validator) { - return $value == addslashes(trim($value)); - }); - - Validator::extend('playername', function($attribute, $value, $parameters, $validator) { - return preg_match("/^([A-Za-z0-9_]+)$/", $value); - }); - - Validator::extend('pname_chinese', function($attribute, $value, $parameters, $validator) { - return preg_match("/^([A-Za-z0-9\x{4e00}-\x{9fa5}_]+)$/u", $value); - }); - - Validator::extend('preference', function($attribute, $value, $parameters, $validator) { - return preg_match("/^(default|slim)$/", $value); - }); - - Validator::extend('model', function($attribute, $value, $parameters, $validator) { - return preg_match("/^(steve|alex|cape)$/", $value); - }); + // } /** diff --git a/app/Providers/BootServiceProvider.php b/app/Providers/BootServiceProvider.php index b8036616..0afba6d4 100644 --- a/app/Providers/BootServiceProvider.php +++ b/app/Providers/BootServiceProvider.php @@ -2,6 +2,7 @@ namespace App\Providers; +use View; use Illuminate\Support\ServiceProvider; use App\Exceptions\PrettyPageException; @@ -14,7 +15,8 @@ class BootServiceProvider extends ServiceProvider */ public function boot() { - \View::addExtension('tpl', 'blade'); + View::addExtension('tpl', 'blade'); + $this->checkFileExists(); $this->checkDbConfig(); $this->checkInstallation(); @@ -47,7 +49,7 @@ class BootServiceProvider extends ServiceProvider protected function checkInstallation() { if (!$this->checkTableExist()) { - \Http::redirect(url('/setup/index.php')); + return redirect('/setup/index.php')->send(); } if (!is_dir(BASE_DIR.'/storage/textures/')) { @@ -56,7 +58,7 @@ class BootServiceProvider extends ServiceProvider } if (config('app.version') != \Option::get('version', '')) { - \Http::redirect(url('/setup/update.php')); + return redirect('/setup/update.php')->send(); } return true; diff --git a/app/Providers/ValidatorExtendServiceProvider.php b/app/Providers/ValidatorExtendServiceProvider.php new file mode 100644 index 00000000..42136ced --- /dev/null +++ b/app/Providers/ValidatorExtendServiceProvider.php @@ -0,0 +1,61 @@ +