webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-28 17:02:04 +03:00
Code Activity

Updated to Laravel 5.8

Browse Source
This commit is contained in:
Dan Brown
2019-09-13 23:58:40 +01:00
parent 58f5508b05
commit 140298bd96
65 changed files with 282 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/UserController.php
View File

@ -8,6 +8,7 @@ use BookStack\Exceptions\UserUpdateException;
use BookStack\Uploads\ImageRepo;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Str;
class UserController extends Controller
{
@ -92,7 +93,7 @@ class UserController extends Controller
$user = $this->user->fill($request->all());
if ($authMethod === 'standard') {
$user->password = bcrypt($request->get('password', str_random(32)));
$user->password = bcrypt($request->get('password', Str::random(32)));
} elseif ($authMethod === 'ldap') {
$user->external_auth_id = $request->get('external_auth_id');
}