Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply fixes from StyleCI (#335)

Browse source
This commit is contained in:
Dane Everitt 2017-03-05 20:28:29 -05:00 committed by GitHub
parent 3355554704
commit 5bf2e2686a
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -213,7 +213,7 @@ class ServersController extends Controller
return view('admin.servers.view.database', [ return view('admin.servers.view.database', [
'hosts' => Models\DatabaseServer::all(), 'hosts' => Models\DatabaseServer::all(),
'server' => $server 'server' => $server,
]); ]);
} }
@ -493,7 +493,7 @@ class ServersController extends Controller
$repo->updateStartup($id, $request->except('_token'), true); $repo->updateStartup($id, $request->except('_token'), true);
Alert::success('Startup variables were successfully modified and assigned for this server.')->flash(); Alert::success('Startup variables were successfully modified and assigned for this server.')->flash();
} catch(DisplayException $ex) { } catch (DisplayException $ex) {
Alert::danger($ex->getMessage())->flash(); Alert::danger($ex->getMessage())->flash();
} catch (TransferException $ex) { } catch (TransferException $ex) {
Log::warning($ex); Log::warning($ex);
@ -522,7 +522,7 @@ class ServersController extends Controller
Alert::success('A new database was assigned to this server successfully.')->flash(); Alert::success('A new database was assigned to this server successfully.')->flash();
} catch (DisplayValidationException $ex) { } catch (DisplayValidationException $ex) {
return redirect()->route('admin.servers.view.database', $id)->withInput()->withErrors(json_decode($ex->getMessage()))->withInput(); return redirect()->route('admin.servers.view.database', $id)->withInput()->withErrors(json_decode($ex->getMessage()))->withInput();
} catch(DisplayException $ex) { } catch (DisplayException $ex) {
Alert::danger($ex->getMessage())->flash(); Alert::danger($ex->getMessage())->flash();
} catch (\Exception $ex) { } catch (\Exception $ex) {
Log::error($ex); Log::error($ex);

3
app/Repositories/DatabaseRepository.php
View file

@ -114,7 +114,8 @@ class DatabaseRepository
DB::connection('dynamic')->statement(sprintf('DROP DATABASE IF EXISTS `%s`', $database->database)); DB::connection('dynamic')->statement(sprintf('DROP DATABASE IF EXISTS `%s`', $database->database));
DB::connection('dynamic')->statement(sprintf('DROP USER IF EXISTS `%s`@`%s`', $database->username, $database->remote)); DB::connection('dynamic')->statement(sprintf('DROP USER IF EXISTS `%s`@`%s`', $database->username, $database->remote));
DB::connection('dynamic')->statement('FLUSH PRIVILEGES'); DB::connection('dynamic')->statement('FLUSH PRIVILEGES');
} catch (\Exception $ex) {} } catch (\Exception $ex) {
}
DB::rollBack(); DB::rollBack();
throw $ex; throw $ex;

2
app/Repositories/ServerRepository.php
View file

@ -624,7 +624,7 @@ class ServerRepository
} }
if ($server->option->variables) { if ($server->option->variables) {
foreach($server->option->variables as &$variable) { foreach ($server->option->variables as &$variable) {
$set = isset($data['env_' . $variable->id]); $set = isset($data['env_' . $variable->id]);
// Variable is required but was not passed into the function. // Variable is required but was not passed into the function.