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

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