FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backend changes separating id from pilot_id

Browse Source
This commit is contained in:
Nabeel Shahzad
2019-07-16 13:54:14 -04:00
parent 454776ecd4
commit 3e1d9080df
21 changed files with 454 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Admin/UserController.php
View File

@@ -292,7 +292,7 @@ class UserController extends Controller
public function regen_apikey($id, Request $request)
{
$user = User::find($id);
Log::info('Regenerating API key "'.$user->pilot_id.'"');
Log::info('Regenerating API key "'.$user->ident.'"');
$user->api_key = Utils::generateApiKey();
$user->save();

2
app/Http/Controllers/Api/AcarsController.php
View File

@@ -131,7 +131,7 @@ class AcarsController extends Controller
$this->checkCancelled($pirep);
Log::debug(
'Posting ACARS update (user: '.Auth::user()->pilot_id.', pirep id :'.$id.'): ',
'Posting ACARS update (user: '.Auth::user()->ident.', pirep id :'.$id.'): ',
$request->post()
);

2
app/Http/Controllers/Auth/LoginController.php
View File

@@ -49,7 +49,7 @@ class LoginController extends Controller
// TODO: How to handle ON_LEAVE?
if ($user->state !== UserState::ACTIVE) {
Log::info('Trying to login '.$user->pilot_id.', state '
Log::info('Trying to login '.$user->ident.', state '
.UserState::label($user->state));
// Log them out

6
app/Http/Controllers/Frontend/ProfileController.php
View File

@@ -133,7 +133,7 @@ class ProfileController extends Controller
]);
if ($validator->fails()) {
Log::info('validator failed for user '.$user->pilot_id);
Log::info('validator failed for user '.$user->ident);
Log::info($validator->errors()->toArray());
return redirect(route('frontend.profile.edit', $id))
@@ -153,7 +153,7 @@ class ProfileController extends Controller
}
if ($request->hasFile('avatar')) {
$avatar = $request->file('avatar');
$file_name = $user->pilot_id.'.'.$avatar->getClientOriginalExtension();
$file_name = $user->ident.'.'.$avatar->getClientOriginalExtension();
$path = "avatars/{$file_name}";
// Create the avatar, resizing it and keeping the aspect ratio.
@@ -189,7 +189,7 @@ class ProfileController extends Controller
public function regen_apikey(Request $request)
{
$user = User::find(Auth::user()->id);
Log::info('Regenerating API key "'.$user->pilot_id.'"');
Log::info('Regenerating API key "'.$user->ident.'"');
$user->api_key = Utils::generateApiKey();
$user->save();