diff --git a/app/Http/Controllers/SRP/SRPController.php b/app/Http/Controllers/SRP/SRPController.php new file mode 100644 index 000000000..a7bb91647 --- /dev/null +++ b/app/Http/Controllers/SRP/SRPController.php @@ -0,0 +1,50 @@ +middleware('auth'); + $this->middelware('role:User'); + } + + public function displaySrpForm() { + return view('srp.srpform'); + } + + public function storeSRPFile() { + $this->validate($request, [ + 'FC' => 'required', + 'FleetType' => 'required', + 'zKillboard' => 'required', + 'LossValue' => 'required', + 'ShipType' => 'required', + ]); + + $fc = $request->FC; + $fleetType = $request->FleetType; + $zKill = $request->zKillboard; + $loss = $request->LossValue; + $ship = $request->ShipType; + } + + public function displaySRPRequests() { + $this->middleware('permission:SRP'); + + + } +} diff --git a/app/Models/SRP/Fleet.php b/app/Models/SRP/Fleet.php new file mode 100644 index 000000000..b0f340445 --- /dev/null +++ b/app/Models/SRP/Fleet.php @@ -0,0 +1,27 @@ +increments('id'); + $table->string('ship_type'); + $table->string('character_id'); + $table->string('zkillboard'); + $table->string('loss_values'); + $table->text('notes'); + }); + } + + if(!Schema::hasTable('srp_fleets')) { + Schema::create('srp_fleets', function(Blueprint $table) { + $table->increments('fleet_id'); + $table->string('fleet_name'); + $table->string('fleet_commander'); + $table->string('fleet_commander_id'); + $table->string('fleet_type'); + $table->string('fleet_description'); + }); + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('srp_ships'); + Schema::dropIfExists('srp_fleets'); + } +} diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index dc02dfb11..fce8549f0 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -279,7 +279,7 @@ class ClassLoader */ public function setApcuPrefix($apcuPrefix) { - $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null; + $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null; } /** @@ -377,7 +377,7 @@ class ClassLoader $subPath = $class; while (false !== $lastPos = strrpos($subPath, '\\')) { $subPath = substr($subPath, 0, $lastPos); - $search = $subPath.'\\'; + $search = $subPath . '\\'; if (isset($this->prefixDirsPsr4[$search])) { $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1); foreach ($this->prefixDirsPsr4[$search] as $dir) { diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 087adb863..b9f2e3101 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -17,6 +17,7 @@ return array( 'App\\Console\\Commands\\UpdateMoonRental' => $baseDir . '/app/Console/Commands/Moons/UpdateMoonRental.php', 'App\\Console\\Kernel' => $baseDir . '/app/Console/Kernel.php', 'App\\Exceptions\\Handler' => $baseDir . '/app/Exceptions/Handler.php', + 'App\\Fleet' => $baseDir . '/app/Models/SRP/Fleet.php', 'App\\Http\\Controllers\\Auth\\EsiScopeController' => $baseDir . '/app/Http/Controllers/Auth/EsiScopeController.php', 'App\\Http\\Controllers\\Auth\\LoginController' => $baseDir . '/app/Http/Controllers/Auth/LoginController.php', 'App\\Http\\Controllers\\Contracts\\ContractAdminController' => $baseDir . '/app/Http/Controllers/Contracts/ContractAdminController.php', @@ -98,6 +99,8 @@ return array( 'App\\Models\\Moon\\Moon' => $baseDir . '/app/Models/Moon/Moon.php', 'App\\Models\\Moon\\OrePrice' => $baseDir . '/app/Models/Moon/OrePrice.php', 'App\\Models\\Moon\\Price' => $baseDir . '/app/Models/Moon/Price.php', + 'App\\Models\\SRP\\FleetCommander' => $baseDir . '/app/Models/SRP/FleetCommander.php', + 'App\\Models\\SRP\\Ship' => $baseDir . '/app/Models/SRP/Ship.php', 'App\\Models\\ScheduledTask\\ScheduleJob' => $baseDir . '/app/Models/ScheduledTask/ScheduleJob.php', 'App\\Models\\Stock\\Asset' => $baseDir . '/app/Models/Stock/Asset.php', 'App\\Models\\Structure\\Service' => $baseDir . '/app/Models/Structure/Service.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 75ee40e30..f90dcd968 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -477,6 +477,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Console\\Commands\\UpdateMoonRental' => __DIR__ . '/../..' . '/app/Console/Commands/Moons/UpdateMoonRental.php', 'App\\Console\\Kernel' => __DIR__ . '/../..' . '/app/Console/Kernel.php', 'App\\Exceptions\\Handler' => __DIR__ . '/../..' . '/app/Exceptions/Handler.php', + 'App\\Fleet' => __DIR__ . '/../..' . '/app/Models/SRP/Fleet.php', 'App\\Http\\Controllers\\Auth\\EsiScopeController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/EsiScopeController.php', 'App\\Http\\Controllers\\Auth\\LoginController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/LoginController.php', 'App\\Http\\Controllers\\Contracts\\ContractAdminController' => __DIR__ . '/../..' . '/app/Http/Controllers/Contracts/ContractAdminController.php', @@ -558,6 +559,8 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Models\\Moon\\Moon' => __DIR__ . '/../..' . '/app/Models/Moon/Moon.php', 'App\\Models\\Moon\\OrePrice' => __DIR__ . '/../..' . '/app/Models/Moon/OrePrice.php', 'App\\Models\\Moon\\Price' => __DIR__ . '/../..' . '/app/Models/Moon/Price.php', + 'App\\Models\\SRP\\FleetCommander' => __DIR__ . '/../..' . '/app/Models/SRP/FleetCommander.php', + 'App\\Models\\SRP\\Ship' => __DIR__ . '/../..' . '/app/Models/SRP/Ship.php', 'App\\Models\\ScheduledTask\\ScheduleJob' => __DIR__ . '/../..' . '/app/Models/ScheduledTask/ScheduleJob.php', 'App\\Models\\Stock\\Asset' => __DIR__ . '/../..' . '/app/Models/Stock/Asset.php', 'App\\Models\\Structure\\Service' => __DIR__ . '/../..' . '/app/Models/Structure/Service.php',