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

Fix formatting and interfaces in nearly every file

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-03-19 20:50:40 -05:00
parent 04c5b9e7bf
commit ccf56ddec1
331 changed files with 3282 additions and 2492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@@ -2,9 +2,13 @@
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Interfaces\Controller;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
/**
* Class ForgotPasswordController
* @package App\Http\Controllers\Auth
*/
class ForgotPasswordController extends Controller
{
use SendsPasswordResetEmails;

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

@@ -2,13 +2,17 @@
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Interfaces\Controller;
use App\Models\Enums\UserState;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log;
/**
* Class LoginController
* @package App\Http\Controllers\Auth
*/
class LoginController extends Controller
{
use AuthenticatesUsers;
@@ -44,17 +48,16 @@ class LoginController extends Controller
$user->save();
// TODO: How to handle ON_LEAVE?
if($user->state !== UserState::ACTIVE) {
Log::info('Trying to login '. $user->pilot_id .', state '
. UserState::label($user->state));
if ($user->state !== UserState::ACTIVE) {
Log::info('Trying to login '.$user->pilot_id.', state '
.UserState::label($user->state));
// Log them out
$this->guard()->logout();
$request->session()->invalidate();
// Redirect to one of the error pages
if($user->state === UserState::PENDING) {
if ($user->state === UserState::PENDING) {
return view('auth.pending');
} elseif ($user->state === UserState::REJECTED) {
return view('auth.rejected');

51
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -3,7 +3,7 @@
namespace App\Http\Controllers\Auth;
use App\Facades\Utils;
use App\Http\Controllers\Controller;
use App\Interfaces\Controller;
use App\Models\Enums\UserState;
use App\Models\User;
use App\Repositories\AirlineRepository;
@@ -16,6 +16,10 @@ use Jackiedo\Timezonelist\Facades\Timezonelist;
use Log;
use Validator;
/**
* Class RegisterController
* @package App\Http\Controllers\Auth
*/
class RegisterController extends Controller
{
use RegistersUsers;
@@ -26,15 +30,15 @@ class RegisterController extends Controller
*/
protected $redirectTo = '/';
protected $airlineRepo,
$airportRepo,
$userService;
private $airlineRepo,
$airportRepo,
$userService;
/**
* RegisterController constructor.
* @param AirlineRepository $airlineRepo
* @param AirportRepository $airportRepo
* @param UserService $userService
* @param UserService $userService
*/
public function __construct(
AirlineRepository $airlineRepo,
@@ -58,25 +62,25 @@ class RegisterController extends Controller
$airlines = $this->airlineRepo->selectBoxList();
return view('auth.register', [
'airports' => $airports,
'airlines' => $airlines,
'airports' => $airports,
'airlines' => $airlines,
'timezones' => Timezonelist::toArray(),
]);
}
/**
* Get a validator for an incoming registration request.
* @param array $data
* @param array $data
* @return \Illuminate\Contracts\Validation\Validator
*/
protected function validator(array $data)
{
$rules = [
'name' => 'required|max:255',
'email' => 'required|email|max:255|unique:users',
'airline_id' => 'required',
'name' => 'required|max:255',
'email' => 'required|email|max:255|unique:users',
'airline_id' => 'required',
'home_airport_id' => 'required',
'password' => 'required|min:5|confirmed',
'password' => 'required|min:5|confirmed',
];
if (config('captcha.enabled')) {
@@ -96,13 +100,13 @@ class RegisterController extends Controller
protected function create(array $data)
{
$opts = [
'name' => $data['name'],
'email' => $data['email'],
'api_key' => Utils::generateApiKey(),
'airline_id' => $data['airline_id'],
'name' => $data['name'],
'email' => $data['email'],
'api_key' => Utils::generateApiKey(),
'airline_id' => $data['airline_id'],
'home_airport_id' => $data['home_airport_id'],
'curr_airport_id' => $data['home_airport_id'],
'password' => Hash::make($data['password'])
'password' => Hash::make($data['password'])
];
$user = User::create($opts);
@@ -122,25 +126,26 @@ class RegisterController extends Controller
public function register(Request $request)
{
$rules = [
'name' => 'required',
'email' => 'required|email|unique:users,email',
'airline_id' => 'required',
'name' => 'required',
'email' => 'required|email|unique:users,email',
'airline_id' => 'required',
'home_airport_id' => 'required',
'password' => 'required|confirmed'
'password' => 'required|confirmed'
];
if(config('captcha.enabled')) {
if (config('captcha.enabled')) {
$rules['g-recaptcha-response'] = 'required|captcha';
}
$this->validate(request(), $rules);
$user = $this->create($request->all());
if($user->state === UserState::PENDING) {
if ($user->state === UserState::PENDING) {
return view('auth.pending');
}
$this->guard()->login($user);
return redirect('/dashboard');
}
}

12
app/Http/Controllers/Auth/ResetPasswordController.php
View File

@@ -2,19 +2,23 @@
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Interfaces\Controller;
use Illuminate\Foundation\Auth\ResetsPasswords;
use Illuminate\Http\Request;
/**
* Class ResetPasswordController
* @package App\Http\Controllers\Auth
*/
class ResetPasswordController extends Controller
{
protected $redirectTo = '/login';
use ResetsPasswords;
protected $redirectTo = '/login';
/**
* @param Request $request
* @param null $token
* @param null $token
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function showResetForm(Request $request, $token = null)