Skip to content

Commit 0e1b466

Browse files
committed
Don't allow access to manage page if server failed installing
1 parent db9b80f commit 0e1b466

File tree

8 files changed

+13
-7
lines changed

8 files changed

+13
-7
lines changed

app/Http/Controllers/Admin/ServersController.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,9 +376,15 @@ public function viewDatabase(Server $server)
376376
*
377377
* @param \Pterodactyl\Models\Server $server
378378
* @return \Illuminate\View\View
379+
*
380+
* @throws \Pterodactyl\Exceptions\DisplayException
379381
*/
380382
public function viewManage(Server $server)
381383
{
384+
if ($server->installed > 1) {
385+
throw new DisplayException('This server is in a failed installation state and must be deleted and recreated.');
386+
}
387+
382388
return view('admin.servers.view.manage', ['server' => $server]);
383389
}
384390

resources/themes/pterodactyl/admin/servers/view/build.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<li class="active"><a href="{{ route('admin.servers.view.build', $server->id) }}">Build Configuration</a></li>
3131
<li><a href="{{ route('admin.servers.view.startup', $server->id) }}">Startup</a></li>
3232
<li><a href="{{ route('admin.servers.view.database', $server->id) }}">Database</a></li>
33+
<li><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
3334
@endif
34-
<li><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
3535
<li class="tab-danger"><a href="{{ route('admin.servers.view.delete', $server->id) }}">Delete</a></li>
3636
<li class="tab-success"><a href="{{ route('server.index', $server->uuidShort) }}"><i class="fa fa-external-link"></i></a></li>
3737
</ul>

resources/themes/pterodactyl/admin/servers/view/database.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<li><a href="{{ route('admin.servers.view.build', $server->id) }}">Build Configuration</a></li>
3131
<li><a href="{{ route('admin.servers.view.startup', $server->id) }}">Startup</a></li>
3232
<li class="active"><a href="{{ route('admin.servers.view.database', $server->id) }}">Database</a></li>
33+
<li><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
3334
@endif
34-
<li><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
3535
<li class="tab-danger"><a href="{{ route('admin.servers.view.delete', $server->id) }}">Delete</a></li>
3636
<li class="tab-success"><a href="{{ route('server.index', $server->uuidShort) }}"><i class="fa fa-external-link"></i></a></li>
3737
</ul>

resources/themes/pterodactyl/admin/servers/view/delete.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<li><a href="{{ route('admin.servers.view.build', $server->id) }}">Build Configuration</a></li>
3131
<li><a href="{{ route('admin.servers.view.startup', $server->id) }}">Startup</a></li>
3232
<li><a href="{{ route('admin.servers.view.database', $server->id) }}">Database</a></li>
33+
<li><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
3334
@endif
34-
<li><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
3535
<li class="tab-danger active"><a href="{{ route('admin.servers.view.delete', $server->id) }}">Delete</a></li>
3636
<li class="tab-success"><a href="{{ route('server.index', $server->uuidShort) }}"><i class="fa fa-external-link"></i></a></li>
3737
</ul>

resources/themes/pterodactyl/admin/servers/view/details.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<li><a href="{{ route('admin.servers.view.build', $server->id) }}">Build Configuration</a></li>
3131
<li><a href="{{ route('admin.servers.view.startup', $server->id) }}">Startup</a></li>
3232
<li><a href="{{ route('admin.servers.view.database', $server->id) }}">Database</a></li>
33+
<li><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
3334
@endif
34-
<li><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
3535
<li class="tab-danger"><a href="{{ route('admin.servers.view.delete', $server->id) }}">Delete</a></li>
3636
<li class="tab-success"><a href="{{ route('server.index', $server->uuidShort) }}"><i class="fa fa-external-link"></i></a></li>
3737
</ul>

resources/themes/pterodactyl/admin/servers/view/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
<li><a href="{{ route('admin.servers.view.build', $server->id) }}">Build Configuration</a></li>
3030
<li><a href="{{ route('admin.servers.view.startup', $server->id) }}">Startup</a></li>
3131
<li><a href="{{ route('admin.servers.view.database', $server->id) }}">Database</a></li>
32+
<li><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
3233
@endif
33-
<li><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
3434
<li class="tab-danger"><a href="{{ route('admin.servers.view.delete', $server->id) }}">Delete</a></li>
3535
<li class="tab-success"><a href="{{ route('server.index', $server->uuidShort) }}"><i class="fa fa-external-link"></i></a></li>
3636
</ul>

resources/themes/pterodactyl/admin/servers/view/manage.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<li><a href="{{ route('admin.servers.view.build', $server->id) }}">Build Configuration</a></li>
3131
<li><a href="{{ route('admin.servers.view.startup', $server->id) }}">Startup</a></li>
3232
<li><a href="{{ route('admin.servers.view.database', $server->id) }}">Database</a></li>
33+
<li class="active"><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
3334
@endif
34-
<li class="active"><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
3535
<li class="tab-danger"><a href="{{ route('admin.servers.view.delete', $server->id) }}">Delete</a></li>
3636
<li class="tab-success"><a href="{{ route('server.index', $server->uuidShort) }}"><i class="fa fa-external-link"></i></a></li>
3737
</ul>

resources/themes/pterodactyl/admin/servers/view/startup.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<li><a href="{{ route('admin.servers.view.build', $server->id) }}">Build Configuration</a></li>
3131
<li class="active"><a href="{{ route('admin.servers.view.startup', $server->id) }}">Startup</a></li>
3232
<li><a href="{{ route('admin.servers.view.database', $server->id) }}">Database</a></li>
33+
<li><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
3334
@endif
34-
<li><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
3535
<li class="tab-danger"><a href="{{ route('admin.servers.view.delete', $server->id) }}">Delete</a></li>
3636
<li class="tab-success"><a href="{{ route('server.index', $server->uuidShort) }}"><i class="fa fa-external-link"></i></a></li>
3737
</ul>

0 commit comments

Comments
 (0)