DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

No need to update the user again

Browse source
This commit is contained in:
snipe 2016-06-13 11:30:47 -07:00
parent 396446a34b
commit 2df71be321
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Http/Controllers/UsersController.php
View file

@ -783,7 +783,7 @@ class UsersController extends Controller
'last_name' => trim(e($row[1])), 'last_name' => trim(e($row[1])),
'username' => trim(e($row[2])), 'username' => trim(e($row[2])),
'email' => trim(e($row[3])), 'email' => trim(e($row[3])),
'password' => $pass, 'password' => bcrypt($pass),
'activated' => $activated, 'activated' => $activated,
'location_id' => trim(e($user_location_id)), 'location_id' => trim(e($user_location_id)),
'phone' => trim(e($row[5])), 'phone' => trim(e($row[5])),
@ -793,17 +793,10 @@ class UsersController extends Controller
'permissions' => '{"user":1}', 'permissions' => '{"user":1}',
'notes' => 'Imported user' 'notes' => 'Imported user'
); );
//dd($newuser);
DB::table('users')->insert($newuser); DB::table('users')->insert($newuser);
$updateuser = User::find($row[2]);
// Update the user details
$updateuser->password = $pass;
// Update the user
$updateuser->save();
if (((Input::get('email_user') == 1) && !config('app.lock_passwords'))) { if (((Input::get('email_user') == 1) && !config('app.lock_passwords'))) {
// Send the credentials through email // Send the credentials through email