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

update v1.0.7.5

Browse Source
This commit is contained in:
Sujit Prasad
2016-06-17 20:28:31 +05:30
parent 7fba00a7a0
commit a3fbf1acd4
150 changed files with 2515 additions and 3697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,7 +97,7 @@ class AuthController extends Controller {
$user->remember_token = $code;
$user->save();
$message12 = "";
$var = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => 'Activate your Account', 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/' . $code)]);
$var = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => null, 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/' . $code)]);
if ($var == null) {
$message12 = Lang::get('lang.failed_to_send_email_contact_administrator');
return redirect('home')->with('warning', $message12);
@@ -259,13 +259,13 @@ class AuthController extends Controller {
if ($data) {
$attempts = $data->Attempts + 1;
if ($attempts == $apt) {
$result = DB::update('UPDATE login_attempts SET Attempts=' . $attempts . ", LastLogin=NOW() WHERE IP = '$value' OR User = '$field'");
$result = DB::select('UPDATE login_attempts SET Attempts=' . $attempts . ", LastLogin=NOW() WHERE IP = '$value' OR User = '$field'");
} else {
$result = DB::table('login_attempts')->where('IP', '=', $value)->orWhere('User', '=', $field)->update(['Attempts' => $attempts]);
// $result = DB::select("UPDATE login_attempts SET Attempts=".$attempts." WHERE IP = '$value' OR User = '$field'");
}
} else {
$result = DB::insert("INSERT INTO login_attempts (Attempts,User,IP,LastLogin) values (1,'$field','$value', NOW())");
$result = DB::select("INSERT INTO login_attempts (Attempts,User,IP,LastLogin) values (1,'$field','$value', NOW())");
}
}

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

@@ -12,14 +12,15 @@ use App\User;
// classes
use Illuminate\Foundation\Auth\ResetsPasswords;
use Illuminate\Http\Request;
use Lang;
/**
* PasswordController.
*
* @author Ladybird <info@ladybirdweb.com>
*/
class PasswordController extends Controller
{
class PasswordController extends Controller {
use ResetsPasswords;
/**
@@ -27,8 +28,7 @@ class PasswordController extends Controller
*
* @return void
*/
public function __construct(PhpMailController $PhpMailController)
{
public function __construct(PhpMailController $PhpMailController) {
$this->PhpMailController = $PhpMailController;
$this->middleware('guest');
SettingsController::smtp();
@@ -39,8 +39,7 @@ class PasswordController extends Controller
*
* @return Response
*/
public function getEmail()
{
public function getEmail() {
return view('auth.password');
}
@@ -49,8 +48,7 @@ class PasswordController extends Controller
*
* @return Response
*/
public function postEmail(Request $request)
{
public function postEmail(Request $request) {
$date = date('Y-m-d H:i:s');
$this->validate($request, ['email' => 'required|email']);
$user = User::where('email', '=', $request->only('email'))->first();
@@ -66,11 +64,12 @@ class PasswordController extends Controller
} 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->user_name, 'email_address' => $user->email, 'password_reset_link' => url('password/reset/'.$code)]);
$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->user_name, 'email_address' => $user->email, 'password_reset_link' => url('password/reset/' . $code)]);
return redirect()->back()->with('status', Lang::get('lang.we_have_e-mailed_your_password_reset_link'));
} else {
return redirect()->back()->with('errors', Lang::get("lang.we_can't_find_a_user_with_that_e-mail_address"));
}
}
}