Alex/Pterodactyl-Panel
1
1
Fork 1
mirror of https://github.com/pterodactyl/panel.git synced 2024-11-25 10:32:31 +01:00
Code Issues Releases Wiki Activity

StyleCI cleanup

Browse Source
This commit is contained in:
Dane Everitt 2017-03-12 16:34:43 -04:00
parent 37a723aa58
commit 1897741381
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
10 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Admin/OptionController.php
View File

@ -26,7 +26,6 @@ namespace Pterodactyl\Http\Controllers\Admin;
use Log;
use Alert;
use Storage;
use Javascript;
use Illuminate\Http\Request;
use Pterodactyl\Models\Service;
@ -67,7 +66,7 @@ class OptionController extends Controller
$option = $repo->create($request->intersect([
'service_id', 'name', 'description', 'tag',
'docker_image', 'startup', 'config_from', 'config_startup',
'config_logs', 'config_files', 'config_stop'
'config_logs', 'config_files', 'config_stop',
]));
Alert::success('Successfully created new service option.')->flash();
@ -195,7 +194,7 @@ class OptionController extends Controller
Alert::success("The service variable '{$variable->name}' has been updated.")->flash();
} else {
$repo->delete($variable);
Alert::success("That service variable has been deleted.")->flash();
Alert::success('That service variable has been deleted.')->flash();
}
} catch (DisplayValidationException $ex) {
return redirect()->route('admin.services.option.variables', $option)->withErrors(json_decode($ex->getMessage()));

12
app/Http/Controllers/Admin/ServiceController.php
View File

@ -149,16 +149,4 @@ class ServiceController extends Controller
return redirect()->route($redirectTo, $id);
}
/**
* Edits function file for a service.
*
* @param Request $request
* @param int $id
* @return \Illuminate\Response\RedirectResponse
*/
public function editFunctions(Request $request, $id)
{
}
}

2
app/Http/Controllers/Daemon/ServiceController.php
View File

@ -66,7 +66,7 @@ class ServiceController extends Controller
if ($file === 'index.js') {
return response($service->index_file)->header('Content-Type', 'text/plain');
} else if ($file === 'main.json') {
} elseif ($file === 'main.json') {
return response()->json($this->getConfiguration($service->id));
}

2
app/Models/Service.php
View File

