From 9a066474352c79c4dabcad0962828f7c93028bd2 Mon Sep 17 00:00:00 2001 From: stanjg Date: Fri, 4 May 2018 12:56:30 +0200 Subject: [PATCH 01/36] Added support for user specific languages --- .env.example | 3 ++- app/Http/Middleware/LanguageMiddleware.php | 7 ++++++- config/pterodactyl.php | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index e6eba87e0..571f93fc2 100644 --- a/.env.example +++ b/.env.example @@ -6,6 +6,7 @@ APP_TIMEZONE=America/New_York APP_CLEAR_TASKLOG=720 APP_DELETE_MINUTES=10 APP_ENVIRONMENT_ONLY=true +LANG_MUST_BE_GLOBAL=false DB_HOST=127.0.0.1 DB_PORT=3306 @@ -26,4 +27,4 @@ MAIL_FROM=no-reply@example.com QUEUE_HIGH=high QUEUE_STANDARD=standard -QUEUE_LOW=low +QUEUE_LOW=low \ No newline at end of file diff --git a/app/Http/Middleware/LanguageMiddleware.php b/app/Http/Middleware/LanguageMiddleware.php index 2e581f58f..f9fa40d04 100644 --- a/app/Http/Middleware/LanguageMiddleware.php +++ b/app/Http/Middleware/LanguageMiddleware.php @@ -13,6 +13,7 @@ use Closure; use Illuminate\Http\Request; use Illuminate\Foundation\Application; use Illuminate\Contracts\Config\Repository; +use Illuminate\Support\Facades\Auth; class LanguageMiddleware { @@ -47,7 +48,11 @@ class LanguageMiddleware */ public function handle(Request $request, Closure $next) { - $this->app->setLocale($this->config->get('app.locale', 'en')); + if (!Auth::check() || $this->config->get('pterodactyl.lang.global')) { + $this->app->setLocale($this->config->get('app.locale', 'en')); + } else { + $this->app->setLocale(Auth::user()->language); + } return $next($request); } diff --git a/config/pterodactyl.php b/config/pterodactyl.php index e06c709ef..f0379533b 100644 --- a/config/pterodactyl.php +++ b/config/pterodactyl.php @@ -161,6 +161,7 @@ return [ */ 'lang' => [ 'in_context' => env('PHRASE_IN_CONTEXT', false), + 'global' => env('LANG_MUST_BE_GLOBAL', false), ], /* From 9ae25538c36ec9b7e1600fa2c489957928e5f49a Mon Sep 17 00:00:00 2001 From: stanjg Date: Fri, 4 May 2018 13:08:41 +0200 Subject: [PATCH 02/36] Made it so users can switch languages themselves --- app/Http/Controllers/Base/AccountController.php | 9 +++++++-- resources/lang/en/base.php | 1 + resources/themes/pterodactyl/base/account.blade.php | 12 ++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Base/AccountController.php b/app/Http/Controllers/Base/AccountController.php index b6a433bb4..0c75e7a17 100644 --- a/app/Http/Controllers/Base/AccountController.php +++ b/app/Http/Controllers/Base/AccountController.php @@ -7,9 +7,12 @@ use Prologue\Alerts\AlertsMessageBag; use Pterodactyl\Http\Controllers\Controller; use Pterodactyl\Services\Users\UserUpdateService; use Pterodactyl\Http\Requests\Base\AccountDataFormRequest; +use Pterodactyl\Traits\Helpers\AvailableLanguages; class AccountController extends Controller { + use AvailableLanguages; + /** * @var \Prologue\Alerts\AlertsMessageBag */ @@ -39,7 +42,9 @@ class AccountController extends Controller */ public function index() { - return view('base.account'); + return view('base.account', [ + 'languages' => $this->getAvailableLanguages(true), + ]); } /** @@ -60,7 +65,7 @@ class AccountController extends Controller } elseif ($request->input('do_action') === 'email') { $data['email'] = $request->input('new_email'); } elseif ($request->input('do_action') === 'identity') { - $data = $request->only(['name_first', 'name_last', 'username']); + $data = $request->only(['name_first', 'name_last', 'username', 'language']); } $this->updateService->setUserLevel(User::USER_LEVEL_USER); diff --git a/resources/lang/en/base.php b/resources/lang/en/base.php index ee3fb1f37..981545f84 100644 --- a/resources/lang/en/base.php +++ b/resources/lang/en/base.php @@ -64,6 +64,7 @@ return [ 'last_name' => 'Last Name', 'update_identitity' => 'Update Identity', 'username_help' => 'Your username must be unique to your account, and may only contain the following characters: :requirements.', + 'language' => 'Language', ], 'security' => [ 'session_mgmt_disabled' => 'Your host has not enabled the ability to manage account sessions via this interface.', diff --git a/resources/themes/pterodactyl/base/account.blade.php b/resources/themes/pterodactyl/base/account.blade.php index 3c202f570..fdecdc820 100644 --- a/resources/themes/pterodactyl/base/account.blade.php +++ b/resources/themes/pterodactyl/base/account.blade.php @@ -90,6 +90,18 @@ +
+
+ +
+ +
+
+
{!! csrf_field() !!} From f5a15c4039808d8d2c52cd8d437315fee59f478d Mon Sep 17 00:00:00 2001 From: stanjg Date: Fri, 4 May 2018 13:58:39 +0200 Subject: [PATCH 03/36] Fixed the test --- coverage.xml | 9192 +++++++++++++++++ .../Base/AccountControllerTest.php | 2 +- 2 files changed, 9193 insertions(+), 1 deletion(-) create mode 100644 coverage.xml diff --git a/coverage.xml b/coverage.xml new file mode 100644 index 000000000..ea9fe6daa --- /dev/null +++ b/coverage.xml @@ -0,0 +1,9192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/Unit/Http/Controllers/Base/AccountControllerTest.php b/tests/Unit/Http/Controllers/Base/AccountControllerTest.php index 968019ad7..27b489124 100644 --- a/tests/Unit/Http/Controllers/Base/AccountControllerTest.php +++ b/tests/Unit/Http/Controllers/Base/AccountControllerTest.php @@ -93,7 +93,7 @@ class AccountControllerTest extends ControllerTestCase $user = $this->generateRequestUserModel(); $this->request->shouldReceive('input')->with('do_action')->andReturn('identity'); - $this->request->shouldReceive('only')->with(['name_first', 'name_last', 'username'])->once()->andReturn([ + $this->request->shouldReceive('only')->with(['name_first', 'name_last', 'username', 'language'])->once()->andReturn([ 'test_data' => 'value', ]); From ca794152c46618c7ffe98936514737b32f0d0491 Mon Sep 17 00:00:00 2001 From: stanjg Date: Fri, 4 May 2018 14:00:03 +0200 Subject: [PATCH 04/36] Renamed the .env entry --- .env.example | 2 +- config/pterodactyl.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index 571f93fc2..5e443806e 100644 --- a/.env.example +++ b/.env.example @@ -6,7 +6,7 @@ APP_TIMEZONE=America/New_York APP_CLEAR_TASKLOG=720 APP_DELETE_MINUTES=10 APP_ENVIRONMENT_ONLY=true -LANG_MUST_BE_GLOBAL=false +APP_LOCALE_IS_GLOBAL=false DB_HOST=127.0.0.1 DB_PORT=3306 diff --git a/config/pterodactyl.php b/config/pterodactyl.php index f0379533b..56f7e7aa9 100644 --- a/config/pterodactyl.php +++ b/config/pterodactyl.php @@ -161,7 +161,7 @@ return [ */ 'lang' => [ 'in_context' => env('PHRASE_IN_CONTEXT', false), - 'global' => env('LANG_MUST_BE_GLOBAL', false), + 'global' => env('APP_LOCALE_IS_GLOBAL', false), ], /* From 6aabb2da13d9bf499a8ff86c5c89bb314cbee612 Mon Sep 17 00:00:00 2001 From: stanjg Date: Fri, 4 May 2018 14:04:24 +0200 Subject: [PATCH 05/36] Added the locale to the example .env file --- .env.example | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.env.example b/.env.example index 5e443806e..40309f7b1 100644 --- a/.env.example +++ b/.env.example @@ -6,6 +6,8 @@ APP_TIMEZONE=America/New_York APP_CLEAR_TASKLOG=720 APP_DELETE_MINUTES=10 APP_ENVIRONMENT_ONLY=true + +APP_LOCALE=en APP_LOCALE_IS_GLOBAL=false DB_HOST=127.0.0.1 From 17a72d0895280874af219823bb3dcc233f0c27fe Mon Sep 17 00:00:00 2001 From: stanjg Date: Fri, 4 May 2018 14:05:42 +0200 Subject: [PATCH 06/36] StyleCI fixes --- app/Http/Controllers/Base/AccountController.php | 2 +- app/Http/Middleware/LanguageMiddleware.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Base/AccountController.php b/app/Http/Controllers/Base/AccountController.php index 0c75e7a17..c7b74a750 100644 --- a/app/Http/Controllers/Base/AccountController.php +++ b/app/Http/Controllers/Base/AccountController.php @@ -6,8 +6,8 @@ use Pterodactyl\Models\User; use Prologue\Alerts\AlertsMessageBag; use Pterodactyl\Http\Controllers\Controller; use Pterodactyl\Services\Users\UserUpdateService; -use Pterodactyl\Http\Requests\Base\AccountDataFormRequest; use Pterodactyl\Traits\Helpers\AvailableLanguages; +use Pterodactyl\Http\Requests\Base\AccountDataFormRequest; class AccountController extends Controller { diff --git a/app/Http/Middleware/LanguageMiddleware.php b/app/Http/Middleware/LanguageMiddleware.php index f9fa40d04..b938519a7 100644 --- a/app/Http/Middleware/LanguageMiddleware.php +++ b/app/Http/Middleware/LanguageMiddleware.php @@ -11,9 +11,9 @@ namespace Pterodactyl\Http\Middleware; use Closure; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; use Illuminate\Foundation\Application; use Illuminate\Contracts\Config\Repository; -use Illuminate\Support\Facades\Auth; class LanguageMiddleware { @@ -48,7 +48,7 @@ class LanguageMiddleware */ public function handle(Request $request, Closure $next) { - if (!Auth::check() || $this->config->get('pterodactyl.lang.global')) { + if (! Auth::check() || $this->config->get('pterodactyl.lang.global')) { $this->app->setLocale($this->config->get('app.locale', 'en')); } else { $this->app->setLocale(Auth::user()->language); From 941897f9182bc32f223f8bdb06942049afcd43c7 Mon Sep 17 00:00:00 2001 From: stanjg Date: Fri, 4 May 2018 14:21:39 +0200 Subject: [PATCH 07/36] Deleted the coverage.xml file and added it to the .gitignore --- .gitignore | 2 + coverage.xml | 9192 -------------------------------------------------- 2 files changed, 2 insertions(+), 9192 deletions(-) delete mode 100644 coverage.xml diff --git a/.gitignore b/.gitignore index 8c2fb9405..f1cc4279a 100644 --- a/.gitignore +++ b/.gitignore @@ -27,5 +27,7 @@ misc .phpstorm.meta.php .php_cs.cache +coverage.xml + # Vagrant *.log diff --git a/coverage.xml b/coverage.xml deleted file mode 100644 index ea9fe6daa..000000000 --- a/coverage.xml +++ /dev/null @@ -1,9192 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From e9ac014bf46a2a9552590cf81977a006a61d291c Mon Sep 17 00:00:00 2001 From: stanjg Date: Fri, 1 Jun 2018 16:10:32 +0200 Subject: [PATCH 08/36] Removed the use of Auth facade and removed unnecesary option --- .env.example | 2 -- app/Http/Middleware/LanguageMiddleware.php | 6 +----- config/pterodactyl.php | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.env.example b/.env.example index 8c9c916b0..0b59de0c9 100644 --- a/.env.example +++ b/.env.example @@ -7,9 +7,7 @@ APP_CLEAR_TASKLOG=720 APP_DELETE_MINUTES=10 APP_ENVIRONMENT_ONLY=true LOG_CHANNEL=daily - APP_LOCALE=en -APP_LOCALE_IS_GLOBAL=false DB_HOST=127.0.0.1 DB_PORT=3306 diff --git a/app/Http/Middleware/LanguageMiddleware.php b/app/Http/Middleware/LanguageMiddleware.php index b938519a7..f0c341276 100644 --- a/app/Http/Middleware/LanguageMiddleware.php +++ b/app/Http/Middleware/LanguageMiddleware.php @@ -48,11 +48,7 @@ class LanguageMiddleware */ public function handle(Request $request, Closure $next) { - if (! Auth::check() || $this->config->get('pterodactyl.lang.global')) { - $this->app->setLocale($this->config->get('app.locale', 'en')); - } else { - $this->app->setLocale(Auth::user()->language); - } + $this->app->setLocale($request->user()->language ?? $this->config->get('app.locale')); return $next($request); } diff --git a/config/pterodactyl.php b/config/pterodactyl.php index 56f7e7aa9..e06c709ef 100644 --- a/config/pterodactyl.php +++ b/config/pterodactyl.php @@ -161,7 +161,6 @@ return [ */ 'lang' => [ 'in_context' => env('PHRASE_IN_CONTEXT', false), - 'global' => env('APP_LOCALE_IS_GLOBAL', false), ], /* From b56f3a867146c01b59cfcddc887ed399c0af8901 Mon Sep 17 00:00:00 2001 From: stanjg Date: Fri, 1 Jun 2018 16:22:06 +0200 Subject: [PATCH 09/36] Expanded the middleware test --- app/Http/Middleware/LanguageMiddleware.php | 2 +- .../Middleware/LanguageMiddlewareTest.php | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/Http/Middleware/LanguageMiddleware.php b/app/Http/Middleware/LanguageMiddleware.php index f0c341276..04e5f3a98 100644 --- a/app/Http/Middleware/LanguageMiddleware.php +++ b/app/Http/Middleware/LanguageMiddleware.php @@ -48,7 +48,7 @@ class LanguageMiddleware */ public function handle(Request $request, Closure $next) { - $this->app->setLocale($request->user()->language ?? $this->config->get('app.locale')); + $this->app->setLocale($request->user()->language ?? $this->config->get('app.locale', 'en')); return $next($request); } diff --git a/tests/Unit/Http/Middleware/LanguageMiddlewareTest.php b/tests/Unit/Http/Middleware/LanguageMiddlewareTest.php index c156665aa..3e1662a19 100644 --- a/tests/Unit/Http/Middleware/LanguageMiddlewareTest.php +++ b/tests/Unit/Http/Middleware/LanguageMiddlewareTest.php @@ -6,6 +6,7 @@ use Mockery as m; use Illuminate\Foundation\Application; use Illuminate\Contracts\Config\Repository; use Pterodactyl\Http\Middleware\LanguageMiddleware; +use Pterodactyl\Models\User; class LanguageMiddlewareTest extends MiddlewareTestCase { @@ -31,16 +32,30 @@ class LanguageMiddlewareTest extends MiddlewareTestCase } /** - * Test that a language is defined via the middleware. + * Test that a language is defined via the middleware for guests. */ - public function testLanguageIsSet() + public function testLanguageIsSetForGuest() { + $this->request->shouldReceive('user')->withNoArgs()->andReturnNull(); + $this->config->shouldReceive('get')->with('app.locale', 'en')->once()->andReturn('en'); $this->appMock->shouldReceive('setLocale')->with('en')->once()->andReturnNull(); $this->getMiddleware()->handle($this->request, $this->getClosureAssertions()); } + /** + * Test that a language is defined via the middleware for a user. + */ + public function testLanguageIsSetWithAuthenticatedUser() { + $user = factory(User::class)->make(['language' => 'de']); + + $this->request->shouldReceive('user')->withNoArgs()->andReturn($user); + $this->appMock->shouldReceive('setLocale')->with('de')->once()->andReturnNull(); + + $this->getMiddleware()->handle($this->request, $this->getClosureAssertions()); + } + /** * Return an instance of the middleware using mocked dependencies. * From 955617d7ce34a49b785a87c707df6962a51ea3a7 Mon Sep 17 00:00:00 2001 From: JC Snider Date: Tue, 17 Jul 2018 18:09:05 -0400 Subject: [PATCH 10/36] Update terminal.css Treat white space in terminal output as preformatted so ascii art/other formatting works. --- public/themes/pterodactyl/css/terminal.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/themes/pterodactyl/css/terminal.css b/public/themes/pterodactyl/css/terminal.css index ecdd10ffc..29ede479b 100644 --- a/public/themes/pterodactyl/css/terminal.css +++ b/public/themes/pterodactyl/css/terminal.css @@ -26,6 +26,7 @@ #terminal > .cmd { padding: 1px 0; + white-space: pre; } #terminal_input { From ac71a56fd1e1eebbe8f5ceab883dbeefedb2bcb8 Mon Sep 17 00:00:00 2001 From: ViViV_ Date: Sat, 21 Jul 2018 19:40:51 +0200 Subject: [PATCH 11/36] Adding variable for Server Map Selection [ARK SERVER] (#1230) --- .../source-engine/egg-ark--survival-evolved.json | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/database/seeds/eggs/source-engine/egg-ark--survival-evolved.json b/database/seeds/eggs/source-engine/egg-ark--survival-evolved.json index 092033092..4b2ec6356 100644 --- a/database/seeds/eggs/source-engine/egg-ark--survival-evolved.json +++ b/database/seeds/eggs/source-engine/egg-ark--survival-evolved.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-01-21T16:59:40-06:00", + "exported_at": "2018-07-06T11:27:32+02:00", "name": "Ark: Survival Evolved", "author": "support@pterodactyl.io", "description": "As a man or woman stranded, naked, freezing, and starving on the unforgiving shores of a mysterious island called ARK, use your skill and cunning to kill or tame and ride the plethora of leviathan dinosaurs and other primeval creatures roaming the land. Hunt, harvest resources, craft items, grow crops, research technologies, and build shelters to withstand the elements and store valuables, all while teaming up with (or preying upon) hundreds of other players to survive, dominate... and escape! \u2014 Gamepedia: ARK", "image": "quay.io\/pterodactyl\/core:source", - "startup": ".\/ShooterGame\/Binaries\/Linux\/ShooterGameServer TheIsland?listen?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{SERVER_PORT}}?MaxPlayers={{SERVER_MAX_PLAYERS}}", + "startup": ".\/ShooterGame\/Binaries\/Linux\/ShooterGameServer {{SERVER_MAP}}?listen?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{SERVER_PORT}}?MaxPlayers={{SERVER_MAX_PLAYERS}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"gameserver Steam ID\",\r\n \"userInteraction\": []\r\n}", @@ -49,6 +49,15 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|numeric|digits_between:1,4" + }, + { + "name": "Server Map", + "description": "Available Maps: TheIsland, TheCenter, Ragnarok, ScorchedEarth_P, Aberration_P", + "env_variable": "SERVER_MAP", + "default_value": "TheIsland", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From 5d9d4da5dad96ad8d0965c33832a6148d41136c2 Mon Sep 17 00:00:00 2001 From: Alex <30688640+casKd-dev@users.noreply.github.com> Date: Wed, 1 Aug 2018 18:03:36 +0200 Subject: [PATCH 12/36] Use appropiate infinity signs (#1260) --- resources/themes/pterodactyl/admin/nodes/view/servers.blade.php | 2 +- resources/themes/pterodactyl/base/index.blade.php | 2 +- resources/themes/pterodactyl/server/databases/index.blade.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/themes/pterodactyl/admin/nodes/view/servers.blade.php b/resources/themes/pterodactyl/admin/nodes/view/servers.blade.php index b648c760c..de8ef5dee 100644 --- a/resources/themes/pterodactyl/admin/nodes/view/servers.blade.php +++ b/resources/themes/pterodactyl/admin/nodes/view/servers.blade.php @@ -57,7 +57,7 @@ {{ $server->name }} {{ $server->user->username }} {{ $server->nest->name }} ({{ $server->egg->name }}) - NaN / {{ $server->memory === 0 ? '∞' : $server->memory }} MB + NaN / {{ $server->memory === 0 ? '∞' : $server->memory }} MB {{ $server->disk }} MB NaN % NaN diff --git a/resources/themes/pterodactyl/base/index.blade.php b/resources/themes/pterodactyl/base/index.blade.php index 1fd44caa7..c83557eec 100644 --- a/resources/themes/pterodactyl/base/index.blade.php +++ b/resources/themes/pterodactyl/base/index.blade.php @@ -53,7 +53,7 @@ {{ $server->name }} {{ $server->getRelation('node')->name }} {{ $server->getRelation('allocation')->alias }}:{{ $server->getRelation('allocation')->port }} - -- / {{ $server->memory === 0 ? '∞' : $server->memory }} MB + -- / {{ $server->memory === 0 ? '∞' : $server->memory }} MB -- % @if($server->user->id === Auth::user()->id) diff --git a/resources/themes/pterodactyl/server/databases/index.blade.php b/resources/themes/pterodactyl/server/databases/index.blade.php index d7b475ac6..e6004a706 100644 --- a/resources/themes/pterodactyl/server/databases/index.blade.php +++ b/resources/themes/pterodactyl/server/databases/index.blade.php @@ -87,7 +87,7 @@ @if($overLimit)
- You are currently using {{ count($databases) }} of your {{ $server->database_limit ?? '∞' }} allowed databases. + You are currently using {{ count($databases) }} of your {{ $server->database_limit ?? '∞' }} allowed databases.
@else From 962416445ec54f15fb1dc75d39887902be5ecde1 Mon Sep 17 00:00:00 2001 From: Jakob Date: Fri, 3 Aug 2018 18:05:52 +0200 Subject: [PATCH 13/36] update shields (#1265) --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 135f4d4ef..41fb9cd23 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,12 @@ [![Logo Image](https://cdn.pterodactyl.io/logos/Banner%20Logo%20Black@2x.png)](https://pterodactyl.io) -[![Build Status](https://travis-ci.org/pterodactyl/panel.svg?branch=develop)](https://travis-ci.org/pterodactyl/panel) [![StyleCI](https://styleci.io/repos/47508644/shield?branch=develop)](https://styleci.io/repos/47508644) [![codecov](https://codecov.io/gh/pterodactyl/panel/branch/develop/graph/badge.svg)](https://codecov.io/gh/Pterodactyl/Panel) +[![Build status](https://img.shields.io/travis/pterodactyl/panel/develop.svg?style=flat-square)](https://travis-ci.org/pterodactyl/panel) +[![StyleCI](https://styleci.io/repos/47508644/shield?branch=develop)](https://styleci.io/repos/47508644) +[![Codecov](https://img.shields.io/codecov/c/github/pterodactyl/panel/develop.svg?style=flat-square)](https://codecov.io/gh/Pterodactyl/Panel) +[![Discord](https://img.shields.io/discord/122900397965705216.svg?style=flat-square&label=Discord)](https://pterodactyl.io/discord) # Pterodactyl Panel + Pterodactyl is the open-source game server management panel built with PHP7, Nodejs, and Go. Designed with security in mind, Pterodactyl runs all game servers in isolated Docker containers while exposing a beautiful and intuitive UI to administrators and users. What more are you waiting for? Make game servers a first class citizen on your platform today. From a8373ec726908f5d0a950213fff97cef7e81304f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=88=E5=85=89=E5=85=94-lunarbunnys?= <1255655119@qq.com> Date: Tue, 7 Aug 2018 08:15:03 +0800 Subject: [PATCH 14/36] Add Simplified Chinese translation for the panel (#1263) * Add Simplified Chinese translation for the panel * Update passwords.php * The pterodactyl theme incomplete translation.Part 1. * Deleteing pterodactyl theme translation. --- resources/lang/cn/admin/nests.php | 33 +++ resources/lang/cn/admin/node.php | 23 ++ resources/lang/cn/admin/pack.php | 16 ++ resources/lang/cn/admin/server.php | 31 +++ resources/lang/cn/admin/user.php | 18 ++ resources/lang/cn/auth.php | 22 ++ resources/lang/cn/base.php | 88 +++++++ resources/lang/cn/command/messages.php | 97 ++++++++ resources/lang/cn/exceptions.php | 68 +++++ resources/lang/cn/navigation.php | 32 +++ resources/lang/cn/pagination.php | 17 ++ resources/lang/cn/passwords.php | 19 ++ resources/lang/cn/server.php | 330 +++++++++++++++++++++++++ resources/lang/cn/strings.php | 88 +++++++ resources/lang/cn/validation.php | 105 ++++++++ 15 files changed, 987 insertions(+) create mode 100644 resources/lang/cn/admin/nests.php create mode 100644 resources/lang/cn/admin/node.php create mode 100644 resources/lang/cn/admin/pack.php create mode 100644 resources/lang/cn/admin/server.php create mode 100644 resources/lang/cn/admin/user.php create mode 100644 resources/lang/cn/auth.php create mode 100644 resources/lang/cn/base.php create mode 100644 resources/lang/cn/command/messages.php create mode 100644 resources/lang/cn/exceptions.php create mode 100644 resources/lang/cn/navigation.php create mode 100644 resources/lang/cn/pagination.php create mode 100644 resources/lang/cn/passwords.php create mode 100644 resources/lang/cn/server.php create mode 100644 resources/lang/cn/strings.php create mode 100644 resources/lang/cn/validation.php diff --git a/resources/lang/cn/admin/nests.php b/resources/lang/cn/admin/nests.php new file mode 100644 index 000000000..d5e2a511b --- /dev/null +++ b/resources/lang/cn/admin/nests.php @@ -0,0 +1,33 @@ +. + * + * This software is licensed under the terms of the MIT license. + * https://opensource.org/licenses/MIT + */ + +return [ + 'notices' => [ + 'created' => '一个新的管理模块, :name, 已成功创建。', + 'deleted' => '成功从面板删除指定的管理模块。', + 'updated' => '成功更新管理模块的选项。', + ], + 'eggs' => [ + 'notices' => [ + 'imported' => '成功导入一个管理模板。', + 'updated_via_import' => '该管理模板已按照上传的文件完成更新。', + 'deleted' => '成功删除指定的管路模板。', + 'updated' => '成功更新管理模板的配置。', + 'script_updated' => '管理模板的安装脚本已经成功更新并且会在安装新服务器时被执行。', + 'egg_created' => '一个管理模板已经成功创建. 你需要重启所有正在运行的节点受控端来使该模板生效。', + ], + ], + 'variables' => [ + 'notices' => [ + 'variable_deleted' => '参数 ":variable" 已被移除，在服务器重装之后将不在有效。', + 'variable_updated' => '参数 ":variable" 已更新。 你需要重装所有服务器来使该参数生效.', + 'variable_created' => '新的参数已经创建并被赋值，该操作会影响此管理模板下的所有服务器', + ], + ], +]; diff --git a/resources/lang/cn/admin/node.php b/resources/lang/cn/admin/node.php new file mode 100644 index 000000000..e2b9984aa --- /dev/null +++ b/resources/lang/cn/admin/node.php @@ -0,0 +1,23 @@ +. + * + * This software is licensed under the terms of the MIT license. + * https://opensource.org/licenses/MIT + */ + +return [ + 'validation' => [ + 'fqdn_not_resolvable' => '提供的域名或地址没有解析到一个合法的IP地址.', + 'fqdn_required_for_ssl' => '这个节点要求解析到一个公共IP的域名必须使用SSL', + ], + 'notices' => [ + 'allocations_added' => '配额已经成功的被添加到这个节点.', + 'node_deleted' => '节点成功从面板中移除.', + 'location_required' => '在你可以添加一个节点之前必须至少有一个可用区配置。', + 'node_created' => '节点新建成功！ 使用 \'Configuration\' 标签，你可以在此节点上自动配置受控端. 在你可以创建服务器之前，你必须至少分配一个IP和端口', + 'node_updated' => '节点信息更新成功！如果任何节点受控端的设置更改了，您需要重启受控端来使设置生效.', + 'unallocated_deleted' => '已删除 :ip 上的所有未分配的端口', + ], +]; diff --git a/resources/lang/cn/admin/pack.php b/resources/lang/cn/admin/pack.php new file mode 100644 index 000000000..1d95dc074 --- /dev/null +++ b/resources/lang/cn/admin/pack.php @@ -0,0 +1,16 @@ +. + * + * This software is licensed under the terms of the MIT license. + * https://opensource.org/licenses/MIT + */ + +return [ + 'notices' => [ + 'pack_updated' => '整合包已经被更新。', + 'pack_deleted' => '成功删除整合包： ":name" 。', + 'pack_created' => '一个整合包已被成功创建，现在可以用它来部署服务器了。', + ], +]; diff --git a/resources/lang/cn/admin/server.php b/resources/lang/cn/admin/server.php new file mode 100644 index 000000000..c850b2735 --- /dev/null +++ b/resources/lang/cn/admin/server.php @@ -0,0 +1,31 @@ +. + * + * This software is licensed under the terms of the MIT license. + * https://opensource.org/licenses/MIT + */ + +return [ + 'exceptions' => [ + 'no_new_default_allocation' => '你正在尝试删除此服务器的默认配额，但是该服务器没有足够的后备配额。', + 'marked_as_failed' => '这个服务器目前被标记为安装失败。 当前状态不能改变为此状态。', + 'bad_variable' => '变量 :name 有一个已确认的错误 。', + 'daemon_exception' => '连接受控端时发生意外 返回错误码 HTTP/:code response code. 此错误已被记录。', + 'default_allocation_not_found' => '请求的默认配额没有在这台服务器上找到。', + ], + 'alerts' => [ + 'startup_changed' => '该服务器的启动配置已被更新. 如果此服务器所属的管理模块或管理模板更改，此时将发生一次配置重设', + 'server_deleted' => '成功从系统中删除服务器', + 'server_created' => '创建服务器成功。 请稍后几分钟，受控端将尽快完成服务器安装', + 'build_updated' => '启动参数已更改。 一些修改需要重启该服务器后生效。', + 'suspension_toggled' => '服务器状态已更改为 :status.', + 'rebuild_on_boot' => '此服务器已被标记为需要在Docker容器中启动。 此操作会在下次重启后生效。', + 'install_toggled' => '此服务器的安装状态已被更改', + 'server_reinstalled' => '此服务器目前已置于重装队列中，即将开始重装', + 'details_updated' => '服务器信息成功被更新', + 'docker_image_updated' => '成功更改用于该服务器的默认的Docker镜像。 此操作需要重启后生效', + 'node_required' => '你需要至少一个节点才能开始添加服务器', + ], +]; diff --git a/resources/lang/cn/admin/user.php b/resources/lang/cn/admin/user.php new file mode 100644 index 000000000..1250cdae7 --- /dev/null +++ b/resources/lang/cn/admin/user.php @@ -0,0 +1,18 @@ +. + * + * This software is licensed under the terms of the MIT license. + * https://opensource.org/licenses/MIT + */ + +return [ + 'exceptions' => [ + 'user_has_servers' => '无法删除一个拥有活动状态服务器的用户. 请在继续此操作前删除他的服务器', + ], + 'notices' => [ + 'account_created' => '成功创建用户', + 'account_updated' => '成功更新用户', + ], +]; diff --git a/resources/lang/cn/auth.php b/resources/lang/cn/auth.php new file mode 100644 index 000000000..6758f8238 --- /dev/null +++ b/resources/lang/cn/auth.php @@ -0,0 +1,22 @@ + '您无权执行此操作。', + 'auth_error' => '尝试登录时发生错误.', + 'authentication_required' => '需要认证才能继续操作', + 'remember_me' => '记住我', + 'sign_in' => '登陆', + 'forgot_password' => '忘记密码', + 'request_reset_text' => '忘记密码? 请在下方填入您的Email.', + 'reset_password_text' => '重设您账户的密码.', + 'reset_password' => '重设密码', + 'email_sent' => '一封帮助您重置密码的电子邮件已发出，请查收并按提示操作（如未收到请检查垃圾箱）', + 'failed' => '用户名或密码错误, 或者两步验证失败.', + 'throttle' => '太多次登陆失败. 请在 :seconds 秒后尝试', + 'password_requirements' => '密码至少包含大写字母，小写字母，数字，并且在8位以上.', + 'request_reset' => '查找账户', + '2fa_required' => '两步验证', + '2fa_failed' => '两步验证密码错误', + 'totp_failed' => '错误的TOTP验证.', + '2fa_must_be_enabled' => '管理员要求您的账户必须开启两步验证才能使用此面板.', +]; diff --git a/resources/lang/cn/base.php b/resources/lang/cn/base.php new file mode 100644 index 000000000..528e07f1c --- /dev/null +++ b/resources/lang/cn/base.php @@ -0,0 +1,88 @@ + '请求中有一个或多个字段出错', + 'errors' => [ + 'return' => '返回上一个页面', + 'home' => '返回主页', + '403' => [ + 'header' => '禁止访问', + 'desc' => '您没有权限访问此服务器上的资源.', + ], + '404' => [ + 'header' => 'Not Found', + 'desc' => '未找到资源.', + ], + 'installing' => [ + 'header' => '服务器正在安装', + 'desc' => '请求的服务器仍然在部署中，请稍等几分钟，完成后您将收到一封电子邮件', + ], + 'suspended' => [ + 'header' => '服务器已暂停', + 'desc' => '此服务器已被暂停，无法访问，请联系管理员', + ], + 'maintenance' => [ + 'header' => '节点维护中', + 'title' => '暂时不可用', + 'desc' => '此节点正在维护，当前无法访问.', + ], + ], + 'index' => [ + 'header' => '您的服务器', + 'header_sub' => '您当前可访问的服务器.', + 'list' => '服务器列表', + ], + 'api' => [ + 'index' => [ + 'list' => '您的密钥', + 'header' => '账户 API', + 'header_sub' => '管理访问密钥允许您使用API操作面板.', + 'create_new' => '新建 API 密钥', + 'keypair_created' => '新建API密钥成功.', + ], + 'new' => [ + 'header' => '新建 API 密钥', + 'header_sub' => '创建一个新的账户API密钥.', + 'form_title' => '选项', + 'descriptive_memo' => [ + 'title' => '描述', + 'description' => '添加一个关于此密钥的描述.', + ], + 'allowed_ips' => [ + 'title' => '允许的IP', + 'description' => '添加IP地址限制来保护API安全. CIDR 标记是被允许的. 留空将允许所有IP.', + ], + ], + ], + 'account' => [ + 'details_updated' => '您账户的信息成功更新.', + 'invalid_password' => '您提供的密码不正确.', + 'header' => '您的账户', + 'header_sub' => '管理您的账户信息.', + 'update_pass' => '修改密码', + 'update_email' => '修改 Email 地址', + 'current_password' => '当前密码', + 'new_password' => '新密码', + 'new_password_again' => '重复密码', + 'new_email' => '新 Email 地址', + 'first_name' => '姓', + 'last_name' => '名', + 'update_identity' => '更新个人信息', + 'username_help' => '您的用户名必须唯一（未被使用），并满足以下要求: :requirements.', + ], + 'security' => [ + 'session_mgmt_disabled' => '为了安全原因，您的此次会话无法访问用户管理.', + 'header' => '账户安全', + 'header_sub' => '管理活动会话和两步认证.', + 'sessions' => '活动中的会话', + '2fa_header' => '两步验证', + '2fa_token_help' => '填入您两步验证生成器生成的密码 (Google Authenticator, Authy, etc.).', + 'disable_2fa' => '关闭两步验证', + '2fa_enabled' => '两步验证已开启，在您登陆面板时会要求两步验证.如果您想关闭两步验证，只需输入两步验证的密码即可', + '2fa_disabled' => '两步验证已关闭! 您应该开启两步验证将其作为您账户的额外防护', + 'enable_2fa' => '开启两步验证', + '2fa_qr' => '在您的设备上上配置两步验证', + '2fa_checkpoint_help' => '使用两步验证需要用您的应用扫左侧二维码, 或手动输入下方的代码.完成后请将生成的密码输入下方方框.', + '2fa_disable_error' => '两步验证密码错误. 关闭两步验证失败.', + ], +]; diff --git a/resources/lang/cn/command/messages.php b/resources/lang/cn/command/messages.php new file mode 100644 index 000000000..3ea2ed214 --- /dev/null +++ b/resources/lang/cn/command/messages.php @@ -0,0 +1,97 @@ + [ + 'warning' => '貌似您已经拥有一个应用加密密钥了. 继续操作会导致之前的密钥被覆盖，所有的加密文件都将损坏。 ！！！危险操作，请注意文件安全！！！', + 'confirm' => '我已了解此操作的后果，可以承受丢失文件的风险，请继续。', + 'final_confirm' => '确定继续操作? 更改应用加密密钥 ！！将会导致数据丢失！！.', + ], + 'location' => [ + 'no_location_found' => '可用区ID错误：无发找到该可用区', + 'ask_short' => '可用区ID', + 'ask_long' => '可用区描述', + 'created' => '成功创建可用区 (:name) ，可用区ID： :id.', + 'deleted' => '成功删除指定的可用区。', + ], + 'user' => [ + 'search_users' => '输入用户名, UUID, 或 Email 地址', + 'select_search_user' => '要删除的用户ID (键入 \'0\' 来重新搜索)', + 'deleted' => '成功删除用户。', + 'confirm_delete' => '确定要删除此用户吗', + 'no_users_found' => '未找到指定的用户', + 'multiple_found' => '找到多个用户, 无法删除用户，原因： --no-interaction 参数。', + 'ask_admin' => '此用户是管理员吗？', + 'ask_email' => '电子邮件地址', + 'ask_username' => '用户名', + 'ask_name_first' => '姓', + 'ask_name_last' => '名', + 'ask_password' => '密码', + 'ask_password_tip' => '如果您想创建一个随机密码的用户，请重新执行指令(CTRL+C) 并输入 `--no-password` 参数.', + 'ask_password_help' => '密码至少8位，并包含一个字母和数字', + '2fa_help_text' => [ + '此命令会关闭一个用户的两步验证（如果他打开了）. 此命令应仅用于用户恢复或解锁（两步验证无法成功情况下）。', + '如果您不想这么做, 情书用 CTRL+C 退出此操作。', + ], + '2fa_disabled' => '已成功禁用以下账户的两步验证： :email.', + ], + 'schedule' => [ + 'output_line' => '第一次任务已计划于 `:schedule` (:hash).', + ], + 'maintenance' => [ + 'deleting_service_backup' => '正在删除服务备份文件 :file.', + ], + 'server' => [ + 'rebuild_failed' => '重构操作 ":name" (#:id) ，位于节点 ":node" 失败，错误信息: :message', + 'power' => [ + 'confirm' => '您即将执行 :action 在 :count 个服务器. 是否继续？', + 'action_failed' => '电源命令 ":name" (#:id) 位于节点 ":node" 失败，错误信息: :message', + ], + ], + 'environment' => [ + 'mail' => [ + 'ask_smtp_host' => 'SMTP 主机 (e.g. smtp.google.com)', + 'ask_smtp_port' => 'SMTP 端口', + 'ask_smtp_username' => 'SMTP 用户名', + 'ask_smtp_password' => 'SMTP 密码', + 'ask_mailgun_domain' => 'Mailgun 域名', + 'ask_mailgun_secret' => 'Mailgun 密钥', + 'ask_mandrill_secret' => 'Mandrill 密钥', + 'ask_postmark_username' => 'Postmark API 密钥', + 'ask_driver' => '哪个引擎应该用于发送邮件?', + 'ask_mail_from' => 'Email来自哪个邮箱', + 'ask_mail_name' => 'Email应该由谁发送（发送者姓名）？', + 'ask_encryption' => '应该使用的加密方法', + ], + 'database' => [ + 'host_warning' => '极度推荐不使用localhost作为主机地址（可能有bug）. 如果确实要使用本机作为MySQL地址，请使用 "127.0.0.1".', + 'host' => '数据库主机', + 'port' => '数据库端口', + 'database' => '数据库名', + 'username_warning' => '使用 "root" 账户会导致安全漏洞, 翼龙面板不允许此账户作为面板数据库账户. 你应该为此程序创建MySQL庄户', + 'username' => '数据库用户名', + 'password_defined' => '您似乎已经指定了MySQL连接密码，你想更改它吗', + 'password' => '数据库密码', + 'connection_error' => '无法连接数据库. 返回错误： ":error".', + 'creds_not_saved' => '您的数据库访问信息未保存. 在继续之前您将需要提供有效的信息', + 'try_again' => '返回再试一次？', + ], + 'app' => [ + 'settings' => '启用基于UI的设置编辑器?', + 'author' => '管理模板作者Email', + 'author_help' => '提供此面板到处的管理模板作者的电子邮件地址. 这应该是一个合法的电子邮件地址', + 'app_url_help' => '这个应用的URL必须以 https:// or http:// 开头（取决于是否启用SSL）. 如果不包含这些您的电子邮件地址和其他内容可能会指向错误的地址.', + 'app_url' => '应用 URL', + 'timezone_help' => '设置的时区应该满足PHP支持的时区. 如果您不确定，请参阅 http://php.net/manual/en/timezones.php.', + 'timezone' => '应用时区', + 'cache_driver' => 'Cache Driver', + 'session_driver' => 'Session Driver', + 'queue_driver' => 'Queue Driver', + 'using_redis' => '如果您选择使用Redis, 请在下方提供有效的连接信息. 一般使用默认信息即可，除非您更改过设置.', + 'redis_host' => 'Redis 主机', + 'redis_password' => 'Redis 密码', + 'redis_pass_help' => '默认情况下，Redis数据库不需要密码，且仅运行于本地. 这种情况下，您什么都不用填.', + 'redis_port' => 'Redis 端口', + 'redis_pass_defined' => '似乎您已经设置过Redis密码了，您需要更改吗?', + ], + ], +]; diff --git a/resources/lang/cn/exceptions.php b/resources/lang/cn/exceptions.php new file mode 100644 index 000000000..4fd745aaf --- /dev/null +++ b/resources/lang/cn/exceptions.php @@ -0,0 +1,68 @@ + '连接受控端时发生意外 返回错误码 HTTP/:code response code. 此错误已被记录', + 'node' => [ + 'servers_attached' => '节点删除必须按先移除其所有的服务器.', + 'daemon_off_config_updated' => '受控端配置 已被更新, 但是自动更新受控端上的配置文件时发生错误. 你需要手动将配置文件 (core.json) 更新至受控端来完成更新.', + ], + 'allocations' => [ + 'server_using' => '一个服务器已分配该地址. 一个地址只有在无服务器使用时才能删除.', + 'too_many_ports' => '一次添加1000个以上的端口是不被支持的.', + 'invalid_mapping' => '提供的端口： :port 无效，无法继续操作.', + 'cidr_out_of_range' => 'CIDR 标记 只允许掩码在 /25 到 /32之间。', + 'port_out_of_range' => '端口超过范围，范围必须在 1024 到 65535 之间.', + ], + 'nest' => [ + 'delete_has_servers' => '活动服务器使用的管理模块不能被删除.', + 'egg' => [ + 'delete_has_servers' => '活动服务器使用的管理模板不能被删除.', + 'invalid_copy_id' => '管理模板复制的脚本ID无效.', + 'must_be_child' => ' "复制设置自"选项指定的目标必须是管理模块的附属.', + 'has_children' => '此管理模版附属有一个或多个管理模板. 在删除之前请先删除所有附属.', + ], + 'variables' => [ + 'env_not_unique' => '环境变量 :name 必须唯一.', + 'reserved_name' => '环境变量 :name 是被保护的，无法指定为变量.', + 'bad_validation_rule' => '环境变量规则 ":rule" 对于这个应用不是一个有效的规则.', + ], + 'importer' => [ + 'json_error' => '尝试导入JSON 文件时发生错误: :error.', + 'file_error' => '提供的JSON文件不合法.', + 'invalid_json_provided' => '提供的JSON文件格式不正确，无法被解析。', + ], + ], + 'packs' => [ + 'delete_has_servers' => '活动服务器使用的整合包不能被删除', + 'update_has_servers' => '当前有服务器附属于包时无法修改关联选项的ID.', + 'invalid_upload' => '上传的文件不合法.', + 'invalid_mime' => '上传的文件不符合要求的文件类型 :type', + 'unreadable' => '服务器无法打开该压缩包.', + 'zip_extraction' => '解压时发生错误.', + 'invalid_archive_exception' => '压缩包缺失archive.tar.gz 或 import.json 文件在根目录.', + ], + 'subusers' => [ + 'editing_self' => '编辑您自己的子用户时不被允许的.', + 'user_is_owner' => '子用户无法添加服主.', + 'subuser_exists' => '那个电子邮件的用户已经是此服务器的子用户了.', + ], + 'databases' => [ + 'delete_has_databases' => '无法删除一个拥有活跃数据库的数据库服务器.', + ], + 'tasks' => [ + 'chain_interval_too_long' => '链接任务的最大间隔时间为15分钟。', + ], + 'locations' => [ + 'has_nodes' => '活动节点附属的可用区无法被删除.', + ], + 'users' => [ + 'node_revocation_failed' => '吊销密钥失败 节点 #:node. :error', + ], + 'deployment' => [ + 'no_viable_nodes' => '没有合适的节点来自动部署服务器', + 'no_viable_allocations' => '没有合适的地址来自动部署服务器', + ], + 'api' => [ + 'resource_not_found' => '需求的资源未找到.', + ], +]; diff --git a/resources/lang/cn/navigation.php b/resources/lang/cn/navigation.php new file mode 100644 index 000000000..aebcd0fd0 --- /dev/null +++ b/resources/lang/cn/navigation.php @@ -0,0 +1,32 @@ + '主页', + 'account' => [ + 'header' => '账户管理', + 'my_account' => '我的账户', + 'security_controls' => '安全控制', + 'api_access' => 'API', + 'my_servers' => '我的服务器', + ], + 'server' => [ + 'header' => '服务器管理', + 'console' => '控制台', + 'console-pop' => '全屏控制台', + 'file_management' => '文件管理', + 'file_browser' => '文件浏览器', + 'create_file' => '新建文件', + 'upload_files' => '上传文件', + 'subusers' => '子用户', + 'schedules' => '计划任务', + 'configuration' => '配置', + 'port_allocations' => '地址设置', + 'sftp_settings' => 'SFTP 设置', + 'startup_parameters' => '启动参数', + 'databases' => '数据库', + 'edit_file' => '编辑文件', + 'admin_header' => '管理', + 'admin' => '服务器配置', + 'server_name' => '服务器名', + ], +]; diff --git a/resources/lang/cn/pagination.php b/resources/lang/cn/pagination.php new file mode 100644 index 000000000..67e361e02 --- /dev/null +++ b/resources/lang/cn/pagination.php @@ -0,0 +1,17 @@ + '« 上一步', + 'next' => '下一步 »', +]; diff --git a/resources/lang/cn/passwords.php b/resources/lang/cn/passwords.php new file mode 100644 index 000000000..3c471ae73 --- /dev/null +++ b/resources/lang/cn/passwords.php @@ -0,0 +1,19 @@ + '密码至少六位数，并且两次输入的密码一致.', + 'reset' => '您的密码已重设!', + 'sent' => '我们已发送密码重设电子邮件!', + 'token' => '此密码重设连接的令牌已过期.', + 'user' => '无法找到此Email的用户.', +]; diff --git a/resources/lang/cn/server.php b/resources/lang/cn/server.php new file mode 100644 index 000000000..296eb05c8 --- /dev/null +++ b/resources/lang/cn/server.php @@ -0,0 +1,330 @@ + [ + 'title' => '服务器状态 :name', + 'header' => '服务器控制台', + 'header_sub' => '实时控制您的服务器.', + ], + 'schedule' => [ + 'header' => '计划任务', + 'header_sub' => '在一处，轻松管理服务器任务.', + 'current' => '当前计划', + 'new' => [ + 'header' => '创建新任务', + 'header_sub' => '创建一个新的定时任务.', + 'submit' => '创建任务', + ], + 'manage' => [ + 'header' => '管理任务', + 'submit' => '修改任务', + 'delete' => '删除任务', + ], + 'task' => [ + 'time' => '在。。。之后', + 'action' => '执行操作', + 'payload' => '任务内容', + 'add_more' => '添加另一个任务', + ], + 'actions' => [ + 'command' => '发送命令', + 'power' => '电源命令', + ], + 'toggle' => '更改状态', + 'run_now' => '触发任务（现在）', + 'schedule_created' => '成功在服务器上创建一个计划任务.', + 'schedule_updated' => '任务已被更新.', + 'unnamed' => '未命名任务', + 'setup' => '任务创建', + 'day_of_week' => '星期', + 'day_of_month' => '日', + 'hour' => '小时', + 'minute' => '分钟', + 'time_help' => '任务系统在定义任务应该何时开始运行时支持使用Cronjob语法。 使用上面的字段指定何时应开始运行这些任务，或从多个选择菜单中选择选项。', + 'task_help' => '任务的时间与先前定义的任务相关。 每个计划任务可能分配的任务不超过5个，任务可能不会超过15分钟的时间安排。', + ], + 'tasks' => [ + 'task_created' => '成功在面板上创建一个新任务', + 'task_updated' => '任务成功被更新. 列表中的所有任务会被取消，并在下一次设定的时间运行.', + 'header' => '计划的任务', + 'header_sub' => '自动化你的服务器.', + 'current' => '当前计划的任务', + 'actions' => [ + 'command' => '发送命令', + 'power' => '发送电源命令', + ], + 'new_task' => '添加新任务', + 'toggle' => '更改状态', + 'new' => [ + 'header' => '新任务', + 'header_sub' => '为这个服务器创建一个新任务。', + 'task_name' => '任务名', + 'day_of_week' => '星期', + 'custom' => '自定义', + 'day_of_month' => '日', + 'hour' => '小时', + 'minute' => '分', + 'sun' => '周日', + 'mon' => '周一', + 'tues' => '周二', + 'wed' => '周三', + 'thurs' => '周四', + 'fri' => '周五', + 'sat' => '周六', + 'submit' => '创建任务', + 'type' => '任务类型', + 'chain_then' => '然后, 之后', + 'chain_do' => '执行', + 'chain_arguments' => '参数', + 'payload' => '任务内容', + 'payload_help' => '例如, 如果你选择 发送命令 ，就在此处填写要发送的命令. 如果您选择 发送电源命令 在这里填入电源命令 (e.g. restart).', + ], + 'edit' => [ + 'header' => '任务管理', + 'submit' => '更新任务', + ], + ], + 'users' => [ + 'header' => '用户管理', + 'header_sub' => '控制访问你服务器的用户.', + 'configure' => '配置权限', + 'list' => '有权限的用户列表', + 'add' => '添加一个新的子用户', + 'update' => '修改子用户', + 'user_assigned' => '成功连接到一个子用户连接到服务器.', + 'user_updated' => '成功更新权限.', + 'edit' => [ + 'header' => '编辑子用户', + 'header_sub' => '管理用户在此服务器的访问权限.', + ], + 'new' => [ + 'header' => '添加新用户', + 'header_sub' => '添加一个允许访问此服务器的用户.', + 'email' => 'Email 地址', + 'email_help' => '填入你希望邀请的协助您管理服务器的人的Email地址.', + 'power_header' => '电源管理', + 'file_header' => '文件管理', + 'subuser_header' => '子用户管理', + 'server_header' => '服务器管理', + 'task_header' => '计划任务管理', + 'database_header' => '数据库管理', + 'power_start' => [ + 'title' => '启动服务器', + 'description' => '允许该用户启动服务器.', + ], + 'power_stop' => [ + 'title' => '停止服务器', + 'description' => '允许该用户停止服务器.', + ], + 'power_restart' => [ + 'title' => '重新启动服务器', + 'description' => '允许该用户重新启动服务器', + ], + 'power_kill' => [ + 'title' => '强制结束服务器', + 'description' => '允许该用户强行关闭服务器', + ], + 'send_command' => [ + 'title' => '发送控制台命令', + 'description' => '允许用户发送控制台. 如果用户没有"停止服务器"权限，那么他无法使用stop命令', + ], + 'access_sftp' => [ + 'title' => 'SFTP 权限', + 'description' => '允许用户连接到受控端提供的SFTP服务器.', + ], + 'list_files' => [ + 'title' => '列出文件', + 'description' => '允许用户列出所有文件及文件夹列表，但是无权访问文件.', + ], + 'edit_files' => [ + 'title' => '编辑文件', + 'description' => '允许用户访问文件内容（但更改后无法保存）. SFTP 不受此权限影响.', + ], + 'save_files' => [ + 'title' => 'Save Files', + 'description' => '允许用户保存文件（和编辑文件权限联动）. SFTP 不受此权限影响.', + ], + 'move_files' => [ + 'title' => '重命名和移动文件', + 'description' => '允许用户在文件系统中重命名和移动文件及文件夹.', + ], + 'copy_files' => [ + 'title' => '复制文件', + 'description' => '允许用户在文件系统中复制文件及文件夹.', + ], + 'compress_files' => [ + 'title' => '压缩文件', + 'description' => '允许用户在文件系统中压缩文件及文件夹', + ], + 'decompress_files' => [ + 'title' => '解压文件', + 'description' => '允许用户解压 .zip 和 .tar(.gz) 压缩文件.', + ], + 'create_files' => [ + 'title' => '创建文件', + 'description' => '允许用户通过面板创建文件.', + ], + 'upload_files' => [ + 'title' => '上传文件', + 'description' => '允许用户通过文件管理上传文件.', + ], + 'delete_files' => [ + 'title' => '删除文件', + 'description' => '允许用户在文件系统中删除文件.', + ], + 'download_files' => [ + 'title' => '下载文件s', + 'description' => '允许用户下载文件. 如果为用户分配该权限，那么他将自动拥有下载和查看文件内容的权限.', + ], + 'list_subusers' => [ + 'title' => '列出子用户', + 'description' => '允许用户访问此服务器的子用户列表.', + ], + 'view_subuser' => [ + 'title' => '访问子用户', + 'description' => '允许用户查看子用户的权限.', + ], + 'edit_subuser' => [ + 'title' => '编辑子用户', + 'description' => '允许用户编辑此服务器上的子用户权限.', + ], + 'create_subuser' => [ + 'title' => '创建子用户', + 'description' => '允许用户在此服务器上添加子用户.', + ], + 'delete_subuser' => [ + 'title' => '删除子用户', + 'description' => '允许用户删除此服务器上的子用户.', + ], + 'view_allocations' => [ + 'title' => '访问分配表', + 'description' => '允许用户访问所有分配到此服务器上的IP和端口列表.', + ], + 'edit_allocation' => [ + 'title' => '编辑默认连接', + 'description' => '允许用户更改连接到此服务器的默认连接地址.', + ], + 'view_startup' => [ + 'title' => '访问启动参数', + 'description' => '允许用户访问服务器的启动参数和变量.', + ], + 'edit_startup' => [ + 'title' => '编辑启动参数', + 'description' => '允许用户更改服务器的启动参数和变量.', + ], + 'list_schedules' => [ + 'title' => '列出计划任务', + 'description' => '允许用户列出服务器上的所有计划任务 (无论是否启用) .', + ], + 'view_schedule' => [ + 'title' => '访问计划任务', + 'description' => '允许用户查看一个计划任务的具体信息，包括其执行的时间和命令.', + ], + 'toggle_schedule' => [ + 'title' => '开关计划任务', + 'description' => '允许用户更改计划任务的启用或禁用状态.', + ], + 'queue_schedule' => [ + 'title' => '队列化计划任务', + 'description' => '允许用户将一个计划任务队列，以便在下一个周期执行.', + ], + 'edit_schedule' => [ + 'title' => '编辑计划任务', + 'description' => '允许用户编辑计划任务. 此权限允许用户删除所有的执行任务，但无法删除计划任务本身.', + ], + 'create_schedule' => [ + 'title' => '创建计划任务', + 'description' => '允许用户创建一个计划任务.', + ], + 'delete_schedule' => [ + 'title' => '删除计划任务', + 'description' => '允许用户从服务器删除一个计划任务.', + ], + 'view_databases' => [ + 'title' => '访问数据库信息', + 'description' => '允许用户访问附属于此服务器的数据库信息，包含数据库的地址，用户名和密码', + ], + 'reset_db_password' => [ + 'title' => '重设数据库', + 'description' => '允许用户重新设置服务器数据库的密码.', + ], + 'delete_database' => [ + 'title' => '删除数据库', + 'description' => '允许用户从面板删除此服务器的数据库.', + ], + 'create_database' => [ + 'title' => '新建数据库', + 'description' => '允许用户为这个服务器创建一个数据库.', + ], + ], + ], + 'files' => [ + 'exceptions' => [ + 'invalid_mime' => '这种类型的文件无法使用面板内建编辑器编辑.', + 'max_size' => '此文件太大，无法使用面板内建编辑器编辑.', + ], + 'header' => '文件管理', + 'header_sub' => '从网页直接管理您所有的文件.', + 'loading' => '正在加载初始文件结构，这可能需要几秒钟.', + 'path' => '当你在配置任何插件或服务器设置的文件路径时 :path 应该为您的根目录. 此节点的网页上传最大文件限制为 :size.', + 'seconds_ago' => '几秒之前', + 'file_name' => '文件名', + 'size' => '大小', + 'last_modified' => '最后修改', + 'add_new' => '新建文件', + 'add_folder' => '新建文件夹', + 'mass_actions' => '更多操作', + 'delete' => '删除文件', + 'edit' => [ + 'header' => '编辑文件', + 'header_sub' => '从网页更改一个文件.', + 'save' => '保存文件', + 'return' => '返回文件管理', + ], + 'add' => [ + 'header' => '新建文件', + 'header_sub' => '在您服务器上创建一个新文件.', + 'name' => '文件名', + 'create' => '创建文件', + ], + ], + 'config' => [ + 'name' => [ + 'header' => '服务器名', + 'header_sub' => '更改您服务器的名称。', + 'details' => '此服务器名只是为了让你更好的管理服务器，并不会对服务器内的玩家有所影响.', + ], + 'startup' => [ + 'header' => '启动配置', + 'header_sub' => '控制服务器的启动参数.', + 'command' => '启动命令', + 'edit_params' => '编辑参数', + 'update' => '更新启动参数', + 'startup_regex' => '输入规则', + 'edited' => '启动参数已成功更新. 更新的内容会在下一次启动时生效.', + ], + 'sftp' => [ + 'header' => 'SFTP 配置', + 'header_sub' => 'SFTP 连接所需要的信息.', + 'details' => 'SFTP 信息', + 'conn_addr' => '连接地址', + 'warning' => 'SFTP密码就是您的用户密码. 请确认你使用的时SFTP，不是FTP,也不是FTPS, 这些都是不同的协议.', + ], + 'database' => [ + 'header' => '数据库', + 'header_sub' => '此服务器可用的数据库.', + 'your_dbs' => '已配置的数据库', + 'host' => 'MySQL 主机', + 'reset_password' => '重设密码', + 'no_dbs' => '没有此服务器可用的数据库.', + 'add_db' => '创建一个新数据库.', + ], + 'allocation' => [ + 'header' => '服务器连接信息', + 'header_sub' => '控制此服务器可用的IP和端口.', + 'available' => '可用的连接信息', + 'help' => '连接信息版主', + 'help_text' => '左边列出的所有IP和端口都是开放的，是您连接到您服务器的地址', + ], + ], +]; diff --git a/resources/lang/cn/strings.php b/resources/lang/cn/strings.php new file mode 100644 index 000000000..50bc70697 --- /dev/null +++ b/resources/lang/cn/strings.php @@ -0,0 +1,88 @@ + 'Email', + 'user_identifier' => '用户名 或 Email', + 'password' => '密码', + 'confirm_password' => '确认密码', + 'login' => '登陆', + 'home' => '主页', + 'servers' => '服务器', + 'id' => 'ID', + 'name' => '名称', + 'node' => '节点', + 'connection' => '连接', + 'memory' => '内存', + 'cpu' => 'CPU', + 'status' => '状态', + 'search' => '搜索', + 'suspended' => '已暂停', + 'account' => '用户', + 'security' => '安全', + 'ip' => 'IP 地址', + 'last_activity' => '上次活动', + 'revoke' => '吊销', + '2fa_token' => '认证密钥', + 'submit' => '确认', + 'close' => '关闭', + 'settings' => '设置', + 'configuration' => '配置', + 'sftp' => 'SFTP', + 'databases' => '数据库', + 'memo' => 'Memo', + 'created' => '已创建', + 'expires' => '过期', + 'public_key' => '令牌', + 'api_access' => 'Api 访问', + 'never' => '从未', + 'sign_out' => '登出', + 'admin_control' => '管理员面板', + 'required' => '需要', + 'port' => '端口', + 'username' => '用户名', + 'database' => '数据库', + 'new' => '新', + 'danger' => '危险', + 'create' => '创建', + 'select_all' => '全选', + 'select_none' => '反选', + 'alias' => '别名', + 'primary' => '主要', + 'make_primary' => '设置为主要', + 'none' => '无', + 'cancel' => '取消', + 'created_at' => '创建于', + 'action' => '操作', + 'data' => '数据', + 'queued' => '队列', + 'last_run' => '上次运行', + 'next_run' => '下次运行', + 'not_run_yet' => '从未允许', + 'yes' => '是', + 'no' => '否', + 'delete' => '删除', + '2fa' => '两步验证', + 'logout' => '登出', + 'admin_cp' => '管理员控制面板', + 'optional' => '可选的', + 'read_only' => '只读', + 'relation' => '关系', + 'owner' => '所有者', + 'admin' => '管理员', + 'subuser' => '子用户', + 'captcha_invalid' => '输入的验证码错误.', + 'tasks' => '任务', + 'seconds' => '秒', + 'minutes' => '分', + 'under_maintenance' => '维护中', + 'days' => [ + 'sun' => '周日', + 'mon' => '周一', + 'tues' => '周二', + 'wed' => '周三', + 'thurs' => '周四', + 'fri' => '周五', + 'sat' => '周六', + ], + 'last_used' => '上次使用', +]; diff --git a/resources/lang/cn/validation.php b/resources/lang/cn/validation.php new file mode 100644 index 000000000..932a39479 --- /dev/null +++ b/resources/lang/cn/validation.php @@ -0,0 +1,105 @@ + ' :attribute 被接受.', + 'active_url' => ' :attribute 不是一个有效的URL.', + 'after' => ' :attribute 必须是一个位于 :date 之后的日期.', + 'after_or_equal' => ' :attribute 必须是 :date 之后或同样的日期.', + 'alpha' => ' :attribute 只能含有字母.', + 'alpha_dash' => ':attribute 只能含有数字字母和分隔线.', + 'alpha_num' => ' :attribute 只能含有数字和字母.', + 'array' => ' :attribute 必须是个数组.', + 'before' => ' :attribute 必须是一个位于 :date 之前的日前.', + 'before_or_equal' => ' :attribute 必须是 :date 之前或同样的日期.', + 'between' => [ + 'numeric' => ' :attribute 必须在 :min 到 :max 之间.', + 'file' => ' :attribute 必须在 :min 到 :max KB 之间.', + 'string' => ' :attribute m必须在 :min 到 :max 个字符之间.', + 'array' => ' :attribute 必须在 :min 到 :max 个项目之间.', + ], + 'boolean' => ' :attribute 填入的必须为 true 或 false.', + 'confirmed' => ' :attribute 确认不匹配.', + 'date' => ' :attribute 不是一个合法的日期.', + 'date_format' => ' :attribute 不是正确的格式： :format.', + 'different' => ' :attribute 和 :other 必须不同.', + 'digits' => ' :attribute 必须为 :digits 个数字.', + 'digits_between' => ' :attribute 必须在 :min 到 :max 个数字间.', + 'dimensions' => ' :attribute 有一个非法的镜像大小.', + 'distinct' => ' :attribute 填入了一个重复的值.', + 'email' => ' :attribute 必须是一个合法的Email地址.', + 'exists' => '所选择的 :attribute 无效.', + 'file' => ' :attribute 必须为一个文件.', + 'filled' => ' :attribute 为必填项目.', + 'image' => ' :attribute 必须是一个镜像.', + 'in' => '所选择的 :attribute 无效.', + 'in_array' => ' :attribute 填入的信息在 :other 不存在.', + 'integer' => ' :attribute 必须是一个整数.', + 'ip' => ' :attribute 必须是一个合法的IP地址.', + 'json' => ' :attribute 必须是一个合法的JSON字符串.', + 'max' => [ + 'numeric' => ' :attribute 不能大于 :max.', + 'file' => ' :attribute 不能大于 :max KB.', + 'string' => ' :attribute 不能多于 :max 个字符.', + 'array' => ' :attribute 不能多于 :max 个项目.', + ], + 'mimes' => ' :attribute 文件类型必须为: :values.', + 'mimetypes' => ' :attribute 文件类型必须为: :values.', + 'min' => [ + 'numeric' => ' :attribute 至少应在 :min.', + 'file' => ' :attribute 至少应在 :min KB.', + 'string' => ' :attribute 至少应在 :min 个字符.', + 'array' => ' :attribute 至少应有 :min 个项目.', + ], + 'not_in' => '所选择的 :attribute 不正确.', + 'numeric' => ' :attribute 必须是个数字.', + 'present' => ' :attribute 填入的必须存在.', + 'regex' => ' :attribute 格式不正确.', + 'required' => ' :attribute 为必填.', + 'required_if' => ' :attribute 被要求填入， 当 :other 为 :value 的时候.', + 'required_unless' => ' :attribute 被要求填入，除非 :other 为 :values.', + 'required_with' => ' :attribute 被要求填入，当 :values 存在的时候.', + 'required_with_all' => ' :attribute 被要求填入，当 :values 存在.', + 'required_without' => ' :attribute 被要求填入，当 :values 不存在.', + 'required_without_all' => ' :attribute 被要求填入，当 :values 都不存在.', + 'same' => ' :attribute 和 :other 必须相同.', + 'size' => [ + 'numeric' => ' :attribute 必须为 :size.', + 'file' => ' :attribute 必须为 :size KB.', + 'string' => ' :attribute 必须为 :size 个字符.', + 'array' => ' :attribute 必须包含 :size 个项目.', + ], + 'string' => ' :attribute 必须为字符串.', + 'timezone' => ' :attribute 必须是一个有效的时区.', + 'unique' => ' :attribute 已经被使用.', + 'uploaded' => ' :attribute 上传失败.', + 'url' => ' :attribute 格式不合法.', + + /* + |-------------------------------------------------------------------------- + | Custom Validation Attributes + |-------------------------------------------------------------------------- + | + | The following language lines are used to swap attribute place-holders + | with something more reader friendly such as E-Mail Address instead + | of "email". This simply helps us make messages a little cleaner. + | + */ + + 'attributes' => [], + + // Internal validation logic for Pterodactyl + 'internal' => [ + 'variable_value' => ':env variable', + ], +]; From 24b213fbc6e90f3b1a6f3c79c1511325359700c0 Mon Sep 17 00:00:00 2001 From: mrkrabs Date: Mon, 13 Aug 2018 20:00:05 +0300 Subject: [PATCH 15/36] change smtp.google.com to smtp.gmail.com (#1281) --- resources/lang/cn/command/messages.php | 2 +- resources/lang/de/command/messages.php | 2 +- resources/lang/en/command/messages.php | 2 +- resources/lang/es/command/messages.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/lang/cn/command/messages.php b/resources/lang/cn/command/messages.php index 3ea2ed214..11081a7e9 100644 --- a/resources/lang/cn/command/messages.php +++ b/resources/lang/cn/command/messages.php @@ -49,7 +49,7 @@ return [ ], 'environment' => [ 'mail' => [ - 'ask_smtp_host' => 'SMTP 主机 (e.g. smtp.google.com)', + 'ask_smtp_host' => 'SMTP 主机 (e.g. smtp.gmail.com)', 'ask_smtp_port' => 'SMTP 端口', 'ask_smtp_username' => 'SMTP 用户名', 'ask_smtp_password' => 'SMTP 密码', diff --git a/resources/lang/de/command/messages.php b/resources/lang/de/command/messages.php index 142ba4742..e3733935f 100644 --- a/resources/lang/de/command/messages.php +++ b/resources/lang/de/command/messages.php @@ -40,7 +40,7 @@ return [ ], 'environment' => [ 'mail' => [ - 'ask_smtp_host' => 'SMTP Host (e.g. smtp.google.com)', + 'ask_smtp_host' => 'SMTP Host (e.g. smtp.gmail.com)', 'ask_smtp_port' => 'SMTP Port', 'ask_smtp_username' => 'SMTP Benutzername', 'ask_smtp_password' => 'SMTP Password', diff --git a/resources/lang/en/command/messages.php b/resources/lang/en/command/messages.php index 68d172896..8741fc424 100644 --- a/resources/lang/en/command/messages.php +++ b/resources/lang/en/command/messages.php @@ -49,7 +49,7 @@ return [ ], 'environment' => [ 'mail' => [ - 'ask_smtp_host' => 'SMTP Host (e.g. smtp.google.com)', + 'ask_smtp_host' => 'SMTP Host (e.g. smtp.gmail.com)', 'ask_smtp_port' => 'SMTP Port', 'ask_smtp_username' => 'SMTP Username', 'ask_smtp_password' => 'SMTP Password', diff --git a/resources/lang/es/command/messages.php b/resources/lang/es/command/messages.php index 6e8c3e95b..7fcc74578 100644 --- a/resources/lang/es/command/messages.php +++ b/resources/lang/es/command/messages.php @@ -47,7 +47,7 @@ return [ ], 'environment' => [ 'mail' => [ - 'ask_smtp_host' => 'Host SMTP (e.g. smtp.google.com)', + 'ask_smtp_host' => 'Host SMTP (e.g. smtp.gmail.com)', 'ask_smtp_port' => 'Puerto SMTP', 'ask_smtp_username' => 'El nombre de Usuario SMTP', 'ask_smtp_password' => 'Contraseña SMTP', From 1c6159f46bb5aedb2fac68046c2fda967ce9c904 Mon Sep 17 00:00:00 2001 From: Tom Chilvers <42012781+Silgica@users.noreply.github.com> Date: Thu, 23 Aug 2018 18:34:04 +0100 Subject: [PATCH 16/36] Typo (#1298) --- resources/themes/pterodactyl/admin/api/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/pterodactyl/admin/api/index.blade.php b/resources/themes/pterodactyl/admin/api/index.blade.php index 9abcc2003..7d82b3292 100644 --- a/resources/themes/pterodactyl/admin/api/index.blade.php +++ b/resources/themes/pterodactyl/admin/api/index.blade.php @@ -5,7 +5,7 @@ @endsection @section('content-header') -

Application APIControl access credentials for manging this Panel via the API.

+

Application APIControl access credentials for managing this Panel via the API.

  1. Admin
  2. Application API
    3. From 25454a98b8b70c8218083169bd53089c568c67f5 Mon Sep 17 00:00:00 2001 From: Tom Chilvers <42012781+Silgica@users.noreply.github.com> Date: Thu, 23 Aug 2018 18:34:27 +0100 Subject: [PATCH 17/36] changed link (#1299) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 41fb9cd23..1bc66ca2c 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ What more are you waiting for? Make game servers a first class citizen on your p ![Image](https://cdn.pterodactyl.io/site-assets/mockup-macbook-grey.png) ## Support & Documentation -Support for using Pterodactyl can be found on our [Documentation Website](https://docs.pterodactyl.io), [Guides Website](https://guides.pterodactyl.io), or via our [Discord Chat](https://discord.gg/QRDZvVm). +Support for using Pterodactyl can be found on our [Documentation Website](https://pterodactyl.io/project/introduction.html), [Guides Website](https://guides.pterodactyl.io), or via our [Discord Chat](https://discord.gg/QRDZvVm). ### Supported Games We support a huge variety of games by utilizing Docker containers to isolate each instance, giving you the power to host your games across the world without having to bloat each physical machine with additional dependencies. From f3efe546da470eebfdf292046b6c08f0d7a825ca Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Fri, 31 Aug 2018 20:34:57 -0700 Subject: [PATCH 18/36] Fix broken namespace for autoloader --- app/Http/Kernel.php | 2 +- app/Http/Middleware/Server/AccessingValidServer.php | 2 +- composer.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 5a5b9d2b4..85c1190ea 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -17,7 +17,6 @@ use Pterodactyl\Http\Middleware\LanguageMiddleware; use Illuminate\Foundation\Http\Kernel as HttpKernel; use Pterodactyl\Http\Middleware\Api\AuthenticateKey; use Illuminate\Routing\Middleware\SubstituteBindings; -use Pterodactyl\Http\Middleware\AccessingValidServer; use Pterodactyl\Http\Middleware\Api\SetSessionDriver; use Illuminate\Session\Middleware\AuthenticateSession; use Illuminate\View\Middleware\ShareErrorsFromSession; @@ -28,6 +27,7 @@ use Pterodactyl\Http\Middleware\Api\AuthenticateIPAccess; use Pterodactyl\Http\Middleware\Api\ApiSubstituteBindings; use Illuminate\Foundation\Http\Middleware\ValidatePostSize; use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse; +use Pterodactyl\Http\Middleware\Server\AccessingValidServer; use Pterodactyl\Http\Middleware\Server\AuthenticateAsSubuser; use Pterodactyl\Http\Middleware\Api\Daemon\DaemonAuthenticate; use Pterodactyl\Http\Middleware\Server\SubuserBelongsToServer; diff --git a/app/Http/Middleware/Server/AccessingValidServer.php b/app/Http/Middleware/Server/AccessingValidServer.php index ddca28251..ea29e0b99 100644 --- a/app/Http/Middleware/Server/AccessingValidServer.php +++ b/app/Http/Middleware/Server/AccessingValidServer.php @@ -1,6 +1,6 @@ Date: Fri, 31 Aug 2018 20:52:15 -0700 Subject: [PATCH 19/36] Drop carbon, use chronos --- .../Schedule/ProcessRunnableCommand.php | 21 ++++------------ .../Schedule/ProcessRunnableCommandTest.php | 24 ++++++------------- 2 files changed, 11 insertions(+), 34 deletions(-) diff --git a/app/Console/Commands/Schedule/ProcessRunnableCommand.php b/app/Console/Commands/Schedule/ProcessRunnableCommand.php index 88646c030..89e8fac8e 100644 --- a/app/Console/Commands/Schedule/ProcessRunnableCommand.php +++ b/app/Console/Commands/Schedule/ProcessRunnableCommand.php @@ -9,7 +9,7 @@ namespace Pterodactyl\Console\Commands\Schedule; -use Carbon\Carbon; +use Cake\Chronos\Chronos; use Illuminate\Console\Command; use Illuminate\Support\Collection; use Pterodactyl\Services\Schedules\ProcessScheduleService; @@ -17,11 +17,6 @@ use Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface; class ProcessRunnableCommand extends Command { - /** - * @var \Carbon\Carbon - */ - protected $carbon; - /** * @var string */ @@ -45,31 +40,23 @@ class ProcessRunnableCommand extends Command /** * ProcessRunnableCommand constructor. * - * @param \Carbon\Carbon $carbon * @param \Pterodactyl\Services\Schedules\ProcessScheduleService $processScheduleService * @param \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface $repository */ - public function __construct( - Carbon $carbon, - ProcessScheduleService $processScheduleService, - ScheduleRepositoryInterface $repository - ) { + public function __construct(ProcessScheduleService $processScheduleService, ScheduleRepositoryInterface $repository) + { parent::__construct(); - $this->carbon = $carbon; $this->processScheduleService = $processScheduleService; $this->repository = $repository; } /** * Handle command execution. - * - * @throws \Pterodactyl\Exceptions\Model\DataValidationException - * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException */ public function handle() { - $schedules = $this->repository->getSchedulesToProcess($this->carbon->now()->toAtomString()); + $schedules = $this->repository->getSchedulesToProcess(Chronos::now()->toAtomString()); $bar = $this->output->createProgressBar(count($schedules)); $schedules->each(function ($schedule) use ($bar) { diff --git a/tests/Unit/Commands/Schedule/ProcessRunnableCommandTest.php b/tests/Unit/Commands/Schedule/ProcessRunnableCommandTest.php index 24f53e4de..93ab0d1dd 100644 --- a/tests/Unit/Commands/Schedule/ProcessRunnableCommandTest.php +++ b/tests/Unit/Commands/Schedule/ProcessRunnableCommandTest.php @@ -10,7 +10,7 @@ namespace Tests\Unit\Commands\Schedule; use Mockery as m; -use Carbon\Carbon; +use Cake\Chronos\Chronos; use Pterodactyl\Models\Task; use Pterodactyl\Models\Schedule; use Tests\Unit\Commands\CommandTestCase; @@ -20,11 +20,6 @@ use Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface; class ProcessRunnableCommandTest extends CommandTestCase { - /** - * @var \Carbon\Carbon - */ - protected $carbon; - /** * @var \Pterodactyl\Console\Commands\Schedule\ProcessRunnableCommand */ @@ -47,11 +42,12 @@ class ProcessRunnableCommandTest extends CommandTestCase { parent::setUp(); - $this->carbon = m::mock(Carbon::class); + Chronos::setTestNow(Chronos::now()); + $this->processScheduleService = m::mock(ProcessScheduleService::class); $this->repository = m::mock(ScheduleRepositoryInterface::class); - $this->command = new ProcessRunnableCommand($this->carbon, $this->processScheduleService, $this->repository); + $this->command = new ProcessRunnableCommand($this->processScheduleService, $this->repository); } /** @@ -62,9 +58,7 @@ class ProcessRunnableCommandTest extends CommandTestCase $schedule = factory(Schedule::class)->make(); $schedule->tasks = collect([factory(Task::class)->make()]); - $this->carbon->shouldReceive('now')->withNoArgs()->once()->andReturnSelf() - ->shouldReceive('toAtomString')->withNoArgs()->once()->andReturn('00:00:00'); - $this->repository->shouldReceive('getSchedulesToProcess')->with('00:00:00')->once()->andReturn(collect([$schedule])); + $this->repository->shouldReceive('getSchedulesToProcess')->with(Chronos::now()->toAtomString())->once()->andReturn(collect([$schedule])); $this->processScheduleService->shouldReceive('handle')->with($schedule)->once()->andReturnNull(); $display = $this->runCommand($this->command); @@ -84,9 +78,7 @@ class ProcessRunnableCommandTest extends CommandTestCase $schedule = factory(Schedule::class)->make(); $schedule->tasks = collect([]); - $this->carbon->shouldReceive('now')->withNoArgs()->once()->andReturnSelf() - ->shouldReceive('toAtomString')->withNoArgs()->once()->andReturn('00:00:00'); - $this->repository->shouldReceive('getSchedulesToProcess')->with('00:00:00')->once()->andReturn(collect([$schedule])); + $this->repository->shouldReceive('getSchedulesToProcess')->with(Chronos::now()->toAtomString())->once()->andReturn(collect([$schedule])); $display = $this->runCommand($this->command); @@ -104,9 +96,7 @@ class ProcessRunnableCommandTest extends CommandTestCase { $schedule = factory(Schedule::class)->make(['tasks' => null]); - $this->carbon->shouldReceive('now')->withNoArgs()->once()->andReturnSelf() - ->shouldReceive('toAtomString')->withNoArgs()->once()->andReturn('00:00:00'); - $this->repository->shouldReceive('getSchedulesToProcess')->with('00:00:00')->once()->andReturn(collect([$schedule])); + $this->repository->shouldReceive('getSchedulesToProcess')->with(Chronos::now()->toAtomString())->once()->andReturn(collect([$schedule])); $display = $this->runCommand($this->command); From 178b8f8ce6cb66154cd7bc525bcc6d70dfcee3af Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Fri, 31 Aug 2018 21:00:13 -0700 Subject: [PATCH 20/36] More logical time handling --- .../Server/Tasks/ActionController.php | 14 ++++++++++++-- .../Schedules/ProcessScheduleService.php | 17 +++++++++-------- .../Schedules/ProcessScheduleServiceTest.php | 11 ++++++----- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/Server/Tasks/ActionController.php b/app/Http/Controllers/Server/Tasks/ActionController.php index 410d7c189..8d5a83bd7 100644 --- a/app/Http/Controllers/Server/Tasks/ActionController.php +++ b/app/Http/Controllers/Server/Tasks/ActionController.php @@ -2,7 +2,7 @@ namespace Pterodactyl\Http\Controllers\Server\Tasks; -use Carbon\Carbon; +use Cake\Chronos\Chronos; use Illuminate\Http\Request; use Illuminate\Http\Response; use Pterodactyl\Http\Controllers\Controller; @@ -11,12 +11,22 @@ use Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface; class ActionController extends Controller { + /** + * @var \Pterodactyl\Services\Schedules\ProcessScheduleService + */ private $processScheduleService; + /** * @var \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface */ private $repository; + /** + * ActionController constructor. + * + * @param \Pterodactyl\Services\Schedules\ProcessScheduleService $processScheduleService + * @param \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface $repository + */ public function __construct(ProcessScheduleService $processScheduleService, ScheduleRepositoryInterface $repository) { $this->processScheduleService = $processScheduleService; @@ -61,7 +71,7 @@ class ActionController extends Controller $server = $request->attributes->get('server'); $this->authorize('toggle-schedule', $server); - $this->processScheduleService->setRunTimeOverride(Carbon::now())->handle( + $this->processScheduleService->setRunTimeOverride(Chronos::now())->handle( $request->attributes->get('schedule') ); diff --git a/app/Services/Schedules/ProcessScheduleService.php b/app/Services/Schedules/ProcessScheduleService.php index b134caa35..8c157e39e 100644 --- a/app/Services/Schedules/ProcessScheduleService.php +++ b/app/Services/Schedules/ProcessScheduleService.php @@ -2,8 +2,9 @@ namespace Pterodactyl\Services\Schedules; -use Carbon\Carbon; +use DateTimeInterface; use Cron\CronExpression; +use Cake\Chronos\Chronos; use Pterodactyl\Models\Schedule; use Pterodactyl\Services\Schedules\Tasks\RunTaskService; use Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface; @@ -21,7 +22,7 @@ class ProcessScheduleService private $runnerService; /** - * @var \Carbon\Carbon|null + * @var \DateTimeInterface|null */ private $runTimeOverride; @@ -41,10 +42,10 @@ class ProcessScheduleService * Set the time that this schedule should be run at. This will override the time * defined on the schedule itself. Useful for triggering one-off task runs. * - * @param \Carbon\Carbon $time + * @param \DateTimeInterface $time * @return $this */ - public function setRunTimeOverride(Carbon $time) + public function setRunTimeOverride(DateTimeInterface $time) { $this->runTimeOverride = $time; @@ -83,14 +84,14 @@ class ProcessScheduleService * Get the timestamp to store in the database as the next_run time for a schedule. * * @param string $formatted - * @return \DateTime|string + * @return string */ private function getRunAtTime(string $formatted) { - if ($this->runTimeOverride instanceof Carbon) { - return $this->runTimeOverride->toDateTimeString(); + if (! is_null($this->runTimeOverride)) { + return $this->runTimeOverride->format(Chronos::ATOM); } - return CronExpression::factory($formatted)->getNextRunDate(); + return CronExpression::factory($formatted)->getNextRunDate()->format(Chronos::ATOM); } } diff --git a/tests/Unit/Services/Schedules/ProcessScheduleServiceTest.php b/tests/Unit/Services/Schedules/ProcessScheduleServiceTest.php index 27e20082a..92f7c3960 100644 --- a/tests/Unit/Services/Schedules/ProcessScheduleServiceTest.php +++ b/tests/Unit/Services/Schedules/ProcessScheduleServiceTest.php @@ -3,9 +3,9 @@ namespace Tests\Unit\Services\Schedules; use Mockery as m; -use Carbon\Carbon; use Tests\TestCase; use Cron\CronExpression; +use Cake\Chronos\Chronos; use Pterodactyl\Models\Task; use Pterodactyl\Models\Schedule; use Pterodactyl\Services\Schedules\Tasks\RunTaskService; @@ -40,7 +40,8 @@ class ProcessScheduleServiceTest extends TestCase public function setUp() { parent::setUp(); - Carbon::setTestNow(Carbon::now()); + + Chronos::setTestNow(Chronos::now()); $this->repository = m::mock(ScheduleRepositoryInterface::class); $this->runnerService = m::mock(RunTaskService::class); @@ -63,7 +64,7 @@ class ProcessScheduleServiceTest extends TestCase $formatted = sprintf('%s %s %s * %s', $model->cron_minute, $model->cron_hour, $model->cron_day_of_month, $model->cron_day_of_week); $this->repository->shouldReceive('update')->with($model->id, [ 'is_processing' => true, - 'next_run_at' => CronExpression::factory($formatted)->getNextRunDate(), + 'next_run_at' => CronExpression::factory($formatted)->getNextRunDate()->format(Chronos::ATOM), ]); $this->runnerService->shouldReceive('handle')->with($task)->once()->andReturnNull(); @@ -83,12 +84,12 @@ class ProcessScheduleServiceTest extends TestCase $this->repository->shouldReceive('update')->with($model->id, [ 'is_processing' => true, - 'next_run_at' => Carbon::now()->addSeconds(15)->toDateTimeString(), + 'next_run_at' => Chronos::now()->addSeconds(15)->toAtomString(), ]); $this->runnerService->shouldReceive('handle')->with($task)->once()->andReturnNull(); - $this->service->setRunTimeOverride(Carbon::now()->addSeconds(15))->handle($model); + $this->service->setRunTimeOverride(Chronos::now()->addSeconds(15))->handle($model); $this->assertTrue(true); } } From bcb3f5d5fae7b566fded8dc7d0bf085e6b4cfbf3 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Fri, 31 Aug 2018 21:12:10 -0700 Subject: [PATCH 21/36] Fix handling of times --- app/Services/Schedules/ProcessScheduleService.php | 9 +++++---- .../Services/Schedules/ProcessScheduleServiceTest.php | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/Services/Schedules/ProcessScheduleService.php b/app/Services/Schedules/ProcessScheduleService.php index 8c157e39e..c83ad5104 100644 --- a/app/Services/Schedules/ProcessScheduleService.php +++ b/app/Services/Schedules/ProcessScheduleService.php @@ -6,6 +6,7 @@ use DateTimeInterface; use Cron\CronExpression; use Cake\Chronos\Chronos; use Pterodactyl\Models\Schedule; +use Cake\Chronos\ChronosInterface; use Pterodactyl\Services\Schedules\Tasks\RunTaskService; use Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface; @@ -84,14 +85,14 @@ class ProcessScheduleService * Get the timestamp to store in the database as the next_run time for a schedule. * * @param string $formatted - * @return string + * @return \Cake\Chronos\ChronosInterface */ - private function getRunAtTime(string $formatted) + private function getRunAtTime(string $formatted): ChronosInterface { if (! is_null($this->runTimeOverride)) { - return $this->runTimeOverride->format(Chronos::ATOM); + return $this->runTimeOverride instanceof ChronosInterface ? $this->runTimeOverride : Chronos::instance($this->runTimeOverride); } - return CronExpression::factory($formatted)->getNextRunDate()->format(Chronos::ATOM); + return Chronos::instance(CronExpression::factory($formatted)->getNextRunDate()); } } diff --git a/tests/Unit/Services/Schedules/ProcessScheduleServiceTest.php b/tests/Unit/Services/Schedules/ProcessScheduleServiceTest.php index 92f7c3960..5f35187da 100644 --- a/tests/Unit/Services/Schedules/ProcessScheduleServiceTest.php +++ b/tests/Unit/Services/Schedules/ProcessScheduleServiceTest.php @@ -64,7 +64,7 @@ class ProcessScheduleServiceTest extends TestCase $formatted = sprintf('%s %s %s * %s', $model->cron_minute, $model->cron_hour, $model->cron_day_of_month, $model->cron_day_of_week); $this->repository->shouldReceive('update')->with($model->id, [ 'is_processing' => true, - 'next_run_at' => CronExpression::factory($formatted)->getNextRunDate()->format(Chronos::ATOM), + 'next_run_at' => Chronos::parse(CronExpression::factory($formatted)->getNextRunDate()->format(Chronos::ATOM)), ]); $this->runnerService->shouldReceive('handle')->with($task)->once()->andReturnNull(); @@ -84,7 +84,7 @@ class ProcessScheduleServiceTest extends TestCase $this->repository->shouldReceive('update')->with($model->id, [ 'is_processing' => true, - 'next_run_at' => Chronos::now()->addSeconds(15)->toAtomString(), + 'next_run_at' => Chronos::now()->addSeconds(15), ]); $this->runnerService->shouldReceive('handle')->with($task)->once()->andReturnNull(); From a7943553d33651c2f40f8b081e11defe3f6138c6 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Mon, 3 Sep 2018 14:04:16 -0700 Subject: [PATCH 22/36] Fix namespacing --- tests/Unit/Http/Middleware/Server/AccessingValidServerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Unit/Http/Middleware/Server/AccessingValidServerTest.php b/tests/Unit/Http/Middleware/Server/AccessingValidServerTest.php index 8bafebe9f..bbc410f71 100644 --- a/tests/Unit/Http/Middleware/Server/AccessingValidServerTest.php +++ b/tests/Unit/Http/Middleware/Server/AccessingValidServerTest.php @@ -8,7 +8,7 @@ use Illuminate\Contracts\Session\Session; use Illuminate\Contracts\Config\Repository; use Illuminate\Contracts\Routing\ResponseFactory; use Tests\Unit\Http\Middleware\MiddlewareTestCase; -use Pterodactyl\Http\Middleware\AccessingValidServer; +use Pterodactyl\Http\Middleware\Server\AccessingValidServer; use Pterodactyl\Contracts\Repository\ServerRepositoryInterface; class AccessingValidServerTest extends MiddlewareTestCase From 413a22a3d5c3213c068de6aac356a6edb74f0b8c Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Mon, 3 Sep 2018 14:04:25 -0700 Subject: [PATCH 23/36] Changes to job running to clean up code --- app/Jobs/Schedule/RunTaskJob.php | 4 +- .../Schedules/ProcessScheduleService.php | 54 +++++++---- .../Schedules/Tasks/RunTaskService.php | 53 ----------- tests/Unit/Jobs/Schedule/RunTaskJobTest.php | 10 +-- .../Schedules/ProcessScheduleServiceTest.php | 66 +++++++++----- .../Schedules/Tasks/RunTaskServiceTest.php | 90 ------------------- 6 files changed, 85 insertions(+), 192 deletions(-) delete mode 100644 app/Services/Schedules/Tasks/RunTaskService.php delete mode 100644 tests/Unit/Services/Schedules/Tasks/RunTaskServiceTest.php diff --git a/app/Jobs/Schedule/RunTaskJob.php b/app/Jobs/Schedule/RunTaskJob.php index a7fd8486b..7f206ec8f 100644 --- a/app/Jobs/Schedule/RunTaskJob.php +++ b/app/Jobs/Schedule/RunTaskJob.php @@ -3,7 +3,7 @@ namespace Pterodactyl\Jobs\Schedule; use Exception; -use Carbon\Carbon; +use Cake\Chronos\Chronos; use Pterodactyl\Jobs\Job; use InvalidArgumentException; use Illuminate\Queue\SerializesModels; @@ -158,7 +158,7 @@ class RunTaskJob extends Job implements ShouldQueue $repository = app()->make(ScheduleRepositoryInterface::class); $repository->withoutFreshModel()->update($this->schedule, [ 'is_processing' => false, - 'last_run_at' => Carbon::now()->toDateTimeString(), + 'last_run_at' => Chronos::now()->toDateTimeString(), ]); } diff --git a/app/Services/Schedules/ProcessScheduleService.php b/app/Services/Schedules/ProcessScheduleService.php index c83ad5104..07275950c 100644 --- a/app/Services/Schedules/ProcessScheduleService.php +++ b/app/Services/Schedules/ProcessScheduleService.php @@ -7,36 +7,48 @@ use Cron\CronExpression; use Cake\Chronos\Chronos; use Pterodactyl\Models\Schedule; use Cake\Chronos\ChronosInterface; -use Pterodactyl\Services\Schedules\Tasks\RunTaskService; +use Illuminate\Contracts\Bus\Dispatcher; +use Pterodactyl\Jobs\Schedule\RunTaskJob; +use Pterodactyl\Contracts\Repository\TaskRepositoryInterface; use Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface; class ProcessScheduleService { /** - * @var \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface + * @var \Illuminate\Contracts\Bus\Dispatcher */ - private $repository; - - /** - * @var \Pterodactyl\Services\Schedules\Tasks\RunTaskService - */ - private $runnerService; + private $dispatcher; /** * @var \DateTimeInterface|null */ private $runTimeOverride; + /** + * @var \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface + */ + private $scheduleRepository; + + /** + * @var \Pterodactyl\Contracts\Repository\TaskRepositoryInterface + */ + private $taskRepository; + /** * ProcessScheduleService constructor. * - * @param \Pterodactyl\Services\Schedules\Tasks\RunTaskService $runnerService - * @param \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface $repository + * @param \Illuminate\Contracts\Bus\Dispatcher $dispatcher + * @param \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface $scheduleRepository + * @param \Pterodactyl\Contracts\Repository\TaskRepositoryInterface $taskRepository */ - public function __construct(RunTaskService $runnerService, ScheduleRepositoryInterface $repository) - { - $this->repository = $repository; - $this->runnerService = $runnerService; + public function __construct( + Dispatcher $dispatcher, + ScheduleRepositoryInterface $scheduleRepository, + TaskRepositoryInterface $taskRepository + ) { + $this->dispatcher = $dispatcher; + $this->scheduleRepository = $scheduleRepository; + $this->taskRepository = $taskRepository; } /** @@ -63,7 +75,10 @@ class ProcessScheduleService */ public function handle(Schedule $schedule) { - $this->repository->loadTasks($schedule); + $this->scheduleRepository->loadTasks($schedule); + + /** @var \Pterodactyl\Models\Task $task */ + $task = $schedule->getRelation('tasks')->where('sequence_id', 1)->first(); $formattedCron = sprintf('%s %s %s * %s', $schedule->cron_minute, @@ -72,13 +87,16 @@ class ProcessScheduleService $schedule->cron_day_of_week ); - $this->repository->update($schedule->id, [ + $this->scheduleRepository->update($schedule->id, [ 'is_processing' => true, 'next_run_at' => $this->getRunAtTime($formattedCron), ]); - $task = $schedule->getRelation('tasks')->where('sequence_id', 1)->first(); - $this->runnerService->handle($task); + $this->taskRepository->update($task->id, ['is_queued' => true]); + + $this->dispatcher->dispatch( + (new RunTaskJob($task->id, $schedule->id))->delay($task->time_offset) + ); } /** diff --git a/app/Services/Schedules/Tasks/RunTaskService.php b/app/Services/Schedules/Tasks/RunTaskService.php deleted file mode 100644 index 5d83db077..000000000 --- a/app/Services/Schedules/Tasks/RunTaskService.php +++ /dev/null @@ -1,53 +0,0 @@ -. - * - * This software is licensed under the terms of the MIT license. - * https://opensource.org/licenses/MIT - */ - -namespace Pterodactyl\Services\Schedules\Tasks; - -use Pterodactyl\Models\Task; -use Pterodactyl\Jobs\Schedule\RunTaskJob; -use Illuminate\Foundation\Bus\DispatchesJobs; -use Pterodactyl\Contracts\Repository\TaskRepositoryInterface; - -class RunTaskService -{ - use DispatchesJobs; - - /** - * @var \Pterodactyl\Contracts\Repository\TaskRepositoryInterface - */ - protected $repository; - - /** - * RunTaskService constructor. - * - * @param \Pterodactyl\Contracts\Repository\TaskRepositoryInterface $repository - */ - public function __construct(TaskRepositoryInterface $repository) - { - $this->repository = $repository; - } - - /** - * Push a single task onto the queue. - * - * @param int|\Pterodactyl\Models\Task $task - * - * @throws \Pterodactyl\Exceptions\Model\DataValidationException - * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException - */ - public function handle($task) - { - if (! $task instanceof Task) { - $task = $this->repository->find($task); - } - - $this->repository->update($task->id, ['is_queued' => true]); - $this->dispatch((new RunTaskJob($task->id, $task->schedule_id))->delay($task->time_offset)); - } -} diff --git a/tests/Unit/Jobs/Schedule/RunTaskJobTest.php b/tests/Unit/Jobs/Schedule/RunTaskJobTest.php index 1c6ce81bf..c4d116739 100644 --- a/tests/Unit/Jobs/Schedule/RunTaskJobTest.php +++ b/tests/Unit/Jobs/Schedule/RunTaskJobTest.php @@ -3,8 +3,8 @@ namespace Tests\Unit\Jobs\Schedule; use Mockery as m; -use Carbon\Carbon; use Tests\TestCase; +use Cake\Chronos\Chronos; use Pterodactyl\Models\Task; use Pterodactyl\Models\User; use GuzzleHttp\Psr7\Response; @@ -58,7 +58,7 @@ class RunTaskJobTest extends TestCase { parent::setUp(); Bus::fake(); - Carbon::setTestNow(Carbon::now()); + Chronos::setTestNow(Chronos::now()); $this->commandRepository = m::mock(CommandRepositoryInterface::class); $this->config = m::mock(Repository::class); @@ -94,7 +94,7 @@ class RunTaskJobTest extends TestCase $this->scheduleRepository->shouldReceive('withoutFreshModel->update')->with($schedule->id, [ 'is_processing' => false, - 'last_run_at' => Carbon::now()->toDateTimeString(), + 'last_run_at' => Chronos::now()->toDateTimeString(), ])->once()->andReturnNull(); $this->getJobInstance($task->id, $schedule->id); @@ -124,7 +124,7 @@ class RunTaskJobTest extends TestCase $this->scheduleRepository->shouldReceive('withoutFreshModel->update')->with($schedule->id, [ 'is_processing' => false, - 'last_run_at' => Carbon::now()->toDateTimeString(), + 'last_run_at' => Chronos::now()->toDateTimeString(), ])->once()->andReturnNull(); $this->getJobInstance($task->id, $schedule->id); @@ -202,7 +202,7 @@ class RunTaskJobTest extends TestCase $this->scheduleRepository->shouldReceive('withoutFreshModel->update')->with($schedule->id, [ 'is_processing' => false, - 'last_run_at' => Carbon::now()->toDateTimeString(), + 'last_run_at' => Chronos::now()->toDateTimeString(), ])->once()->andReturn(1); $this->taskRepository->shouldReceive('update')->with($task->id, ['is_queued' => false])->once()->andReturn(1); diff --git a/tests/Unit/Services/Schedules/ProcessScheduleServiceTest.php b/tests/Unit/Services/Schedules/ProcessScheduleServiceTest.php index 5f35187da..febde488e 100644 --- a/tests/Unit/Services/Schedules/ProcessScheduleServiceTest.php +++ b/tests/Unit/Services/Schedules/ProcessScheduleServiceTest.php @@ -8,31 +8,28 @@ use Cron\CronExpression; use Cake\Chronos\Chronos; use Pterodactyl\Models\Task; use Pterodactyl\Models\Schedule; -use Pterodactyl\Services\Schedules\Tasks\RunTaskService; +use Illuminate\Contracts\Bus\Dispatcher; +use Pterodactyl\Jobs\Schedule\RunTaskJob; use Pterodactyl\Services\Schedules\ProcessScheduleService; +use Pterodactyl\Contracts\Repository\TaskRepositoryInterface; use Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface; class ProcessScheduleServiceTest extends TestCase { /** - * @var \Cron\CronExpression|\Mockery\Mock + * @var \Illuminate\Contracts\Bus\Dispatcher|\Mockery\Mock */ - protected $cron; + private $dispatcher; /** * @var \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface|\Mockery\Mock */ - protected $repository; + private $scheduleRepository; /** - * @var \Pterodactyl\Services\Schedules\Tasks\RunTaskService|\Mockery\Mock + * @var \Pterodactyl\Contracts\Repository\TaskRepositoryInterface|\Mockery\Mock */ - protected $runnerService; - - /** - * @var \Pterodactyl\Services\Schedules\ProcessScheduleService - */ - protected $service; + private $taskRepository; /** * Setup tests. @@ -42,11 +39,9 @@ class ProcessScheduleServiceTest extends TestCase parent::setUp(); Chronos::setTestNow(Chronos::now()); - - $this->repository = m::mock(ScheduleRepositoryInterface::class); - $this->runnerService = m::mock(RunTaskService::class); - - $this->service = new ProcessScheduleService($this->runnerService, $this->repository); + $this->dispatcher = m::mock(Dispatcher::class); + $this->scheduleRepository = m::mock(ScheduleRepositoryInterface::class); + $this->taskRepository = m::mock(TaskRepositoryInterface::class); } /** @@ -59,17 +54,26 @@ class ProcessScheduleServiceTest extends TestCase 'sequence_id' => 1, ])])); - $this->repository->shouldReceive('loadTasks')->with($model)->once()->andReturn($model); + $this->scheduleRepository->shouldReceive('loadTasks')->with($model)->once()->andReturn($model); $formatted = sprintf('%s %s %s * %s', $model->cron_minute, $model->cron_hour, $model->cron_day_of_month, $model->cron_day_of_week); - $this->repository->shouldReceive('update')->with($model->id, [ + $this->scheduleRepository->shouldReceive('update')->with($model->id, [ 'is_processing' => true, 'next_run_at' => Chronos::parse(CronExpression::factory($formatted)->getNextRunDate()->format(Chronos::ATOM)), ]); - $this->runnerService->shouldReceive('handle')->with($task)->once()->andReturnNull(); + $this->taskRepository->shouldReceive('update')->with($task->id, ['is_queued' => true])->once(); - $this->service->handle($model); + $this->dispatcher->shouldReceive('dispatch')->with(m::on(function ($class) use ($model, $task) { + $this->assertInstanceOf(RunTaskJob::class, $class); + $this->assertSame($task->time_offset, $class->delay); + $this->assertSame($task->id, $class->task); + $this->assertSame($model->id, $class->schedule); + + return true; + }))->once(); + + $this->getService()->handle($model); $this->assertTrue(true); } @@ -80,16 +84,30 @@ class ProcessScheduleServiceTest extends TestCase 'sequence_id' => 1, ])])); - $this->repository->shouldReceive('loadTasks')->with($model)->once()->andReturn($model); + $this->scheduleRepository->shouldReceive('loadTasks')->with($model)->once()->andReturn($model); - $this->repository->shouldReceive('update')->with($model->id, [ + $this->scheduleRepository->shouldReceive('update')->with($model->id, [ 'is_processing' => true, 'next_run_at' => Chronos::now()->addSeconds(15), ]); - $this->runnerService->shouldReceive('handle')->with($task)->once()->andReturnNull(); + $this->taskRepository->shouldReceive('update')->with($task->id, ['is_queued' => true])->once(); - $this->service->setRunTimeOverride(Chronos::now()->addSeconds(15))->handle($model); + $this->dispatcher->shouldReceive('dispatch')->with(m::on(function ($class) use ($model, $task) { + $this->assertInstanceOf(RunTaskJob::class, $class); + $this->assertSame($task->time_offset, $class->delay); + $this->assertSame($task->id, $class->task); + $this->assertSame($model->id, $class->schedule); + + return true; + }))->once(); + + $this->getService()->setRunTimeOverride(Chronos::now()->addSeconds(15))->handle($model); $this->assertTrue(true); } + + private function getService(): ProcessScheduleService + { + return new ProcessScheduleService($this->dispatcher, $this->scheduleRepository, $this->taskRepository); + } } diff --git a/tests/Unit/Services/Schedules/Tasks/RunTaskServiceTest.php b/tests/Unit/Services/Schedules/Tasks/RunTaskServiceTest.php deleted file mode 100644 index 3ca7cc1da..000000000 --- a/tests/Unit/Services/Schedules/Tasks/RunTaskServiceTest.php +++ /dev/null @@ -1,90 +0,0 @@ -. - * - * This software is licensed under the terms of the MIT license. - * https://opensource.org/licenses/MIT - */ - -namespace Tests\Unit\Services\Schedules\Tasks; - -use Mockery as m; -use Tests\TestCase; -use Pterodactyl\Models\Task; -use Illuminate\Support\Facades\Bus; -use Pterodactyl\Jobs\Schedule\RunTaskJob; -use Pterodactyl\Services\Schedules\Tasks\RunTaskService; -use Pterodactyl\Contracts\Repository\TaskRepositoryInterface; - -class RunTaskServiceTest extends TestCase -{ - /** - * @var \Illuminate\Contracts\Bus\Dispatcher|\Mockery\Mock - */ - protected $dispatcher; - - /** - * @var \Pterodactyl\Contracts\Repository\TaskRepositoryInterface|\Mockery\Mock - */ - protected $repository; - - /** - * @var \Pterodactyl\Services\Schedules\Tasks\RunTaskService - */ - protected $service; - - /** - * Setup tests. - */ - public function setUp() - { - parent::setUp(); - - Bus::fake(); - $this->repository = m::mock(TaskRepositoryInterface::class); - - $this->service = new RunTaskService($this->repository); - } - - /** - * Test that a job is dispatched. - */ - public function testTaskIsDispatched() - { - $task = factory(Task::class)->make(); - - $this->repository->shouldReceive('update')->with($task->id, ['is_queued' => true])->once()->andReturnNull(); - - $this->service->handle($task); - - Bus::assertDispatched(RunTaskJob::class, function ($job) use ($task) { - $this->assertEquals($task->id, $job->task, 'Assert job task matches parent task model.'); - $this->assertEquals($task->schedule_id, $job->schedule, 'Assert job is linked to correct schedule.'); - $this->assertEquals($task->time_offset, $job->delay, 'Assert job delay is set correctly to match task.'); - - return true; - }); - } - - /** - * Test that passing an ID in place of a model works. - */ - public function testIdCanBePassedInPlaceOfModel() - { - $task = factory(Task::class)->make(); - - $this->repository->shouldReceive('find')->with($task->id)->once()->andReturn($task); - $this->repository->shouldReceive('update')->with($task->id, ['is_queued' => true])->once()->andReturnNull(); - - $this->service->handle($task->id); - - Bus::assertDispatched(RunTaskJob::class, function ($job) use ($task) { - $this->assertEquals($task->id, $job->task, 'Assert job task matches parent task model.'); - $this->assertEquals($task->schedule_id, $job->schedule, 'Assert job is linked to correct schedule.'); - $this->assertEquals($task->time_offset, $job->delay, 'Assert job delay is set correctly to match task.'); - - return true; - }); - } -} From 5bd3f59455425458ceaf5bb625ba50dd8c707079 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Mon, 3 Sep 2018 14:32:33 -0700 Subject: [PATCH 24/36] Fix schedules running twice, closes #1288 --- CHANGELOG.md | 4 ++ .../Schedule/ProcessRunnableCommand.php | 5 +++ .../Server/Tasks/ActionController.php | 3 +- .../Eloquent/ScheduleRepository.php | 1 + .../Schedules/ProcessScheduleService.php | 39 +------------------ .../Schedules/ProcessScheduleServiceTest.php | 38 +++--------------- 6 files changed, 18 insertions(+), 72 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab0365a17..d6f9a3a1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ This file is a running track of new features and fixes to each version of the pa This project follows [Semantic Versioning](http://semver.org) guidelines. +## v0.7.10 (Derelict Dermodactylus) +### Fixed +* Scheduled tasks triggered manually no longer improperly change the `next_run_at` time and do not run twice in a row anymore. + ## v0.7.9 (Derelict Dermodactylus) ### Fixed * Fixes a two-factor authentication bypass present in the password reset process for an account. diff --git a/app/Console/Commands/Schedule/ProcessRunnableCommand.php b/app/Console/Commands/Schedule/ProcessRunnableCommand.php index 89e8fac8e..e5a40fb43 100644 --- a/app/Console/Commands/Schedule/ProcessRunnableCommand.php +++ b/app/Console/Commands/Schedule/ProcessRunnableCommand.php @@ -57,6 +57,11 @@ class ProcessRunnableCommand extends Command public function handle() { $schedules = $this->repository->getSchedulesToProcess(Chronos::now()->toAtomString()); + if ($schedules->count() < 1) { + $this->line('There are no scheduled tasks for servers that need to be run.'); + + return; + } $bar = $this->output->createProgressBar(count($schedules)); $schedules->each(function ($schedule) use ($bar) { diff --git a/app/Http/Controllers/Server/Tasks/ActionController.php b/app/Http/Controllers/Server/Tasks/ActionController.php index 8d5a83bd7..498db8537 100644 --- a/app/Http/Controllers/Server/Tasks/ActionController.php +++ b/app/Http/Controllers/Server/Tasks/ActionController.php @@ -2,7 +2,6 @@ namespace Pterodactyl\Http\Controllers\Server\Tasks; -use Cake\Chronos\Chronos; use Illuminate\Http\Request; use Illuminate\Http\Response; use Pterodactyl\Http\Controllers\Controller; @@ -71,7 +70,7 @@ class ActionController extends Controller $server = $request->attributes->get('server'); $this->authorize('toggle-schedule', $server); - $this->processScheduleService->setRunTimeOverride(Chronos::now())->handle( + $this->processScheduleService->handle( $request->attributes->get('schedule') ); diff --git a/app/Repositories/Eloquent/ScheduleRepository.php b/app/Repositories/Eloquent/ScheduleRepository.php index a7b53602b..1d2dda244 100644 --- a/app/Repositories/Eloquent/ScheduleRepository.php +++ b/app/Repositories/Eloquent/ScheduleRepository.php @@ -75,6 +75,7 @@ class ScheduleRepository extends EloquentRepository implements ScheduleRepositor { return $this->getBuilder()->with('tasks') ->where('is_active', true) + ->where('is_processing', false) ->where('next_run_at', '<=', $timestamp) ->get($this->getColumns()); } diff --git a/app/Services/Schedules/ProcessScheduleService.php b/app/Services/Schedules/ProcessScheduleService.php index 07275950c..4ada2aee8 100644 --- a/app/Services/Schedules/ProcessScheduleService.php +++ b/app/Services/Schedules/ProcessScheduleService.php @@ -2,11 +2,8 @@ namespace Pterodactyl\Services\Schedules; -use DateTimeInterface; use Cron\CronExpression; -use Cake\Chronos\Chronos; use Pterodactyl\Models\Schedule; -use Cake\Chronos\ChronosInterface; use Illuminate\Contracts\Bus\Dispatcher; use Pterodactyl\Jobs\Schedule\RunTaskJob; use Pterodactyl\Contracts\Repository\TaskRepositoryInterface; @@ -19,11 +16,6 @@ class ProcessScheduleService */ private $dispatcher; - /** - * @var \DateTimeInterface|null - */ - private $runTimeOverride; - /** * @var \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface */ @@ -51,20 +43,6 @@ class ProcessScheduleService $this->taskRepository = $taskRepository; } - /** - * Set the time that this schedule should be run at. This will override the time - * defined on the schedule itself. Useful for triggering one-off task runs. - * - * @param \DateTimeInterface $time - * @return $this - */ - public function setRunTimeOverride(DateTimeInterface $time) - { - $this->runTimeOverride = $time; - - return $this; - } - /** * Process a schedule and push the first task onto the queue worker. * @@ -89,7 +67,7 @@ class ProcessScheduleService $this->scheduleRepository->update($schedule->id, [ 'is_processing' => true, - 'next_run_at' => $this->getRunAtTime($formattedCron), + 'next_run_at' => CronExpression::factory($formattedCron)->getNextRunDate(), ]); $this->taskRepository->update($task->id, ['is_queued' => true]); @@ -98,19 +76,4 @@ class ProcessScheduleService (new RunTaskJob($task->id, $schedule->id))->delay($task->time_offset) ); } - - /** - * Get the timestamp to store in the database as the next_run time for a schedule. - * - * @param string $formatted - * @return \Cake\Chronos\ChronosInterface - */ - private function getRunAtTime(string $formatted): ChronosInterface - { - if (! is_null($this->runTimeOverride)) { - return $this->runTimeOverride instanceof ChronosInterface ? $this->runTimeOverride : Chronos::instance($this->runTimeOverride); - } - - return Chronos::instance(CronExpression::factory($formatted)->getNextRunDate()); - } } diff --git a/tests/Unit/Services/Schedules/ProcessScheduleServiceTest.php b/tests/Unit/Services/Schedules/ProcessScheduleServiceTest.php index febde488e..40c087c1c 100644 --- a/tests/Unit/Services/Schedules/ProcessScheduleServiceTest.php +++ b/tests/Unit/Services/Schedules/ProcessScheduleServiceTest.php @@ -5,7 +5,6 @@ namespace Tests\Unit\Services\Schedules; use Mockery as m; use Tests\TestCase; use Cron\CronExpression; -use Cake\Chronos\Chronos; use Pterodactyl\Models\Task; use Pterodactyl\Models\Schedule; use Illuminate\Contracts\Bus\Dispatcher; @@ -38,7 +37,6 @@ class ProcessScheduleServiceTest extends TestCase { parent::setUp(); - Chronos::setTestNow(Chronos::now()); $this->dispatcher = m::mock(Dispatcher::class); $this->scheduleRepository = m::mock(ScheduleRepositoryInterface::class); $this->taskRepository = m::mock(TaskRepositoryInterface::class); @@ -59,7 +57,7 @@ class ProcessScheduleServiceTest extends TestCase $formatted = sprintf('%s %s %s * %s', $model->cron_minute, $model->cron_hour, $model->cron_day_of_month, $model->cron_day_of_week); $this->scheduleRepository->shouldReceive('update')->with($model->id, [ 'is_processing' => true, - 'next_run_at' => Chronos::parse(CronExpression::factory($formatted)->getNextRunDate()->format(Chronos::ATOM)), + 'next_run_at' => CronExpression::factory($formatted)->getNextRunDate(), ]); $this->taskRepository->shouldReceive('update')->with($task->id, ['is_queued' => true])->once(); @@ -77,35 +75,11 @@ class ProcessScheduleServiceTest extends TestCase $this->assertTrue(true); } - public function testScheduleRunTimeCanBeOverridden() - { - $model = factory(Schedule::class)->make(); - $model->setRelation('tasks', collect([$task = factory(Task::class)->make([ - 'sequence_id' => 1, - ])])); - - $this->scheduleRepository->shouldReceive('loadTasks')->with($model)->once()->andReturn($model); - - $this->scheduleRepository->shouldReceive('update')->with($model->id, [ - 'is_processing' => true, - 'next_run_at' => Chronos::now()->addSeconds(15), - ]); - - $this->taskRepository->shouldReceive('update')->with($task->id, ['is_queued' => true])->once(); - - $this->dispatcher->shouldReceive('dispatch')->with(m::on(function ($class) use ($model, $task) { - $this->assertInstanceOf(RunTaskJob::class, $class); - $this->assertSame($task->time_offset, $class->delay); - $this->assertSame($task->id, $class->task); - $this->assertSame($model->id, $class->schedule); - - return true; - }))->once(); - - $this->getService()->setRunTimeOverride(Chronos::now()->addSeconds(15))->handle($model); - $this->assertTrue(true); - } - + /** + * Return an instance of the service for testing purposes. + * + * @return \Pterodactyl\Services\Schedules\ProcessScheduleService + */ private function getService(): ProcessScheduleService { return new ProcessScheduleService($this->dispatcher, $this->scheduleRepository, $this->taskRepository); From e404918bffd174ddc7b3364a0e9239735663ba56 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Mon, 3 Sep 2018 14:43:05 -0700 Subject: [PATCH 25/36] Dont limit length of variable values, closes #1264 --- CHANGELOG.md | 3 ++ ...ow_egg_variables_to_have_longer_values.php | 32 +++++++++++++++++++ ...server_variables_to_have_longer_values.php | 32 +++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 database/migrations/2018_09_03_143756_allow_egg_variables_to_have_longer_values.php create mode 100644 database/migrations/2018_09_03_144005_allow_server_variables_to_have_longer_values.php diff --git a/CHANGELOG.md b/CHANGELOG.md index d6f9a3a1d..7e6403d12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ This project follows [Semantic Versioning](http://semver.org) guidelines. ### Fixed * Scheduled tasks triggered manually no longer improperly change the `next_run_at` time and do not run twice in a row anymore. +### Changed +* Egg and server variable values are no longer limited to 191 characters. Turns out some games require a large number of characters in these fields. + ## v0.7.9 (Derelict Dermodactylus) ### Fixed * Fixes a two-factor authentication bypass present in the password reset process for an account. diff --git a/database/migrations/2018_09_03_143756_allow_egg_variables_to_have_longer_values.php b/database/migrations/2018_09_03_143756_allow_egg_variables_to_have_longer_values.php new file mode 100644 index 000000000..199650940 --- /dev/null +++ b/database/migrations/2018_09_03_143756_allow_egg_variables_to_have_longer_values.php @@ -0,0 +1,32 @@ +text('default_value')->change(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('egg_variables', function (Blueprint $table) { + $table->string('default_value')->change(); + }); + } +} diff --git a/database/migrations/2018_09_03_144005_allow_server_variables_to_have_longer_values.php b/database/migrations/2018_09_03_144005_allow_server_variables_to_have_longer_values.php new file mode 100644 index 000000000..cc90e0e06 --- /dev/null +++ b/database/migrations/2018_09_03_144005_allow_server_variables_to_have_longer_values.php @@ -0,0 +1,32 @@ +text('variable_value')->change(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('server_variables', function (Blueprint $table) { + $table->string('variable_value')->change(); + }); + } +} From 7ed9c7cb93e306141d1690d020b0cd0161f1991d Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Mon, 3 Sep 2018 14:53:58 -0700 Subject: [PATCH 26/36] Correctly store changes to upload size limit, closes #1237 --- CHANGELOG.md | 1 + app/Models/Node.php | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e6403d12..32214a317 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines. ## v0.7.10 (Derelict Dermodactylus) ### Fixed * Scheduled tasks triggered manually no longer improperly change the `next_run_at` time and do not run twice in a row anymore. +* Changing the maximum web-based file upload size for a node now properly validates and updates. ### Changed * Egg and server variable values are no longer limited to 191 characters. Turns out some games require a large number of characters in these fields. diff --git a/app/Models/Node.php b/app/Models/Node.php index 2643d062a..80c84904f 100644 --- a/app/Models/Node.php +++ b/app/Models/Node.php @@ -113,6 +113,7 @@ class Node extends Model implements CleansAttributes, ValidableContract 'daemonSFTP' => 'numeric|between:1024,65535', 'daemonListen' => 'numeric|between:1024,65535', 'maintenance_mode' => 'boolean', + 'upload_size' => 'int|between:1,1024', ]; /** From 3bb9bf04e5a9b20b30fb3512b423166ab40cdda0 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Mon, 3 Sep 2018 14:54:50 -0700 Subject: [PATCH 27/36] Pass the updated model through for updating node config, rather than old model, ref #1237 --- CHANGELOG.md | 1 + .../Api/Application/Nodes/NodeController.php | 2 +- app/Services/Nodes/NodeUpdateService.php | 13 +++---------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32214a317..979dd26ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines. ### Fixed * Scheduled tasks triggered manually no longer improperly change the `next_run_at` time and do not run twice in a row anymore. * Changing the maximum web-based file upload size for a node now properly validates and updates. +* Changing configuration values for a node now correctly updates them on the daemon on the first request, rather than requiring a second request to set them. ### Changed * Egg and server variable values are no longer limited to 191 characters. Turns out some games require a large number of characters in these fields. diff --git a/app/Http/Controllers/Api/Application/Nodes/NodeController.php b/app/Http/Controllers/Api/Application/Nodes/NodeController.php index e9f679006..99be100ee 100644 --- a/app/Http/Controllers/Api/Application/Nodes/NodeController.php +++ b/app/Http/Controllers/Api/Application/Nodes/NodeController.php @@ -124,7 +124,7 @@ class NodeController extends ApplicationApiController */ public function update(UpdateNodeRequest $request): array { - $node = $this->updateService->returnUpdatedModel()->handle( + $node = $this->updateService->handle( $request->getModel(Node::class), $request->validated() ); diff --git a/app/Services/Nodes/NodeUpdateService.php b/app/Services/Nodes/NodeUpdateService.php index ef9349a71..aaf0faed4 100644 --- a/app/Services/Nodes/NodeUpdateService.php +++ b/app/Services/Nodes/NodeUpdateService.php @@ -13,7 +13,6 @@ use Pterodactyl\Models\Node; use GuzzleHttp\Exception\ConnectException; use GuzzleHttp\Exception\RequestException; use Illuminate\Database\ConnectionInterface; -use Pterodactyl\Traits\Services\ReturnsUpdatedModels; use Pterodactyl\Contracts\Repository\NodeRepositoryInterface; use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException; use Pterodactyl\Exceptions\Service\Node\ConfigurationNotPersistedException; @@ -21,8 +20,6 @@ use Pterodactyl\Contracts\Repository\Daemon\ConfigurationRepositoryInterface; class NodeUpdateService { - use ReturnsUpdatedModels; - /** * @var \Illuminate\Database\ConnectionInterface */ @@ -74,14 +71,10 @@ class NodeUpdateService } $this->connection->beginTransaction(); - if ($this->getUpdatedModel()) { - $response = $this->repository->update($node->id, $data); - } else { - $response = $this->repository->withoutFreshModel()->update($node->id, $data); - } + $updatedModel = $this->repository->update($node->id, $data); try { - $this->configRepository->setNode($node)->update(); + $this->configRepository->setNode($updatedModel)->update(); $this->connection->commit(); } catch (RequestException $exception) { // Failed to connect to the Daemon. Let's go ahead and save the configuration @@ -95,6 +88,6 @@ class NodeUpdateService throw new DaemonConnectionException($exception); } - return $response; + return $updatedModel; } } From c6112b423478e44b2ed2bbb55b5691483358b004 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Mon, 3 Sep 2018 14:59:00 -0700 Subject: [PATCH 28/36] Fix tests --- app/Services/Nodes/NodeUpdateService.php | 9 +--- .../Services/Nodes/NodeUpdateServiceTest.php | 45 ++++--------------- 2 files changed, 10 insertions(+), 44 deletions(-) diff --git a/app/Services/Nodes/NodeUpdateService.php b/app/Services/Nodes/NodeUpdateService.php index aaf0faed4..16cc982de 100644 --- a/app/Services/Nodes/NodeUpdateService.php +++ b/app/Services/Nodes/NodeUpdateService.php @@ -1,11 +1,4 @@ . - * - * This software is licensed under the terms of the MIT license. - * https://opensource.org/licenses/MIT - */ namespace Pterodactyl\Services\Nodes; @@ -57,7 +50,7 @@ class NodeUpdateService * * @param \Pterodactyl\Models\Node $node * @param array $data - * @return \Pterodactyl\Models\Node|mixed + * @return \Pterodactyl\Models\Node * * @throws \Pterodactyl\Exceptions\DisplayException * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/tests/Unit/Services/Nodes/NodeUpdateServiceTest.php b/tests/Unit/Services/Nodes/NodeUpdateServiceTest.php index 12f2867ca..97f551330 100644 --- a/tests/Unit/Services/Nodes/NodeUpdateServiceTest.php +++ b/tests/Unit/Services/Nodes/NodeUpdateServiceTest.php @@ -1,11 +1,4 @@ . - * - * This software is licensed under the terms of the MIT license. - * https://opensource.org/licenses/MIT - */ namespace Tests\Unit\Services\Nodes; @@ -63,17 +56,17 @@ class NodeUpdateServiceTest extends TestCase ->expects($this->once())->willReturn('random_string'); $this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull(); - $this->repository->shouldReceive('withoutFreshModel->update')->with($model->id, [ + $this->repository->shouldReceive('update')->with($model->id, [ 'name' => 'NewName', 'daemonSecret' => 'random_string', - ])->andReturn(true); + ])->andReturn($model); $this->configRepository->shouldReceive('setNode')->with($model)->once()->andReturnSelf() ->shouldReceive('update')->withNoArgs()->once()->andReturn(new Response); $this->connection->shouldReceive('commit')->withNoArgs()->once()->andReturnNull(); - $response = $this->getService()->returnUpdatedModel(false)->handle($model, ['name' => 'NewName', 'reset_secret' => true]); - $this->assertTrue($response); + $response = $this->getService()->handle($model, ['name' => 'NewName', 'reset_secret' => true]); + $this->assertInstanceOf(Node::class, $response); } /** @@ -83,37 +76,17 @@ class NodeUpdateServiceTest extends TestCase { $model = factory(Node::class)->make(); - $this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull(); - $this->repository->shouldReceive('withoutFreshModel->update')->with($model->id, [ - 'name' => 'NewName', - ])->andReturn(true); - - $this->configRepository->shouldReceive('setNode')->with($model)->once()->andReturnSelf() - ->shouldReceive('update')->withNoArgs()->once()->andReturn(new Response); - $this->connection->shouldReceive('commit')->withNoArgs()->once()->andReturnNull(); - - $response = $this->getService()->returnUpdatedModel(false)->handle($model, ['name' => 'NewName']); - $this->assertTrue($response); - } - - public function testUpdatedModelIsReturned() - { - $model = factory(Node::class)->make(); - $updated = clone $model; - $updated->name = 'NewName'; - $this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull(); $this->repository->shouldReceive('update')->with($model->id, [ - 'name' => $updated->name, - ])->andReturn($updated); + 'name' => 'NewName', + ])->andReturn($model); $this->configRepository->shouldReceive('setNode')->with($model)->once()->andReturnSelf() ->shouldReceive('update')->withNoArgs()->once()->andReturn(new Response); $this->connection->shouldReceive('commit')->withNoArgs()->once()->andReturnNull(); - $response = $this->getService()->returnUpdatedModel()->handle($model, ['name' => $updated->name]); + $response = $this->getService()->handle($model, ['name' => 'NewName']); $this->assertInstanceOf(Node::class, $response); - $this->assertSame($updated, $response); } /** @@ -127,7 +100,7 @@ class NodeUpdateServiceTest extends TestCase $model = factory(Node::class)->make(); $this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull(); - $this->repository->shouldReceive('withoutFreshModel->update')->andReturn(new Response); + $this->repository->shouldReceive('update')->andReturn($model); $this->configRepository->shouldReceive('setNode->update')->once()->andThrow($this->getExceptionMock()); $this->connection->shouldReceive('commit')->withNoArgs()->once()->andReturnNull(); @@ -146,7 +119,7 @@ class NodeUpdateServiceTest extends TestCase $model = factory(Node::class)->make(); $this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull(); - $this->repository->shouldReceive('withoutFreshModel->update')->andReturn(new Response); + $this->repository->shouldReceive('update')->andReturn($model); $this->configRepository->shouldReceive('setNode->update')->once()->andThrow($this->getExceptionMock()); From 368b9892e124d8f712bea4a952609c3269dc75f4 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Mon, 3 Sep 2018 15:14:19 -0700 Subject: [PATCH 29/36] Rename cn to zh for language --- resources/lang/{cn => zh}/admin/nests.php | 0 resources/lang/{cn => zh}/admin/node.php | 0 resources/lang/{cn => zh}/admin/pack.php | 0 resources/lang/{cn => zh}/admin/server.php | 0 resources/lang/{cn => zh}/admin/user.php | 0 resources/lang/{cn => zh}/auth.php | 0 resources/lang/{cn => zh}/base.php | 0 resources/lang/{cn => zh}/command/messages.php | 0 resources/lang/{cn => zh}/exceptions.php | 0 resources/lang/{cn => zh}/navigation.php | 0 resources/lang/{cn => zh}/pagination.php | 0 resources/lang/{cn => zh}/passwords.php | 0 resources/lang/{cn => zh}/server.php | 0 resources/lang/{cn => zh}/strings.php | 0 resources/lang/{cn => zh}/validation.php | 0 resources/themes/pterodactyl/base/account.blade.php | 1 + 16 files changed, 1 insertion(+) rename resources/lang/{cn => zh}/admin/nests.php (100%) rename resources/lang/{cn => zh}/admin/node.php (100%) rename resources/lang/{cn => zh}/admin/pack.php (100%) rename resources/lang/{cn => zh}/admin/server.php (100%) rename resources/lang/{cn => zh}/admin/user.php (100%) rename resources/lang/{cn => zh}/auth.php (100%) rename resources/lang/{cn => zh}/base.php (100%) rename resources/lang/{cn => zh}/command/messages.php (100%) rename resources/lang/{cn => zh}/exceptions.php (100%) rename resources/lang/{cn => zh}/navigation.php (100%) rename resources/lang/{cn => zh}/pagination.php (100%) rename resources/lang/{cn => zh}/passwords.php (100%) rename resources/lang/{cn => zh}/server.php (100%) rename resources/lang/{cn => zh}/strings.php (100%) rename resources/lang/{cn => zh}/validation.php (100%) diff --git a/resources/lang/cn/admin/nests.php b/resources/lang/zh/admin/nests.php similarity index 100% rename from resources/lang/cn/admin/nests.php rename to resources/lang/zh/admin/nests.php diff --git a/resources/lang/cn/admin/node.php b/resources/lang/zh/admin/node.php similarity index 100% rename from resources/lang/cn/admin/node.php rename to resources/lang/zh/admin/node.php diff --git a/resources/lang/cn/admin/pack.php b/resources/lang/zh/admin/pack.php similarity index 100% rename from resources/lang/cn/admin/pack.php rename to resources/lang/zh/admin/pack.php diff --git a/resources/lang/cn/admin/server.php b/resources/lang/zh/admin/server.php similarity index 100% rename from resources/lang/cn/admin/server.php rename to resources/lang/zh/admin/server.php diff --git a/resources/lang/cn/admin/user.php b/resources/lang/zh/admin/user.php similarity index 100% rename from resources/lang/cn/admin/user.php rename to resources/lang/zh/admin/user.php diff --git a/resources/lang/cn/auth.php b/resources/lang/zh/auth.php similarity index 100% rename from resources/lang/cn/auth.php rename to resources/lang/zh/auth.php diff --git a/resources/lang/cn/base.php b/resources/lang/zh/base.php similarity index 100% rename from resources/lang/cn/base.php rename to resources/lang/zh/base.php diff --git a/resources/lang/cn/command/messages.php b/resources/lang/zh/command/messages.php similarity index 100% rename from resources/lang/cn/command/messages.php rename to resources/lang/zh/command/messages.php diff --git a/resources/lang/cn/exceptions.php b/resources/lang/zh/exceptions.php similarity index 100% rename from resources/lang/cn/exceptions.php rename to resources/lang/zh/exceptions.php diff --git a/resources/lang/cn/navigation.php b/resources/lang/zh/navigation.php similarity index 100% rename from resources/lang/cn/navigation.php rename to resources/lang/zh/navigation.php diff --git a/resources/lang/cn/pagination.php b/resources/lang/zh/pagination.php similarity index 100% rename from resources/lang/cn/pagination.php rename to resources/lang/zh/pagination.php diff --git a/resources/lang/cn/passwords.php b/resources/lang/zh/passwords.php similarity index 100% rename from resources/lang/cn/passwords.php rename to resources/lang/zh/passwords.php diff --git a/resources/lang/cn/server.php b/resources/lang/zh/server.php similarity index 100% rename from resources/lang/cn/server.php rename to resources/lang/zh/server.php diff --git a/resources/lang/cn/strings.php b/resources/lang/zh/strings.php similarity index 100% rename from resources/lang/cn/strings.php rename to resources/lang/zh/strings.php diff --git a/resources/lang/cn/validation.php b/resources/lang/zh/validation.php similarity index 100% rename from resources/lang/cn/validation.php rename to resources/lang/zh/validation.php diff --git a/resources/themes/pterodactyl/base/account.blade.php b/resources/themes/pterodactyl/base/account.blade.php index c01ebbc13..f053d61e6 100644 --- a/resources/themes/pterodactyl/base/account.blade.php +++ b/resources/themes/pterodactyl/base/account.blade.php @@ -95,6 +95,7 @@
    - {{ debug($languages) }} @foreach($languages as $key => $value) @endforeach From d5f166d12104a201dce25808a83ec06109968add Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Mon, 3 Sep 2018 16:23:59 -0700 Subject: [PATCH 36/36] bump for release --- config/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/app.php b/config/app.php index a7c196b3c..a92ab0362 100644 --- a/config/app.php +++ b/config/app.php @@ -9,7 +9,7 @@ return [ | change this value if you are not maintaining your own internal versions. */ - 'version' => 'canary', + 'version' => '0.7.10', /* |--------------------------------------------------------------------------