From 7a66ae93072ec3f2b5cfe4a4838c45e0584471d1 Mon Sep 17 00:00:00 2001 From: Sujit Prasad Date: Wed, 15 Jun 2016 15:27:05 +0530 Subject: [PATCH] update v1.0.7.5 --- .../Updatedatabase.sql | 10 +-- app/Http/Controllers/Auth/AuthController.php | 65 +++++++------------ 2 files changed, 31 insertions(+), 44 deletions(-) diff --git a/DB/update from 1.0.7.4 to 1.0.7.5/Updatedatabase.sql b/DB/update from 1.0.7.4 to 1.0.7.5/Updatedatabase.sql index fa4792f4b..9d9baa77d 100644 --- a/DB/update from 1.0.7.4 to 1.0.7.5/Updatedatabase.sql +++ b/DB/update from 1.0.7.4 to 1.0.7.5/Updatedatabase.sql @@ -580,8 +580,7 @@ INSERT INTO `workflow_close` (`id`, `days`, `condition`, `send_email`, `status`, -- -- Alter Table structure for table `system_settings` -- -ALTER TABLE `settings_system` - ADD `version` varchar(222) NOT NULL AFTER `time_zone`; +ALTER TABLE `settings_system` ADD `version` varchar(222) NOT NULL AFTER `time_zone`; -- -- Dumping data for table `system_settings` @@ -590,8 +589,11 @@ ALTER TABLE `settings_system` UPDATE `settings_system` SET `version`='1.0.7.5' WHERE 1 -ALTER TABLE `settings_ticket` - ADD `lock_ticket_frequency` varchar(222) NOT NULL AFTER `max_file_size`; +ALTER TABLE `settings_ticket` ADD `lock_ticket_frequency` varchar(222) NOT NULL AFTER `max_file_size`; UPDATE `settings_ticket` SET `lock_ticket_frequency`='0' WHERE 1 + +TRUNCATE TABLE `user_notification`; + +TRUNCATE TABLE `notifications`; \ No newline at end of file diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index ba6f58e5f..f7d40c25a 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -29,8 +29,8 @@ use Mail; * * @author Ladybird */ -class AuthController extends Controller -{ +class AuthController extends Controller { + use AuthenticatesAndRegistersUsers; /* to redirect after login */ @@ -50,8 +50,7 @@ class AuthController extends Controller * * @return void */ - public function __construct(PhpMailController $PhpMailController) - { + public function __construct(PhpMailController $PhpMailController) { $this->PhpMailController = $PhpMailController; SettingsController::smtp(); $this->middleware('guest', ['except' => 'getLogout']); @@ -62,8 +61,7 @@ class AuthController extends Controller * * @return type Response */ - public function getRegister() - { + public function getRegister() { // Event for login \Event::fire(new \App\Events\FormRegisterEvent()); if (Auth::user()) { @@ -85,8 +83,7 @@ class AuthController extends Controller * * @return type Response */ - public function postRegister(User $user, RegisterRequest $request) - { + public function postRegister(User $user, RegisterRequest $request) { // Event for login \Event::fire(new \App\Events\LoginEvent($request)); $password = Hash::make($request->input('password')); @@ -99,34 +96,28 @@ class AuthController extends Controller $code = str_random(60); $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)]); + $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)]); if ($var == null) { $message12 = Lang::get('lang.failed_to_send_email_contact_administrator'); - return redirect('home')->with('warning', $message12); } else { $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail'); } - return redirect('home')->with('success', $message12); } /** - * Function to activate account. - * + * Function to activate account * @param type $token - * * @return type redirect */ - public function accountActivate($token) - { + public function accountActivate($token) { $user = User::where('remember_token', '=', $token)->first(); if ($user) { $user->active = 1; - $user->remember_token = null; + $user->remember_token = NULL; $user->save(); - return redirect('/auth/login')->with('status', 'Acount activated. Login to start'); } else { return redirect('/auth/login')->with('fails', 'Invalid Token'); @@ -141,8 +132,7 @@ class AuthController extends Controller * * @return type Response */ - public function getMail($token, User $user) - { + public function getMail($token, User $user) { $user = $user->where('remember_token', $token)->where('active', 0)->first(); if ($user) { $user->active = 1; @@ -159,8 +149,7 @@ class AuthController extends Controller * * @return type Response */ - public function getLogin() - { + public function getLogin() { if (Auth::user()) { if (Auth::user()->role == 'admin' || Auth::user()->role == 'agent') { return \Redirect::route('dashboard'); @@ -179,8 +168,7 @@ class AuthController extends Controller * * @return type Response */ - public function postLogin(LoginRequest $request) - { + public function postLogin(LoginRequest $request) { // Set login attempts and login time $value = $_SERVER['REMOTE_ADDR']; $usernameinput = $request->input('email'); @@ -199,7 +187,7 @@ class AuthController extends Controller return redirect()->back() ->withInput($request->only('email', 'remember')) ->withErrors([ - 'email' => $this->getFailedLoginMessage(), + 'email' => $this->getFailedLoginMessage(), 'password' => $this->getFailedLoginMessage(), ])->with('error', Lang::get('lang.this_account_is_currently_inactive')); } @@ -207,7 +195,7 @@ class AuthController extends Controller return redirect()->back() ->withInput($request->only('email', 'remember')) ->withErrors([ - 'email' => $this->getFailedLoginMessage(), + 'email' => $this->getFailedLoginMessage(), 'password' => $this->getFailedLoginMessage(), ])->with('error', Lang::get('lang.this_account_is_currently_inactive')); } @@ -250,7 +238,7 @@ class AuthController extends Controller return redirect()->back() ->withInput($request->only('email', 'remember')) ->withErrors([ - 'email' => $this->getFailedLoginMessage(), + 'email' => $this->getFailedLoginMessage(), 'password' => $this->getFailedLoginMessage(), ])->with('error', Lang::get('lang.invalid')); // Increment login attempts @@ -263,8 +251,7 @@ class AuthController extends Controller * * @return type Response */ - public function addLoginAttempt($value, $field) - { + public function addLoginAttempt($value, $field) { $result = DB::table('login_attempts')->where('IP', '=', $value)->first(); $data = $result; $security = Security::whereId('1')->first(); @@ -272,13 +259,13 @@ class AuthController extends Controller if ($data) { $attempts = $data->Attempts + 1; if ($attempts == $apt) { - $result = DB::select('UPDATE login_attempts SET Attempts='.$attempts.", LastLogin=NOW() WHERE IP = '$value' OR User = '$field'"); + $result = DB::update('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::select("INSERT INTO login_attempts (Attempts,User,IP,LastLogin) values (1,'$field','$value', NOW())"); + $result = DB::insert("INSERT INTO login_attempts (Attempts,User,IP,LastLogin) values (1,'$field','$value', NOW())"); } } @@ -289,8 +276,7 @@ class AuthController extends Controller * * @return type Response */ - public function clearLoginAttempts($value, $field) - { + public function clearLoginAttempts($value, $field) { $data = DB::table('login_attempts')->where('IP', '=', $value)->orWhere('User', '=', $field)->update(['attempts' => '0']); return $data; @@ -303,14 +289,13 @@ class AuthController extends Controller * * @return type Response */ - public function confirmIPAddress($value, $field) - { + public function confirmIPAddress($value, $field) { $security = Security::whereId('1')->first(); $time = $security->lockout_period; $max_attempts = $security->backlist_threshold; $table = 'login_attempts'; - $result = DB::select('SELECT Attempts, (CASE when LastLogin is not NULL and DATE_ADD(LastLogin, INTERVAL '.$time.' MINUTE)>NOW() then 1 else 0 end) as Denied '. - ' FROM '.$table." WHERE IP = '$value' OR User = '$field'"); + $result = DB::select('SELECT Attempts, (CASE when LastLogin is not NULL and DATE_ADD(LastLogin, INTERVAL ' . $time . ' MINUTE)>NOW() then 1 else 0 end) as Denied ' . + ' FROM ' . $table . " WHERE IP = '$value' OR User = '$field'"); $data = $result; //Verify that at least one login attempt is in database if (!$data) { @@ -334,8 +319,8 @@ class AuthController extends Controller * * @return type string */ - protected function getFailedLoginMessage() - { + protected function getFailedLoginMessage() { return Lang::get('lang.this_field_do_not_match_our_records'); } + }