miscellaneous modifications

app/Console/Commands/Corps/GetCorps.php

@@ -4,7 +4,6 @@ namespace App\Console\Commands;
 
 //Internal Library
 use Illuminate\Console\Command;
-use DB;
 use Commands\Library\CommandHelper;
 
 //Models
@@ -67,7 +66,9 @@ class GetCorpsCommand extends Command
             dd($e->getEsiResponse());
         }
         //Delete all of the entries in the AllianceCorps table
-        DB::table('AllianceCorps')->delete();
+        AllianceCorp::truncate();
+
+        //Foreach corporation, make entries into the database.
         foreach($corporations as $corp) {
             try {
                 $corpInfo = $esi->invoke('get', '/corporations/{corporation_id}/', [

app/Console/Commands/Flex/FlexStructureCommand.php

@@ -5,7 +5,6 @@ namespace App\Console\Commands;
 //Internal Library
 use Illuminate\Console\Command;
 use Carbon\Carbon;
-use DB;
 
 //Jobs
 use App\Jobs\ProcessSendEveMailJob;

app/Console/Commands/Library/CommandHelper.php

@@ -3,7 +3,6 @@
 namespace Commands\Library;
 
 //Internal Libraries
-use DB;
 use Carbon\Carbon;
 
 //Models
@@ -32,7 +31,7 @@ class CommandHelper {
 
     public function SetStopStatus() {
         //Mark the job as finished
-        DB::table('schedule_jobs')->where([
+        ScheduleJob::where([
             'system_time' => $this->system_time,
             'job_name' => $this->job_name,
         ])->update([
@@ -41,7 +40,8 @@ class CommandHelper {
     }
 
     public function CleanJobStatusTable() {
-        DB::table('schedule_jobs')->where('system_time', '<', Carbon::now()->subMonths(3))->delete();
+        //Delete old jobs
+        ScheduleJob::where(['system_time', '<', Carbon::now()->subMonths(3)])->delete();
     }
 }
 

app/Console/Commands/Moons/MoonMailer.php

@@ -4,7 +4,6 @@ namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
 use Carbon\Carbon;
-use DB;
 
 //Jobs
 use App\Jobs\ProcessSendEveMailJob;

app/Console/Commands/Moons/UpdateMoonPricing.php

@@ -3,7 +3,6 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
-use DB;
 use Carbon\Carbon;
 use Commands\Library\CommandHelper;
 

app/Console/Commands/Users/PurgeUsers.php

@@ -176,6 +176,14 @@ class PurgeUsers extends Command
                             User::where([
                                 'character_id' => $user->character_id,
                             ])->delete();
+
+                            EsiScope::where([
+                                'character_id' => $user->character_id,
+                            ])->delete();
+
+                            EsiToken::where([
+                                'character_id' => $user->character_id,
+                            ])->delete();
                         }
                     }
                 }

app/Http/Controllers/Auth/EsiScopeController.php

@@ -4,8 +4,6 @@ namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-
-use DB;
 use Socialite;
 use Auth;
 
@@ -20,7 +18,10 @@ class EsiScopeController extends Controller
 
     public function displayScopes() {
         //Get the ESI Scopes for the user
-        $scopes = DB::table('EsiScopes')->where('character_id', Auth::user()->character_id)->get();
+        $scopes = EsiScope::where([
+            'character_id' => Auth::user()->character_id,
+        ])->get();
+
         return view('scopes.select')->with('scopes', $scopes);
     }
 

app/Http/Controllers/Contracts/ContractAdminController.php

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Contracts;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use DB;
 use Carbon\Carbon;
 
 //Libraries

app/Http/Controllers/Contracts/ContractController.php

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Contracts;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use DB;
 use Carbon\Carbon;
 
 //Libraries

app/Http/Controllers/Dashboard/DashboardController.php

@@ -49,9 +49,6 @@ class DashboardController extends Controller
             'main_id' => auth()->user()->character_id,
         ])->count();
 
-        //Temporary Measure to keep the page working properly
-        //$altCount = 0;
-
         //If the alt count is greater than 0 get all of the alt accounts
         if($altCount > 0) {
             $alts = UserAlt::where([

app/Http/Controllers/Logistics/FuelController.php

@@ -23,7 +23,7 @@ class FuelController extends Controller
 {
     public function __construct() {
         $this->middleware('auth');
-        $this->middleware('permission:logistics.manager');
+        $this->middleware('role:User');
     }
 
     public function displayStructures() {

app/Http/Controllers/Logistics/StructureRequestAdminController.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Http\Controllers\Logistics;
+
+//Internal Libraries
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Log;
+
+//Jobs
+use App\Jobs\ProcessSendEveMailJob;
+
+//Models
+use App\Models\Logistics\AnchorStructure;
+use App\Models\Jobs\JobSendEveMail;
+
+class StructureRequestAdminController extends Controller
+{
+    public function __construct() {
+        $this->middleware('auth');
+        $this->middleware('permission:fc.team');
+    }
+
+    public function displayRequests() {
+        $reqs = AnchorStructure::all();
+
+        return view('structurerequest.display.structurerequests')->with('reqs', $reqs);
+    }
+
+    public function deleteRequest(Request $request) {
+        $this->validate($request, [
+            'id' => 'required',
+        ]);
+
+        AnchorStructure::where([
+            'id' => $request->id,
+        ])->delete();
+
+        return redirect('/structures/display/requests');
+    }
+}

app/Http/Controllers/Logistics/StructureRequestController.php

@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Logistics;
 //Internal Libraries
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use DB;
 use Log;
 
 //Jobs
@@ -16,13 +15,14 @@ use App\Library\Lookups\LookupHelper;
 
 //Models
 use App\Models\Logistics\AnchorStructure;
-use App\Models\Mail\SentMail;
 use App\Models\Jobs\JobSendEveMail;
+use App\Models\User\UserPermission;
 
 class StructureRequestController extends Controller
 {
     public function __construct() {
         $this->middleware('auth');
+        $this->middleware('role:User');
     }
 
     public function displayForm() {
@@ -41,6 +41,8 @@ class StructureRequestController extends Controller
 
         $lookup = new LookupHelper;
 
+        $config = config('esi');
+
         $requesterId = $lookup->CharacterNameToId($request->requester);
         $corporationId = $lookup->CorporationNameToId($request->corporation_name);
         
@@ -55,23 +57,31 @@ class StructureRequestController extends Controller
             'requester' => $request->requester,
         ]);
 
-        return redirect('/structures/display/requests');
+        //Send a mail out to the FC Team
-    }
+        $fcTeam = UserPermission::where([
+            'permission' => 'fc.team',
+        ])->get();
 
-    public function displayRequests() {
+        //Set the mail delay
-        $reqs = AnchorStructure::all();
+        $delay = 5;
 
-        return view('structurerequest.display.structurerequests')->with('reqs', $reqs);
+        foreach($fcTeam as $fc) {
-    }
+            $body = "Structure Anchor Request has been entered.<br>";
+            $body .= "Please check the W4RP Services Site for the structure information.<br>";
+            $body .= "<br>Sincerely,<br>";
+            $body .= "Warped Intentions Leadership<br>";
             
-    public function deleteRequest(Request $request) {
+            //Dispatch the mail job
-        $this->validate($request, [
+            $mail = new JobSendEveMail;
-            'id' => 'required',
+            $mail->sender = $config['primary'];
-        ]);
+            $mail->subject = "New Structure Anchor Request";
+            $mail->body = $body;
+            $mail->recipient = (int)$fc->character_id;
+            $mail->recipient_type = 'character';
+            ProcessSendEveMailJob::dispatch($mail)->onQueue('mail')->delay($delay);
 
-        AnchorStructure::where([
+            $delay += 15;
-            'id' => $request->id,
+        }
-        ])->delete();
 
         return redirect('/structures/display/requests');
     }

app/Http/Controllers/Moons/MoonLedgerController.php

@@ -6,7 +6,6 @@ namespace App\Http\Controllers\Moons;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Log;
-use DB;
 use Carbon\Carbon;
 
 //App Library

app/Http/Controllers/Moons/MoonsAdminController.php

@@ -6,7 +6,6 @@ namespace App\Http\Controllers\Moons;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Auth;
-use DB;
 use Carbon\Carbon;
 
 //Models

app/Http/Controllers/SRP/SRPAdminController.php

@@ -5,7 +5,6 @@ namespace App\Http\Controllers\SRP;
 //Laravel Libraries
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use DB;
 use Auth;
 use Khill\Lavacharts\Lavacharts;
 use Carbon\Carbon;

app/Http/Controllers/SRP/SRPController.php

@@ -5,7 +5,6 @@ namespace App\Http\Controllers\SRP;
 //Laravel Libraries
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use DB;
 use Auth;
 
 //User Libraries

app/Http/Controllers/Wiki/WikiController.php

@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Wiki;
 //Laravel libraries
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use DB;
 use Auth;
 
 //User Libraries
@@ -33,9 +32,19 @@ class WikiController extends Controller
         $name = str_replace(' ', '_', $name);
 
         //Check to see if the user is already registered in the database
-        $check = DB::select('SELECT login FROM wiki_user WHERE login = ?', [$name]);
+        $count = DokuUser::where([
-        if(isset($check[0]) && ($check[0]->login === $name)) {
+            'login' => $name,
-            return redirect('/dashboard')->with('error', 'Already registered for the wiki!');            
+        ])->count();
+
+        //If the count is greater than zero, also check the login name as a reference
+        if($count > 0) {
+            $check = DokuUser::where([
+                'login' => $name,
+            ])->first();
+
+            if($check->login === $name) {
+                return redirect('/dashboard')->with('error', 'Already registered for the wiki!');
+            }
         }
 
         return view('wiki.user.register')->with('name', $name);
@@ -80,11 +89,16 @@ class WikiController extends Controller
         $user->save();
 
         //Get the user from the table to get the uid
-        $uid = DB::select('SELECT id FROM wiki_user WHERE login = ?', [$name]);
+        $uid = DokuUser::where([
-        $member->uid = $uid[0]->id;
+            'login' => $name,
+        ])->first();
+
+        //Save information in the model
+        $member->uid = $uid->id;
         $member->gid = $role;
         $member->groupname = $roleDescription;
         $member->save();
+
         //Return to the dashboard view
         return redirect('/dashboard')->with('success', 'Registration successful.  Your username is: ' . $name);
     }
@@ -93,9 +107,14 @@ class WikiController extends Controller
         $name = Auth::user()->name;
         $name = strtolower($name);
         $name = str_replace(' ', '_', $name);
-        $check = DB::select('SELECT login FROM wiki_user WHERE login = ?', [$name]);
+
-        if(!isset($check[0])) {
+        //Get the password
-            return redirect('/dashboard')->with('error', 'Login Not Found!');
+        $check = DokuUser::where([
+            'login' => $name
+        ])->count();
+
+        if($check == 0) {
+            return redirect('/dashboard')->with('error', 'Login Not Found');
         }
 
         return view('wiki.user.changepassword')->with('name', $name);
@@ -120,10 +139,13 @@ class WikiController extends Controller
         $name = Auth::user()->name;
         $name = strtolower($name);
         $name = str_replace(' ', '_', $name);
+
         //Update the password for the login name
-        DB::table('wiki_user')
+        DokuUser::where([
-            ->where('login', $name)
+            'login' => $name,
-            ->update(['pass' => $password]);
+        ])->update([
+            'pass' => $password,
+        ]);
 
         return redirect('/dashboard')->with('success', 'Password changed successfully.  Your username is: ' . $name);
     }

app/Library/Assets/AssetHelper.php

@@ -4,7 +4,6 @@ namespace App\Library\Assets;
 
 //Internal Library
 use Log;
-use DB;
 use Carbon\Carbon;
 
 //App Library

app/Library/Esi/Esi.php

@@ -3,7 +3,6 @@
 namespace App\Library\Esi;
 
 //Internal Libraries
-use DB;
 use Carbon\Carbon;
 
 //Models

app/Library/Finances/AllianceMarketTax.php

@@ -7,10 +7,10 @@
 
 namespace App\Library\Finances;
 
-use DB;
+//Library
-
 use App\Library\Esi\Esi;
 
+//Models
 use App\Models\Finances\AllianceMarketJournal;
 
 class AllianceMarketTax {

app/Library/Finances/Helper/FinanceHelper.php

@@ -8,7 +8,6 @@
 namespace App\Library\Finances\Helper;
 
 //Internal Library
-use DB;
 use Log;
 
 //Job

app/Library/Finances/JumpBridgeTax.php

@@ -96,6 +96,7 @@ class JumpBridgeTax {
      * Returns a specific briddge usage statistics for overall usage
      */
     public function JBOverallUsage($structure) {
+        
         $usage = DB::table('jump_bridge_journal')
                     ->select('amount')
                     ->where('context_id', $structure)

app/Library/Finances/OfficeFee.php

@@ -7,10 +7,10 @@
 
 namespace App\Library\Finances;
 
-use DB;
+//Library
-
 use App\Library\Esi\Esi;
 
+//Models
 use App\Models\Finances\OfficeFeesJournal;
 
 class OfficeFee {

app/Library/Finances/PISale.php

@@ -5,15 +5,15 @@
  * GNU Public License
  */
 
- namespace App\Library\Finances;
+namespace App\Library\Finances;
 
- use DB;
+//Library
+use App\Library\Esi\Esi;
 
- use App\Library\Esi\Esi;
+//Models
+use App\Models\Finances\PISaleJournal;
 
- use App\Models\Finances\PISaleJournal;
+class PISale {
-
- class PISale {
     
     public function InsertPISale($journal, $corpId) {
         //Create the ESI Helper class

app/Library/Finances/PlanetProductionTax.php

@@ -7,10 +7,10 @@
 
 namespace App\Library\Finances;
 
-use DB;
+//Library
-
 use App\Library\Esi\Esi;
 
+//Models
 use App\Models\Finances\PlanetProductionTaxJournal;
 
 class PlanetProductionTax {

app/Library/Finances/PlayerDonation.php

@@ -7,10 +7,10 @@
 
 namespace App\Library\Finances;
 
-use DB;
+//Library
-
 use App\Library\Esi\Esi;
 
+//Models
 use App\Models\Finances\PlayerDonationJournal;
 
 class PlayerDonation {

app/Library/Finances/ReprocessingTax.php

@@ -7,9 +7,10 @@
 
 namespace App\Library\Finances;
 
-use DB;
+//Library
 use App\Library\Esi\Esi;
 
+//Models
 use App\Models\Finances\ReprocessingTaxJournal;
 
 class ReprocessingTax {

app/Library/Finances/StructureIndustryTax.php

@@ -7,9 +7,10 @@
 
 namespace App\Library\Finances;
 
-use DB;
+//Library
 use App\Library\Esi\Esi;
 
+//Models
 use App\Models\Finances\StructureIndustryTaxJournal;
 
 class StructureIndustryTax {

app/Library/Lookups/LookupHelper.php

@@ -3,7 +3,6 @@
 namespace App\Library\Lookups;
 
 //Internal Libraries
-use DB;
 use Log;
 
 //Seat Stuff

app/Library/Moons/MiningLedgerHelper.php

@@ -10,7 +10,6 @@ namespace App\Library\Moons;
 
 //Internal Library
 use Log;
-use DB;
 
 //App Library
 use Seat\Eseye\Exceptions\RequestFailedException;

app/Library/SRP/SRPHelper.php

@@ -3,7 +3,6 @@
 namespace App\Library\SRP;
 
 //Internal Libraries
-use DB;
 use Carbon\Carbon;
 
 //Models

app/Library/Structures/StructureHelper.php

@@ -11,7 +11,6 @@ namespace App\Library\Structures;
 
 //Internal Library
 use Log;
-use DB;
 
 //App Library
 use App\Jobs\Library\JobHelper;

app/Library/Taxes/TaxesHelper.php

@@ -2,9 +2,10 @@
 
 namespace App\Library\Taxes;
 
-use DB;
+//Internal Library
 use Carbon\Carbon;
 
+//Models
 use App\Models\User\User;
 use App\Models\User\UserRole;
 use App\Models\User\UserPermission;

app/Providers/AuthServiceProvider.php

@@ -3,12 +3,8 @@
 namespace App\Providers;
 
 use Illuminate\Support\Facades\Gate;
-use Illuminate\Contracts\Auth\Access\Gate as GateContract;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 
-use DB;
-use App\Models\User\UserPermission;
-
 class AuthServiceProvider extends ServiceProvider
 {
     /**
@@ -27,7 +23,7 @@ class AuthServiceProvider extends ServiceProvider
      *
      * @return void
      */
-    public function boot(GateContract $gate)
+    public function boot()
     {
         //
     }

app/Providers/RouteServiceProvider.php

@@ -35,12 +35,8 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function map()
     {
-        //Don't want to map Api Routes as we aren't going to be using an API
+        //Map the web routes
-        //$this->mapApiRoutes();
-
         $this->mapWebRoutes();
-
-        //
     }
 
     /**

config/app.php

@@ -151,10 +151,8 @@ return [
          * Package Service Providers...
          */
         Collective\Html\HtmlServiceProvider::class,
-        //nullx27\Socialite\EveOnline\Providers\EveOnlineServiceProvider::class,
         Laravel\Socialite\SocialiteServiceProvider::class,
         Khill\Lavacharts\Laravel\LavachartsServiceProvider::class,
-        //ConsoleTVs\Charts\ChartsServiceProvider::class,
 
         /*
          * Application Service Providers...

config/auth.php

@@ -69,11 +69,6 @@ return [
             'driver' => 'eloquent',
             'model' => App\Models\User\User::class,
         ],
-
-        // 'users' => [
-        //     'driver' => 'database',
-        //     'table' => 'users',
-        // ],
     ],
 
     /*

resources/views/layouts/navbar.blade.php

@@ -9,13 +9,11 @@
             <li class="nav-item dropdown">
                 <a class="nav-link dropdown-toggle" href="#" id="navbarDropdoownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Moons</a>
                 <div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
-                    @if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Admin') || auth()->user()->hasRole('Renter'))
                     <a class="dropdown-item" href="/moons/display/all">Display All Moons</a>
                     <a class="dropdown-item" href="/moons/display/rentals">Display Rental Moons</a>
                     <a class="dropdown-item" href="/moons/display/form/worth">Moon Worth</a>
                     <a class="dropdown-item" href="/moons/display/request">Moon Reservation</a>
-                    @endif
+                    @if(auth()->user()->hasPermission('corp.lead') && auth()->user()->hasEsiScope('esi-industry.read_corporation_mining.v1'))
-                    @if(auth()->user()->hasPermission('corp.lead'))
                     <a class="dropdown-item" href="/moons/ledger/display/select">Mining Ledger</a>
                     @endif
                 </div>

routes/web.php

@@ -58,14 +58,6 @@ Route::group(['middleware' => ['auth']], function(){
     Route::get('/ajax', 'Ajax\LiveSearch@index');
     Route::post('/ajax/action', 'Ajax\LiveSearch@action')->name('live_search.action');
 
-    /**
-     * Anchor Structure Controller display pages
-     */
-    Route::get('/structures/display/requests', 'Logistics\StructureRequestController@displayRequests');
-    Route::post('/structures/display/requests/delete', 'Logistics\StructureRequestController@deleteRequest');
-    Route::get('/structures/display/form', 'Logistics\StructureRequestController@displayForm');
-    Route::post('/structures/display/form', 'Logistics\StructureRequestController@storeForm');
-
     /**
      * Blacklist Controller display pages
      */
@@ -174,6 +166,18 @@ Route::group(['middleware' => ['auth']], function(){
     Route::post('/srp/admin/costcodes/modify', 'SRP\SRPAdminController@modifyCostCodes');
     Route::get('/srp/admin/display/history', 'SRP\SRPAdminController@displayHistory');
 
+    /**
+     * Structure Request Controller display pages
+     */
+    Route::get('/structures/display/form', 'Logistics\StructureRequestController@displayForm');
+    Route::post('/structures/display/form', 'Logistics\StructureRequestController@storeForm');
+
+    /**
+     * Structure Request Admin Controller display pages
+     */
+    Route::get('/structures/display/requests', 'Logistics\StructureRequestAdminController@displayRequests');
+    Route::post('/structures/display/requests/delete', 'Logistics\StructureRequestAdminController@deleteRequest');
+
     /**
      * Test Controller display pages
      */