@ -51,7 +51,7 @@ class Service extends Model
*/
public function defaultIndexFile()
{
return <<<EOF
return <<<'EOF'
'use strict';
/**

1
app/Repositories/OptionRepository.php
View File

@ -28,7 +28,6 @@ use DB;
use Validator;
use Pterodactyl\Models\ServiceOption;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Repositories\VariableRepository;
use Pterodactyl\Exceptions\DisplayValidationException;
class OptionRepository

5
app/Repositories/ServiceRepository.php
View File

@ -25,12 +25,9 @@
namespace Pterodactyl\Repositories;
use DB;
use Uuid;
use Validator;
use Pterodactyl\Models\Service;
use Pterodactyl\Models\ServiceVariable;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Repositories\OptionRepository;
use Pterodactyl\Exceptions\DisplayValidationException;
class ServiceRepository
@ -122,7 +119,7 @@ class ServiceRepository
}
DB::transaction(function () use ($service) {
foreach($service->options as $option) {
foreach ($service->options as $option) {
(new OptionRepository)->delete($option->id);
}

4
database/migrations/2017_03_10_162934_AddNewServiceOptionsColumns.php
View File

@ -13,7 +13,7 @@ class AddNewServiceOptionsColumns extends Migration
*/
public function up()
{
DB::transaction(function() {
DB::transaction(function () {
Schema::table('service_options', function (Blueprint $table) {
$table->dropColumn('executable');
@ -35,7 +35,7 @@ class AddNewServiceOptionsColumns extends Migration
*/
public function down()
{
DB::transaction(function() {
DB::transaction(function () {
Schema::table('service_options', function (Blueprint $table) {
$table->dropForeign('config_from');

14
database/migrations/2017_03_10_173607_MigrateToNewServiceSystem.php
View File

@ -23,8 +23,6 @@
*/
use Pterodactyl\Models\Service;
use Pterodactyl\Models\ServiceOption;
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class MigrateToNewServiceSystem extends Migration
@ -69,7 +67,7 @@ class MigrateToNewServiceSystem extends Migration
DB::transaction(function () use ($service) {
$options = ServiceOption::where('service_id', $service->id)->get();
$options->each(function ($item) use ($options) {
switch($item->tag) {
switch ($item->tag) {
case 'vanilla':
$item->config_startup = '{"done": ")! For help, type ", "userInteraction": [ "Go to eula.txt for more info."]}';
$item->config_files = '{"server.properties":{"parser": "properties", "find":{"server-ip": "0.0.0.0", "enable-query": "true", "server-port": "{{server.build.default.port}}", "query.port": "{{server.build.default.port}}"}}}';
@ -117,13 +115,13 @@ class MigrateToNewServiceSystem extends Migration
$options->each(function ($item) use ($options) {
if ($item->tag === 'srcds' && $item->name === 'Insurgency') {
$item->tag = 'insurgency';
} else if ($item->tag === 'srcds' && $item->name === 'Team Fortress 2') {
} elseif ($item->tag === 'srcds' && $item->name === 'Team Fortress 2') {
$item->tag = 'tf2';
} else if ($item->tag === 'srcds' && $item->name === 'Custom Source Engine Game') {
} elseif ($item->tag === 'srcds' && $item->name === 'Custom Source Engine Game') {
$item->tag = 'source';
}
switch($item->tag) {
switch ($item->tag) {
case 'source':
$item->config_startup = '{"done": "Assigned anonymous gameserver", "userInteraction": []}';
$item->config_files = '{}';
@ -164,7 +162,7 @@ class MigrateToNewServiceSystem extends Migration
DB::transaction(function () use ($service) {
$options = ServiceOption::where('service_id', $service->id)->get();
$options->each(function ($item) use ($options) {
switch($item->tag) {
switch ($item->tag) {
case 'tshock':
$item->startup = null;
$item->config_startup = '{"done": "Type \'help\' for a list of commands", "userInteraction": []}';
@ -195,7 +193,7 @@ class MigrateToNewServiceSystem extends Migration
DB::transaction(function () use ($service) {
$options = ServiceOption::where('service_id', $service->id)->get();
$options->each(function ($item) use ($options) {
switch($item->tag) {
switch ($item->tag) {
case 'mumble':
$item->startup = './murmur.x86 -fg';
$item->config_startup = '{"done": "Server listening on", "userInteraction": [ "Generating new server certificate"]}';

4
database/migrations/2017_03_11_215455_ChangeServiceVariablesValidationRules.php
View File

@ -19,7 +19,7 @@ class ChangeServiceVariablesValidationRules extends Migration
});
DB::transaction(function () {
foreach(ServiceVariable::all() as $variable) {
foreach (ServiceVariable::all() as $variable) {
$variable->rules = ($variable->required) ? 'required|regex:' . $variable->rules : 'regex:' . $variable->regex;
$variable->save();
}
@ -38,7 +38,7 @@ class ChangeServiceVariablesValidationRules extends Migration
});
DB::transaction(function () {
foreach(ServiceVariable::all() as $variable) {
foreach (ServiceVariable::all() as $variable) {
$variable->regex = str_replace(['required|regex:', 'regex:'], '', $variable->regex);
$variable->save();
}

4
database/migrations/2017_03_12_150648_MoveFunctionsFromFileToDatabase.php
View File

@ -8,7 +8,7 @@ use Illuminate\Database\Migrations\Migration;
class MoveFunctionsFromFileToDatabase extends Migration
{
private $default = <<<EOF
private $default = <<<'EOF'
'use strict';
/**
@ -43,7 +43,7 @@ class Service extends Core {}
module.exports = Service;
EOF;
private $default_mc = <<<EOF
private $default_mc = <<<'EOF'
'use strict';
/**