Weekly fix of my StyleCI violations...
This commit is contained in:
parent
0ca7148e07
commit
77b1a258d9
10 changed files with 6 additions and 14 deletions
|
@ -85,7 +85,7 @@ class UpdateEnvironment extends Command
|
||||||
$variables['SERVICE_AUTHOR'] = (string) Uuid::generate(4);
|
$variables['SERVICE_AUTHOR'] = (string) Uuid::generate(4);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($variables['APP_THEME'])) {
|
if (isset($variables['APP_THEME'])) {
|
||||||
if ($variables['APP_THEME'] === 'default') {
|
if ($variables['APP_THEME'] === 'default') {
|
||||||
$variables['APP_THEME'] = 'pterodactyl';
|
$variables['APP_THEME'] = 'pterodactyl';
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,13 +26,11 @@
|
||||||
namespace Pterodactyl\Http\Controllers\Auth;
|
namespace Pterodactyl\Http\Controllers\Auth;
|
||||||
|
|
||||||
use Auth;
|
use Auth;
|
||||||
use Alert;
|
|
||||||
use Cache;
|
use Cache;
|
||||||
use Crypt;
|
use Crypt;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Pterodactyl\Models\User;
|
use Pterodactyl\Models\User;
|
||||||
use PragmaRX\Google2FA\Google2FA;
|
use PragmaRX\Google2FA\Google2FA;
|
||||||
use Pterodactyl\Events\Auth\FailedLogin;
|
|
||||||
use Pterodactyl\Http\Controllers\Controller;
|
use Pterodactyl\Http\Controllers\Controller;
|
||||||
use Illuminate\Foundation\Auth\AuthenticatesUsers;
|
use Illuminate\Foundation\Auth\AuthenticatesUsers;
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,6 @@ namespace Pterodactyl\Http\Controllers\Daemon;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Pterodactyl\Models\Server;
|
use Pterodactyl\Models\Server;
|
||||||
use Pterodactyl\Models\ServiceOption;
|
|
||||||
use Pterodactyl\Http\Controllers\Controller;
|
use Pterodactyl\Http\Controllers\Controller;
|
||||||
|
|
||||||
class OptionController extends Controller
|
class OptionController extends Controller
|
||||||
|
|
|
@ -28,9 +28,9 @@ use Log;
|
||||||
use Alert;
|
use Alert;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Pterodactyl\Models\Server;
|
use Pterodactyl\Models\Server;
|
||||||
use Pterodactyl\Repositories\TaskRepository;
|
|
||||||
use Pterodactyl\Exceptions\DisplayException;
|
use Pterodactyl\Exceptions\DisplayException;
|
||||||
use Pterodactyl\Http\Controllers\Controller;
|
use Pterodactyl\Http\Controllers\Controller;
|
||||||
|
use Pterodactyl\Repositories\TaskRepository;
|
||||||
use Pterodactyl\Exceptions\DisplayValidationException;
|
use Pterodactyl\Exceptions\DisplayValidationException;
|
||||||
|
|
||||||
class TaskController extends Controller
|
class TaskController extends Controller
|
||||||
|
|
|
@ -27,8 +27,6 @@ namespace Pterodactyl\Jobs;
|
||||||
use Cron;
|
use Cron;
|
||||||
use Carbon;
|
use Carbon;
|
||||||
use Pterodactyl\Models\Task;
|
use Pterodactyl\Models\Task;
|
||||||
use Pterodactyl\Models\User;
|
|
||||||
use Pterodactyl\Models\Server;
|
|
||||||
use Pterodactyl\Models\TaskLog;
|
use Pterodactyl\Models\TaskLog;
|
||||||
use Illuminate\Queue\SerializesModels;
|
use Illuminate\Queue\SerializesModels;
|
||||||
use Illuminate\Queue\InteractsWithQueue;
|
use Illuminate\Queue\InteractsWithQueue;
|
||||||
|
@ -77,7 +75,7 @@ class SendScheduledTask extends Job implements ShouldQueue
|
||||||
if ($this->task->action === 'command') {
|
if ($this->task->action === 'command') {
|
||||||
$repo = new CommandRepository($this->task->server, $this->task->user);
|
$repo = new CommandRepository($this->task->server, $this->task->user);
|
||||||
$response = $repo->send($this->task->data);
|
$response = $repo->send($this->task->data);
|
||||||
} else if ($this->task->action === 'power') {
|
} elseif ($this->task->action === 'power') {
|
||||||
$repo = new PowerRepository($this->task->server, $this->task->user);
|
$repo = new PowerRepository($this->task->server, $this->task->user);
|
||||||
$response = $repo->do($this->task->data);
|
$response = $repo->do($this->task->data);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -26,7 +26,6 @@ namespace Pterodactyl\Repositories;
|
||||||
|
|
||||||
use DB;
|
use DB;
|
||||||
use Crypt;
|
use Crypt;
|
||||||
use Config;
|
|
||||||
use Validator;
|
use Validator;
|
||||||
use Pterodactyl\Models\Server;
|
use Pterodactyl\Models\Server;
|
||||||
use Pterodactyl\Models\Database;
|
use Pterodactyl\Models\Database;
|
||||||
|
|
|
@ -635,7 +635,6 @@ class ServerRepository
|
||||||
*/
|
*/
|
||||||
protected function changeService($id, array $data)
|
protected function changeService($id, array $data)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function processVariables(Models\Server $server, $data, $admin = false)
|
protected function processVariables(Models\Server $server, $data, $admin = false)
|
||||||
|
@ -692,6 +691,7 @@ class ServerRepository
|
||||||
|
|
||||||
// Reload Variables
|
// Reload Variables
|
||||||
$server->load('variables');
|
$server->load('variables');
|
||||||
|
|
||||||
return $server->option->variables->map(function ($item, $key) use ($server) {
|
return $server->option->variables->map(function ($item, $key) use ($server) {
|
||||||
$display = $server->variables->where('variable_id', $item->id)->pluck('variable_value')->first();
|
$display = $server->variables->where('variable_id', $item->id)->pluck('variable_value')->first();
|
||||||
|
|
||||||
|
@ -820,7 +820,6 @@ class ServerRepository
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Repositories;
|
namespace Pterodactyl\Repositories;
|
||||||
|
|
||||||
use DB;
|
|
||||||
use Cron;
|
use Cron;
|
||||||
use Validator;
|
use Validator;
|
||||||
use Pterodactyl\Models\Task;
|
use Pterodactyl\Models\Task;
|
||||||
|
|
|
@ -14,4 +14,4 @@ define('LARAVEL_START', microtime(true));
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require __DIR__.'/../vendor/autoload.php';
|
require __DIR__ . '/../vendor/autoload.php';
|
||||||
|
|
|
@ -25,7 +25,7 @@ class UpgradeTaskSystem extends Migration
|
||||||
});
|
});
|
||||||
|
|
||||||
DB::transaction(function () {
|
DB::transaction(function () {
|
||||||
foreach(Task::all() as $task) {
|
foreach (Task::all() as $task) {
|
||||||
$task->user_id = $task->server->owner_id;
|
$task->user_id = $task->server->owner_id;
|
||||||
$task->save();
|
$task->save();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue