drkthunder02/w4rpservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

miscellaneous modifications

Browse Source
This commit is contained in:
drkthunder02
2020-03-03 23:35:52 -06:00
parent 6ffcb83e1e
commit 358a99a8fb
40 changed files with 157 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Console/Commands/Corps/GetCorps.php
View File

@@ -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}/', [

1
app/Console/Commands/Flex/FlexStructureCommand.php
View File

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

6
app/Console/Commands/Library/CommandHelper.php
View File

@@ -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();
}
}

1
app/Console/Commands/Moons/MoonMailer.php
View File

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

1
app/Console/Commands/Moons/UpdateMoonPricing.php
View File

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

8
app/Console/Commands/Users/PurgeUsers.php
View File

@@ -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();
}
}
}

7
app/Http/Controllers/Auth/EsiScopeController.php
View File

@@ -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);
}

1
app/Http/Controllers/Contracts/ContractAdminController.php
View File

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

1
app/Http/Controllers/Contracts/ContractController.php
View File

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

3
app/Http/Controllers/Dashboard/DashboardController.php
View File

@@ -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([

2
app/Http/Controllers/Logistics/FuelController.php
View File

@@ -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() {

41
app/Http/Controllers/Logistics/StructureRequestAdminController.php Normal file
View File

@@ -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');
}
}

42
app/Http/Controllers/Logistics/StructureRequestController.php
View File

@@ -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() {
$reqs = AnchorStructure::all();
//Set the mail delay
$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>";
//Dispatch the mail job
$mail = new JobSendEveMail;
$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);
public function deleteRequest(Request $request) {
$this->validate($request, [
'id' => 'required',
]);
AnchorStructure::where([
'id' => $request->id,
])->delete();
$delay += 15;
}
return redirect('/structures/display/requests');
}

1
app/Http/Controllers/Moons/MoonLedgerController.php
View File

@@ -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

1
app/Http/Controllers/Moons/MoonsAdminController.php
View File

@@ -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

1
app/Http/Controllers/SRP/SRPAdminController.php
View File

@@ -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;

1
app/Http/Controllers/SRP/SRPController.php
View File

@@ -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

48
app/Http/Controllers/Wiki/WikiController.php
View File

@@ -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]);
if(isset($check[0]) && ($check[0]->login === $name)) {
return redirect('/dashboard')->with('error', 'Already registered for the wiki!');
$count = DokuUser::where([
'login' => $name,
])->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]);
$member->uid = $uid[0]->id;
$uid = DokuUser::where([
'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,10 +107,15 @@ 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])) {
return redirect('/dashboard')->with('error', 'Login Not Found!');
}
//Get the password
$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')
->where('login', $name)
->update(['pass' => $password]);
DokuUser::where([
'login' => $name,
])->update([
'pass' => $password,
]);
return redirect('/dashboard')->with('success', 'Password changed successfully. Your username is: ' . $name);
}

1
app/Library/Assets/AssetHelper.php
View File

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

1
app/Library/Esi/Esi.php
View File

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

4
app/Library/Finances/AllianceMarketTax.php
View File

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

1
app/Library/Finances/Helper/FinanceHelper.php
View File

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

1
app/Library/Finances/JumpBridgeTax.php
View File

@@ -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)

4
app/Library/Finances/OfficeFee.php
View File

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

12
app/Library/Finances/PISale.php
View File

@@ -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

4
app/Library/Finances/PlanetProductionTax.php
View File

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

4
app/Library/Finances/PlayerDonation.php
View File

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

3
app/Library/Finances/ReprocessingTax.php
View File

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

3
app/Library/Finances/StructureIndustryTax.php
View File

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

1
app/Library/Lookups/LookupHelper.php
View File

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

1
app/Library/Moons/MiningLedgerHelper.php
View File

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

1
app/Library/SRP/SRPHelper.php
View File

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

1
app/Library/Structures/StructureHelper.php
View File

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

3
app/Library/Taxes/TaxesHelper.php
View File

@@ -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;

6
app/Providers/AuthServiceProvider.php
View File

@@ -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()
{
//
}

6
app/Providers/RouteServiceProvider.php
View File

@@ -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
//$this->mapApiRoutes();
//Map the web routes
$this->mapWebRoutes();
//
}
/**

2
config/app.php
View File

@@ -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...

5
config/auth.php
View File

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

4
resources/views/layouts/navbar.blade.php
View File

@@ -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'))
@if(auth()->user()->hasPermission('corp.lead') && auth()->user()->hasEsiScope('esi-industry.read_corporation_mining.v1'))
<a class="dropdown-item" href="/moons/ledger/display/select">Mining Ledger</a>
@endif
</div>

20
routes/web.php
View File

@@ -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
*/