cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply fixes from StyleCI

Browse Source
This commit is contained in:
StyleCI Bot
2023-01-06 13:07:26 +00:00
parent 88642f7ecd
commit 168656e3aa
235 changed files with 14818 additions and 14426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
app/Http/Controllers/Auth/AuthController.php
View File

@@ -57,8 +57,9 @@ class AuthController extends Controller
/**
* Create a new authentication controller instance.
*
* @param \Illuminate\Contracts\Auth\Guard $auth
* @param \Illuminate\Contracts\Auth\Registrar $registrar
* @param \Illuminate\Contracts\Auth\Guard $auth
* @param \Illuminate\Contracts\Auth\Registrar $registrar
*
* @return void
*/
public function __construct()
@@ -94,21 +95,21 @@ class AuthController extends Controller
if ($user->nickname) {
$username = $user->nickname;
}
if (! $first_name) {
if (!$first_name) {
$first_name = $username;
}
$data = [
'first_name' => $first_name,
'email' => $user->getEmail(),
'user_name' => $username,
'role' => 'user',
'active' => 1,
'email' => $user->getEmail(),
'user_name' => $username,
'role' => 'user',
'active' => 1,
];
$user = User::where('email', $data['email'])->first();
if (! $user) {
if (!$user) {
$user = User::where('user_name', $data['user_name'])->first();
}
if (! $user) {
if (!$user) {
$user = User::firstOrCreate($data);
}
Auth::login($user);
@@ -148,6 +149,7 @@ class AuthController extends Controller
*
* @param type User $user
* @param type RegisterRequest $request
*
* @return type Response
*/
public function postRegister(User $user, RegisterRequest $request, $api = false)
@@ -164,12 +166,12 @@ class AuthController extends Controller
} else {
$user->email = $request->input('email');
}
if (! checkArray('mobile', $request_array)) {
if (!checkArray('mobile', $request_array)) {
$user->mobile = null;
} else {
$user->mobile = $request->input('mobile');
}
if (! checkArray('code', $request_array)) {
if (!checkArray('code', $request_array)) {
$user->country_code = 0;
} else {
$user->country_code = $request->input('code');
@@ -225,7 +227,8 @@ class AuthController extends Controller
/**
* Function to activate account.
*
* @param type $token
* @param type $token
*
* @return type redirect
*/
public function accountActivate($token)
@@ -246,8 +249,9 @@ class AuthController extends Controller
/**
* Get mail function.
*
* @param type $token
* @param type $token
* @param type User $user
*
* @return type Response
*/
public function getMail($token, User $user)
@@ -290,6 +294,7 @@ class AuthController extends Controller
* Post of login page.
*
* @param type LoginRequest $request
*
* @return type Response
*/
public function postLogin(LoginRequest $request)
@@ -316,15 +321,15 @@ class AuthController extends Controller
}
$check_active = User::where('email', '=', $request->input('email'))->orwhere('user_name', '=', $request->input('email'))->first();
if (! $check_active) { //check if user exists or not
if (!$check_active) { //check if user exists or not
//if user deos not exist then return back with error that user is not registered
return redirect()->back()
->withInput($request->only('email', 'remember'))
->withErrors([
'email' => $this->getFailedLoginMessage(),
'password' => $this->getFailedLoginMessage(),
'email' => $this->getFailedLoginMessage(),
'password' => $this->getFailedLoginMessage(),
])->with(['error' => Lang::get('lang.not-registered'),
'referer' => $referer, ]);
'referer' => $referer, ]);
}
//if user exists
@@ -337,17 +342,17 @@ class AuthController extends Controller
// plugin is installed
if ($sms->status == 1 || $sms->status === '1') { //check plugin is active or not
// plugin is active
if (! $check_active->active) { //check account is active or not
if (!$check_active->active) { //check account is active or not
// account is not active show verify otp window
if ($check_active->mobile) { //check user has mobile or not
// user has mobile number return verify OTP screen
return \Redirect::route('otp-verification')
->withInput($request->input())
->with(['values' => $request->input(),
'referer' => $referer,
'name' => $check_active->first_name,
'number' => $check_active->mobile,
'code' => $check_active->country_code, ]);
'referer' => $referer,
'name' => $check_active->first_name,
'number' => $check_active->mobile,
'code' => $check_active->country_code, ]);
} else {
goto a; //attenmpt login (be careful while using goto statements)
}
@@ -362,15 +367,15 @@ class AuthController extends Controller
}
} else {
// setting is disabled
a: if (! $check_active->active) { //check account is active or not
a: if (!$check_active->active) { //check account is active or not
// if accoutn is not active return back with error message that account is inactive
return redirect()->back()
->withInput($request->only('email', 'remember'))
->withErrors([
'email' => $this->getFailedLoginMessage(),
'password' => $this->getFailedLoginMessage(),
'email' => $this->getFailedLoginMessage(),
'password' => $this->getFailedLoginMessage(),
])->with(['error' => Lang::get('lang.this_account_is_currently_inactive'),
'referer' => $referer, ]);
'referer' => $referer, ]);
} else {
// try login
$loginAttempts = 1;
@@ -416,10 +421,10 @@ class AuthController extends Controller
return redirect()->back()
->withInput($request->only('email', 'remember'))
->withErrors([
'email' => $this->getFailedLoginMessage(),
'password' => $this->getFailedLoginMessage(),
'email' => $this->getFailedLoginMessage(),
'password' => $this->getFailedLoginMessage(),
])->with(['error' => Lang::get('lang.invalid'),
'referer' => $referer, ]);
'referer' => $referer, ]);
// Increment login attempts
} catch (\Exception $e) {
return redirect()->back()->with('fails', $e->getMessage());
@@ -430,6 +435,7 @@ class AuthController extends Controller
* Add login attempt.
*
* @param type IPaddress $value
*
* @return type Response
*/
public function addLoginAttempt($value, $field)
@@ -457,6 +463,7 @@ class AuthController extends Controller
* Clear login attempt.
*
* @param type IPaddress $value
*
* @return type Response
*/
public function clearLoginAttempts($value, $field)
@@ -470,6 +477,7 @@ class AuthController extends Controller
* Confiem IP.
*
* @param type IPaddress $value
*
* @return type Response
*/
public function confirmIPAddress($value, $field)
@@ -482,7 +490,7 @@ class AuthController extends Controller
' FROM '.$table." WHERE IP = '$value' OR User = '$field'");
$data = $result;
//Verify that at least one login attempt is in database
if (! $data) {
if (!$data) {
return 0;
}
if ($data[0]->Attempts >= $max_attempts) {
@@ -512,6 +520,7 @@ class AuthController extends Controller
* @category function to show verify OTP page
*
* @param null
*
* @return response|view
*/
public function getVerifyOTP()
@@ -527,6 +536,7 @@ class AuthController extends Controller
* @category function to verify OTP
*
* @param $request
*
* @return int|string
*/
public function verifyOTP(LoginRequest $request)
@@ -534,13 +544,13 @@ class AuthController extends Controller
$user = User::select('id', 'mobile', 'user_name')->where('email', '=', $request->input('email'))
->orWhere('user_name', '=', $request->input('email'))->first();
$otp_length = strlen($request->input('otp'));
if (! \Schema::hasTable('user_verification')) {
if (!\Schema::hasTable('user_verification')) {
$message = Lang::get('lang.opt-can-not-be-verified');
} else {
$otp = Otp::select('otp', 'updated_at')->where('user_id', '=', $user->id)
->first();
if ($otp != null) {
if (($otp_length == 6 && ! preg_match('/[a-z]/i', $request->input('otp')))) {
if (($otp_length == 6 && !preg_match('/[a-z]/i', $request->input('otp')))) {
$otp2 = Hash::make($request->input('otp'));
$date1 = date_format($otp->updated_at, 'Y-m-d h:i:sa');
$date2 = date('Y-m-d h:i:sa');
@@ -573,14 +583,14 @@ class AuthController extends Controller
return \Redirect::route('otp-verification')
->withInput($request->input())
->with(['values' => $request->input(),
'number' => $user->mobile,
'name' => $user->user_name,
'fails' => $message, ]);
'number' => $user->mobile,
'name' => $user->user_name,
'fails' => $message, ]);
}
public function resendOTP(OtpVerifyRequest $request)
{
if (! \Schema::hasTable('user_verification') || ! \Schema::hasTable('sms')) {
if (!\Schema::hasTable('user_verification') || !\Schema::hasTable('sms')) {
$message = Lang::get('lang.opt-can-not-be-verified');
return $message;
@@ -601,7 +611,8 @@ class AuthController extends Controller
/**
* @category function to change ticket status when user verifies his account
*
* @param int $id => user_id
* @param int $id => user_id
*
* @return null
*
* @author manish.verma@ladybirdweb.com

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

@@ -39,7 +39,8 @@ class ForgotPasswordController extends Controller
/**
* Send a reset link to the given user.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
*
* @return \Illuminate\Http\RedirectResponse
*/
public function sendResetLinkEmail(Request $request)
@@ -69,10 +70,10 @@ class ForgotPasswordController extends Controller
$name = $user->user_name;
}
$value = [
'url' => url('password/reset/'.$code),
'name' => $name,
'url' => url('password/reset/'.$code),
'name' => $name,
'mobile' => $user->mobile,
'code' => $user->country_code, ];
'code' => $user->country_code, ];
event('reset.password2', [$value]);
}

9
app/Http/Controllers/Auth/PasswordController.php
View File

@@ -76,10 +76,10 @@ class PasswordController extends Controller
$name = $user->user_name;
}
$value = [
'url' => url('password/reset/'.$code),
'name' => $name,
'url' => url('password/reset/'.$code),
'name' => $name,
'mobile' => $user->mobile,
'code' => $user->country_code, ];
'code' => $user->country_code, ];
event('reset.password2', [$value]);
}
@@ -95,7 +95,8 @@ class PasswordController extends Controller
/**
* Reset the given user's password.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
*
* @return \Illuminate\Http\Response
*/
public function reset(Request $request)

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

@@ -43,14 +43,15 @@ class RegisterController extends Controller
/**
* Get a validator for an incoming registration request.
*
* @param array $data
* @param array $data
*
* @return \Illuminate\Contracts\Validation\Validator
*/
protected function validator(array $data)
{
return Validator::make($data, [
'name' => ['required', 'string', 'max:255'],
'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
'name' => ['required', 'string', 'max:255'],
'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
'password' => ['required', 'string', 'min:6', 'confirmed'],
]);
}
@@ -58,14 +59,15 @@ class RegisterController extends Controller
/**
* Create a new user instance after a valid registration.
*
* @param array $data
* @param array $data
*
* @return \App\User
*/
protected function create(array $data)
{
return User::create([
'name' => $data['name'],
'email' => $data['email'],
'name' => $data['name'],
'email' => $data['email'],
'password' => Hash::make($data['password']),
]);
}

9
app/Http/Controllers/Auth/UserController.php
View File

@@ -54,6 +54,7 @@ class UserController extends Controller
* Display a listing of the resource.
*
* @param type User $user
*
* @return type Response
*/
public function index()
@@ -156,6 +157,7 @@ class UserController extends Controller
*
* @param type User $user
* @param type Sys_userRequest $request
*
* @return type Response
*/
public function store(User $user, Sys_userRequest $request)
@@ -189,6 +191,7 @@ class UserController extends Controller
*
* @param type int $id
* @param type User $user
*
* @return type Response
*/
public function show($id, User $user)
@@ -208,6 +211,7 @@ class UserController extends Controller
*
* @param type int $id
* @param type User $user
*
* @return type Response
*/
public function edit($id, User $user)
@@ -228,6 +232,7 @@ class UserController extends Controller
* @param type int $id
* @param type User $user
* @param type Sys_userUpdate $request
*
* @return type Response
*/
public function update($id, User $user, Sys_userUpdate $request)
@@ -255,6 +260,7 @@ class UserController extends Controller
*
* @param type int $id
* @param type User $user
*
* @return type Response
*/
public function destroy($id, User $user)
@@ -280,7 +286,8 @@ class UserController extends Controller
/**
* User Assign Org.
*
* @param type $id
* @param type $id
*
* @return type boolean
*/
public function UserAssignOrg($id)