From 0e1b4661cefca161dd117ec4f8d9ae0b778b0902 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Wed, 23 May 2018 22:23:26 -0700 Subject: [PATCH] Don't allow access to manage page if server failed installing --- app/Http/Controllers/Admin/ServersController.php | 6 ++++++ .../themes/pterodactyl/admin/servers/view/build.blade.php | 2 +- .../pterodactyl/admin/servers/view/database.blade.php | 2 +- .../themes/pterodactyl/admin/servers/view/delete.blade.php | 2 +- .../themes/pterodactyl/admin/servers/view/details.blade.php | 2 +- .../themes/pterodactyl/admin/servers/view/index.blade.php | 2 +- .../themes/pterodactyl/admin/servers/view/manage.blade.php | 2 +- .../themes/pterodactyl/admin/servers/view/startup.blade.php | 2 +- 8 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Admin/ServersController.php b/app/Http/Controllers/Admin/ServersController.php index fc19606f..161e8aba 100644 --- a/app/Http/Controllers/Admin/ServersController.php +++ b/app/Http/Controllers/Admin/ServersController.php @@ -376,9 +376,15 @@ class ServersController extends Controller * * @param \Pterodactyl\Models\Server $server * @return \Illuminate\View\View + * + * @throws \Pterodactyl\Exceptions\DisplayException */ public function viewManage(Server $server) { + if ($server->installed > 1) { + throw new DisplayException('This server is in a failed installation state and must be deleted and recreated.'); + } + return view('admin.servers.view.manage', ['server' => $server]); } diff --git a/resources/themes/pterodactyl/admin/servers/view/build.blade.php b/resources/themes/pterodactyl/admin/servers/view/build.blade.php index 2c5a45b6..7f39c24c 100644 --- a/resources/themes/pterodactyl/admin/servers/view/build.blade.php +++ b/resources/themes/pterodactyl/admin/servers/view/build.blade.php @@ -30,8 +30,8 @@
  • Build Configuration
  • Startup
  • Database
  • +
  • Manage
  • @endif -
  • Manage
  • Delete
  • diff --git a/resources/themes/pterodactyl/admin/servers/view/database.blade.php b/resources/themes/pterodactyl/admin/servers/view/database.blade.php index 9b7c8107..25d6d157 100644 --- a/resources/themes/pterodactyl/admin/servers/view/database.blade.php +++ b/resources/themes/pterodactyl/admin/servers/view/database.blade.php @@ -30,8 +30,8 @@
  • Build Configuration
  • Startup
  • Database
  • +
  • Manage
  • @endif -
  • Manage
  • Delete
  • diff --git a/resources/themes/pterodactyl/admin/servers/view/delete.blade.php b/resources/themes/pterodactyl/admin/servers/view/delete.blade.php index 4690e717..ec1ccaeb 100644 --- a/resources/themes/pterodactyl/admin/servers/view/delete.blade.php +++ b/resources/themes/pterodactyl/admin/servers/view/delete.blade.php @@ -30,8 +30,8 @@
  • Build Configuration
  • Startup
  • Database
  • +
  • Manage
  • @endif -
  • Manage
  • Delete
  • diff --git a/resources/themes/pterodactyl/admin/servers/view/details.blade.php b/resources/themes/pterodactyl/admin/servers/view/details.blade.php index bd4a5aef..a84a9144 100644 --- a/resources/themes/pterodactyl/admin/servers/view/details.blade.php +++ b/resources/themes/pterodactyl/admin/servers/view/details.blade.php @@ -30,8 +30,8 @@
  • Build Configuration
  • Startup
  • Database
  • +
  • Manage
  • @endif -
  • Manage
  • Delete
  • diff --git a/resources/themes/pterodactyl/admin/servers/view/index.blade.php b/resources/themes/pterodactyl/admin/servers/view/index.blade.php index d3db2708..417a9e0b 100644 --- a/resources/themes/pterodactyl/admin/servers/view/index.blade.php +++ b/resources/themes/pterodactyl/admin/servers/view/index.blade.php @@ -29,8 +29,8 @@
  • Build Configuration
  • Startup
  • Database
  • +
  • Manage
  • @endif -
  • Manage
  • Delete
  • diff --git a/resources/themes/pterodactyl/admin/servers/view/manage.blade.php b/resources/themes/pterodactyl/admin/servers/view/manage.blade.php index 7b56a803..57319b4e 100644 --- a/resources/themes/pterodactyl/admin/servers/view/manage.blade.php +++ b/resources/themes/pterodactyl/admin/servers/view/manage.blade.php @@ -30,8 +30,8 @@
  • Build Configuration
  • Startup
  • Database
  • +
  • Manage
  • @endif -
  • Manage
  • Delete
  • diff --git a/resources/themes/pterodactyl/admin/servers/view/startup.blade.php b/resources/themes/pterodactyl/admin/servers/view/startup.blade.php index 6bb7a5cd..590672c2 100644 --- a/resources/themes/pterodactyl/admin/servers/view/startup.blade.php +++ b/resources/themes/pterodactyl/admin/servers/view/startup.blade.php @@ -30,8 +30,8 @@
  • Build Configuration
  • Startup
  • Database
  • +
  • Manage
  • @endif -
  • Manage
  • Delete