StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature/laravel-55-update' into feature/api-v1

Browse source
This commit is contained in:
Dane Everitt 2017-12-16 17:19:35 -06:00
commit f30f4b45ba
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
35 changed files with 1024 additions and 822 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Admin/PackController.php
View file

@ -163,7 +163,7 @@ class PackController extends Controller
*/
public function store(PackFormRequest $request)
{
if ($request->has('from_template')) {
if ($request->filled('from_template')) {
$pack = $this->templateUploadService->handle($request->input('egg_id'), $request->file('file_upload'));
} else {
$pack = $this->creationService->handle($request->normalize(), $request->file('file_upload'));

2
app/Http/Controllers/Admin/ServersController.php
View file

@ -524,7 +524,7 @@ class ServersController extends Controller
*/
public function delete(Request $request, Server $server)
{
$this->deletionService->withForce($request->has('force_delete'))->handle($server);
$this->deletionService->withForce($request->filled('force_delete'))->handle($server);
$this->alert->success(trans('admin/server.alerts.server_deleted'))->flash();
return redirect()->route('admin.servers');

5
app/Http/Controllers/Auth/LoginController.php
View file

@ -107,6 +107,8 @@ class LoginController extends Controller
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response
*
* @throws \Illuminate\Validation\ValidationException
*/
public function login(Request $request)
{
@ -115,8 +117,7 @@ class LoginController extends Controller
if ($this->hasTooManyLoginAttempts($request)) {
$this->fireLockoutEvent($request);
return $this->sendLockoutResponse($request);
$this->sendLockoutResponse($request);
}
try {

23
app/Http/Controllers/Base/SecurityController.php
View file

@ -1,27 +1,4 @@
<?php
/**
* Pterodactyl - Panel
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>
* Some Modifications (c) 2015 Dylan Seidt <dylan.seidt@gmail.com>.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
namespace Pterodactyl\Http\Controllers\Base;