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:
Manish Verma
2016-12-13 13:14:54 +00:00
committed by StyleCI Bot
parent 857d3004eb
commit 88f3df2180
161 changed files with 4729 additions and 3879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Auth;
// controllers
use App\Http\Controllers\Common\PhpMailController;
use App\Http\Controllers\Common\SettingsController;
use App\Http\Controllers\Controller;
// request
use App\User;
@@ -51,41 +50,42 @@ class PasswordController extends Controller
*/
public function postEmail(Request $request)
{
try{
$date = date('Y-m-d H:i:s');
$this->validate($request, ['email' => 'required']);
\Event::fire('reset.password',array());
$user = User::where('email', '=', $request->only('email'))->orWhere('mobile', '=', $request->only('email'))->first();
if (isset($user)) {
$user1 = $user->email;
try {
$date = date('Y-m-d H:i:s');
$this->validate($request, ['email' => 'required']);
\Event::fire('reset.password', []);
$user = User::where('email', '=', $request->only('email'))->orWhere('mobile', '=', $request->only('email'))->first();
if (isset($user)) {
$user1 = $user->email;
//gen new code and pass
$code = str_random(60);
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first();
if (isset($password_reset_table)) {
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]);
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first();
if (isset($password_reset_table)) {
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]);
// $password_reset_table->token = $code;
// $password_reset_table->update(['token' => $code]);
} else {
$create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]);
}
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user->user_name, 'email' => $user->email], $message = ['subject' => 'Your Password Reset Link', 'scenario' => 'reset-password'], $template_variables = ['user' => $user->first_name, 'email_address' => $user->email, 'password_reset_link' => url('password/reset/'.$code)],true);
if ($user->mobile != '' && $user->mobile != null) {
if($user->first_name) {
$name = $user->first_name;
} else {
$name = $user->user_name;
$create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]);
}
$value = [
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user->user_name, 'email' => $user->email], $message = ['subject' => 'Your Password Reset Link', 'scenario' => 'reset-password'], $template_variables = ['user' => $user->first_name, 'email_address' => $user->email, 'password_reset_link' => url('password/reset/'.$code)], true);
if ($user->mobile != '' && $user->mobile != null) {
if ($user->first_name) {
$name = $user->first_name;
} else {
$name = $user->user_name;
}
$value = [
'url' => url('password/reset/'.$code),
'name' => $name,
'mobile' => $user->mobile,
'code' => $user->country_code];
\Event::fire('reset.password2',array($value));
'code' => $user->country_code, ];
\Event::fire('reset.password2', [$value]);
}
return redirect()->back()->with('status', Lang::get('lang.we_have_e-mailed_your_password_reset_link'));
} else {
return redirect()->back()->with('fails', Lang::get("lang.we_can't_find_a_user_with_that_e-mail_address"));
}
return redirect()->back()->with('status', Lang::get('lang.we_have_e-mailed_your_password_reset_link'));
} else {
return redirect()->back()->with('fails', Lang::get("lang.we_can't_find_a_user_with_that_e-mail_address"));
}
} catch (\Exception $e) {
return redirect()->back()->with('fails', $e->getMessage());
}
@@ -94,12 +94,12 @@ 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)
{
$this->validate(
$request,
$this->getResetValidationRules(),
@@ -111,26 +111,25 @@ class PasswordController extends Controller
$email = $credentials['email'];
$password = $credentials['password'];
$token = $credentials['token'];
$response = "fails";
$password_tokens = \DB::table('password_resets')->where('email','=',$email)->first();
if($password_tokens){
if($password_tokens->token == $token){
$response = 'fails';
$password_tokens = \DB::table('password_resets')->where('email', '=', $email)->first();
if ($password_tokens) {
if ($password_tokens->token == $token) {
$users = new User();
$user = $users->where('email',$email)->first();
if($user){
$user = $users->where('email', $email)->first();
if ($user) {
$user->password = \Hash::make($password);
$user->save();
$response = "success";
$response = 'success';
} else {
$response = "fails";
$response = 'fails';
}
}
}
if ($response == "success") {
if ($response == 'success') {
return redirect('/auth/login')->with('status', Lang::get('lang.password-reset-successfully'));
} else {
return redirect('/home')->with('fails', Lang::get('lang.password-can-not-reset'));
}
}
}