starred/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2026-05-04 18:08:46 +03:00
Code Issues 784 Packages Projects Releases 15 Wiki Activity

Maintenance: Updated $request->get instance to use input

Browse Source
This commit is contained in:
Dan Brown
2026-04-18 20:43:27 +01:00
parent a2bb5bdf10
commit 083fb1a600
38 changed files with 107 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Access/Controllers/ForgotPasswordController.php
View File

@@ -45,11 +45,11 @@ class ForgotPasswordController extends Controller
); );
if ($response === Password::RESET_LINK_SENT) { if ($response === Password::RESET_LINK_SENT) {
$this->logActivity(ActivityType::AUTH_PASSWORD_RESET, $request->get('email')); $this->logActivity(ActivityType::AUTH_PASSWORD_RESET, $request->input('email'));
} }
if (in_array($response, [Password::RESET_LINK_SENT, Password::INVALID_USER, Password::RESET_THROTTLED])) { if (in_array($response, [Password::RESET_LINK_SENT, Password::INVALID_USER, Password::RESET_THROTTLED])) {
$message = trans('auth.reset_password_sent', ['email' => $request->get('email')]); $message = trans('auth.reset_password_sent', ['email' => $request->input('email')]);
$this->showSuccessNotification($message); $this->showSuccessNotification($message);
return redirect('/password/email')->with('status', trans($response)); return redirect('/password/email')->with('status', trans($response));

8
app/Access/Controllers/LoginController.php
View File

@@ -32,12 +32,12 @@ class LoginController extends Controller
{ {
$socialDrivers = $this->socialDriverManager->getActive(); $socialDrivers = $this->socialDriverManager->getActive();
$authMethod = config('auth.method'); $authMethod = config('auth.method');
$preventInitiation = $request->get('prevent_auto_init') === 'true'; $preventInitiation = $request->input('prevent_auto_init') === 'true';
if ($request->has('email')) { if ($request->has('email')) {
session()->flashInput([ session()->flashInput([
'email' => $request->get('email'), 'email' => $request->input('email'),
'password' => (config('app.env') === 'demo') ? $request->get('password', '') : '', 'password' => (config('app.env') === 'demo') ? $request->input('password', '') : '',
]); ]);
} }
@@ -62,7 +62,7 @@ class LoginController extends Controller
public function login(Request $request) public function login(Request $request)
{ {
$this->validateLogin($request); $this->validateLogin($request);
$username = $request->get($this->username()); $username = $request->input($this->username());
// Check login throttling attempts to see if they've gone over the limit // Check login throttling attempts to see if they've gone over the limit
if ($this->hasTooManyLoginAttempts($request)) { if ($this->hasTooManyLoginAttempts($request)) {

2
app/Access/Controllers/MfaBackupCodesController.php
View File

@@ -84,7 +84,7 @@ class MfaBackupCodesController extends Controller
], ],
]); ]);
$updatedCodes = $codeService->removeInputCodeFromSet($request->get('code'), $codes); $updatedCodes = $codeService->removeInputCodeFromSet($request->input('code'), $codes);
MfaValue::upsertWithValue($user, MfaValue::METHOD_BACKUP_CODES, $updatedCodes); MfaValue::upsertWithValue($user, MfaValue::METHOD_BACKUP_CODES, $updatedCodes);
$mfaSession->markVerifiedForUser($user); $mfaSession->markVerifiedForUser($user);

4
app/Access/Controllers/MfaController.php
View File

@@ -51,14 +51,14 @@ class MfaController extends Controller
*/ */
public function verify(Request $request) public function verify(Request $request)
{ {
$desiredMethod = $request->get('method'); $desiredMethod = $request->input('method');
$userMethods = $this->currentOrLastAttemptedUser() $userMethods = $this->currentOrLastAttemptedUser()
->mfaValues() ->mfaValues()
->get(['id', 'method']) ->get(['id', 'method'])
->groupBy('method'); ->groupBy('method');
// Basic search for the default option for a user. // Basic search for the default option for a user.
// (Prioritises totp over backup codes) // (Prioritises TOTP over backup codes)
$method = $userMethods->has($desiredMethod) ? $desiredMethod : $userMethods->keys()->sort()->reverse()->first(); $method = $userMethods->has($desiredMethod) ? $desiredMethod : $userMethods->keys()->sort()->reverse()->first();
$otherMethods = $userMethods->keys()->filter(function ($userMethod) use ($method) { $otherMethods = $userMethods->keys()->filter(function ($userMethod) use ($method) {
return $method !== $userMethod; return $method !== $userMethod;

4
app/Access/Controllers/ResetPasswordController.php
View File

@@ -48,7 +48,7 @@ class ResetPasswordController extends Controller
// Here we will attempt to reset the user's password. If it is successful we // Here we will attempt to reset the user's password. If it is successful we
// will update the password on an actual user model and persist it to the // will update the password on an actual user model and persist it to the
// database. Otherwise we will parse the error and return the response. // database. Otherwise, we will parse the error and return the response.
$credentials = $request->only('email', 'password', 'password_confirmation', 'token'); $credentials = $request->only('email', 'password', 'password_confirmation', 'token');
$response = Password::broker()->reset($credentials, function (User $user, string $password) { $response = Password::broker()->reset($credentials, function (User $user, string $password) {
$user->password = Hash::make($password); $user->password = Hash::make($password);
@@ -63,7 +63,7 @@ class ResetPasswordController extends Controller
// redirect them back to where they came from with their error message. // redirect them back to where they came from with their error message.
return $response === Password::PASSWORD_RESET return $response === Password::PASSWORD_RESET
? $this->sendResetResponse() ? $this->sendResetResponse()
: $this->sendResetFailedResponse($request, $response, $request->get('token')); : $this->sendResetFailedResponse($request, $response, $request->input('token'));
} }
/** /**

4
app/Access/Controllers/Saml2Controller.php
View File

@@ -78,7 +78,7 @@ class Saml2Controller extends Controller
*/ */
public function startAcs(Request $request) public function startAcs(Request $request)
{ {
$samlResponse = $request->get('SAMLResponse', null); $samlResponse = $request->input('SAMLResponse', null);
if (empty($samlResponse)) { if (empty($samlResponse)) {
$this->showErrorNotification(trans('errors.saml_fail_authed', ['system' => config('saml2.name')])); $this->showErrorNotification(trans('errors.saml_fail_authed', ['system' => config('saml2.name')]));
@@ -100,7 +100,7 @@ class Saml2Controller extends Controller
*/ */
public function processAcs(Request $request) public function processAcs(Request $request)
{ {
$acsId = $request->get('id', null); $acsId = $request->input('id', null);
$cacheKey = 'saml2_acs:' . $acsId; $cacheKey = 'saml2_acs:' . $acsId;
$samlResponse = null; $samlResponse = null;

2
app/Access/Controllers/SocialController.php
View File

@@ -67,7 +67,7 @@ class SocialController extends Controller
if ($request->has('error') && $request->has('error_description')) { if ($request->has('error') && $request->has('error_description')) {
throw new SocialSignInException(trans('errors.social_login_bad_response', [ throw new SocialSignInException(trans('errors.social_login_bad_response', [
'socialAccount' => $socialDriver, 'socialAccount' => $socialDriver,
'error' => $request->get('error_description'), 'error' => $request->input('error_description'),
]), '/login'); ]), '/login');
} }

2
app/Access/Controllers/UserInviteController.php
View File

@@ -67,7 +67,7 @@ class UserInviteController extends Controller
} }
$user = $this->userRepo->getById($userId); $user = $this->userRepo->getById($userId);
$user->password = Hash::make($request->get('password')); $user->password = Hash::make($request->input('password'));
$user->email_confirmed = true; $user->email_confirmed = true;
$user->save(); $user->save();

14
app/Activity/Controllers/AuditLogController.php
View File

@@ -17,19 +17,19 @@ class AuditLogController extends Controller
$this->checkPermission(Permission::SettingsManage); $this->checkPermission(Permission::SettingsManage);
$this->checkPermission(Permission::UsersManage); $this->checkPermission(Permission::UsersManage);
$sort = $request->get('sort', 'activity_date'); $sort = $request->input('sort', 'activity_date');
$order = $request->get('order', 'desc'); $order = $request->input('order', 'desc');
$listOptions = (new SimpleListOptions('', $sort, $order))->withSortOptions([ $listOptions = (new SimpleListOptions('', $sort, $order))->withSortOptions([
'created_at' => trans('settings.audit_table_date'), 'created_at' => trans('settings.audit_table_date'),
'type' => trans('settings.audit_table_event'), 'type' => trans('settings.audit_table_event'),
]); ]);
$filters = [ $filters = [
'event' => $request->get('event', ''), 'event' => $request->input('event', ''),
'date_from' => $request->get('date_from', ''), 'date_from' => $request->input('date_from', ''),
'date_to' => $request->get('date_to', ''), 'date_to' => $request->input('date_to', ''),
'user' => $request->get('user', ''), 'user' => $request->input('user', ''),
'ip' => $request->get('ip', ''), 'ip' => $request->input('ip', ''),
]; ];
$query = Activity::query() $query = Activity::query()

2
app/Activity/Controllers/FavouriteController.php
View File

@@ -20,7 +20,7 @@ class FavouriteController extends Controller
public function index(Request $request, QueryTopFavourites $topFavourites) public function index(Request $request, QueryTopFavourites $topFavourites)
{ {
$viewCount = 20; $viewCount = 20;
$page = intval($request->get('page', 1)); $page = intval($request->input('page', 1));
$favourites = $topFavourites->run($viewCount + 1, (($page - 1) * $viewCount)); $favourites = $topFavourites->run($viewCount + 1, (($page - 1) * $viewCount));
$hasMoreLink = ($favourites->count() > $viewCount) ? url('/favourites?page=' . ($page + 1)) : null; $hasMoreLink = ($favourites->count() > $viewCount) ? url('/favourites?page=' . ($page + 1)) : null;

6
app/Activity/Controllers/TagController.php
View File

@@ -46,7 +46,7 @@ class TagController extends Controller
*/ */
public function getNameSuggestions(Request $request) public function getNameSuggestions(Request $request)
{ {
$searchTerm = $request->get('search', ''); $searchTerm = $request->input('search', '');
$suggestions = $this->tagRepo->getNameSuggestions($searchTerm); $suggestions = $this->tagRepo->getNameSuggestions($searchTerm);
return response()->json($suggestions); return response()->json($suggestions);
@@ -57,8 +57,8 @@ class TagController extends Controller
*/ */
public function getValueSuggestions(Request $request) public function getValueSuggestions(Request $request)
{ {
$searchTerm = $request->get('search', ''); $searchTerm = $request->input('search', '');
$tagName = $request->get('name', ''); $tagName = $request->input('name', '');
$suggestions = $this->tagRepo->getValueSuggestions($searchTerm, $tagName); $suggestions = $this->tagRepo->getValueSuggestions($searchTerm, $tagName);
return response()->json($suggestions); return response()->json($suggestions);

8
app/Api/UserApiTokenController.php
View File

@@ -48,11 +48,11 @@ class UserApiTokenController extends Controller
$secret = Str::random(32); $secret = Str::random(32);
$token = (new ApiToken())->forceFill([ $token = (new ApiToken())->forceFill([
'name' => $request->get('name'), 'name' => $request->input('name'),
'token_id' => Str::random(32), 'token_id' => Str::random(32),
'secret' => Hash::make($secret), 'secret' => Hash::make($secret),
'user_id' => $user->id, 'user_id' => $user->id,
'expires_at' => $request->get('expires_at') ?: ApiToken::defaultExpiry(), 'expires_at' => $request->input('expires_at') ?: ApiToken::defaultExpiry(),
]); ]);
while (ApiToken::query()->where('token_id', '=', $token->token_id)->exists()) { while (ApiToken::query()->where('token_id', '=', $token->token_id)->exists()) {
@@ -100,8 +100,8 @@ class UserApiTokenController extends Controller
[$user, $token] = $this->checkPermissionAndFetchUserToken($userId, $tokenId); [$user, $token] = $this->checkPermissionAndFetchUserToken($userId, $tokenId);
$token->fill([ $token->fill([
'name' => $request->get('name'), 'name' => $request->input('name'),
'expires_at' => $request->get('expires_at') ?: ApiToken::defaultExpiry(), 'expires_at' => $request->input('expires_at') ?: ApiToken::defaultExpiry(),
])->save(); ])->save();
$this->logActivity(ActivityType::API_TOKEN_UPDATE, $token); $this->logActivity(ActivityType::API_TOKEN_UPDATE, $token);

4
app/Entities/Controllers/BookController.php
View File

@@ -144,7 +144,7 @@ class BookController extends Controller
View::incrementFor($book); View::incrementFor($book);
if ($request->has('shelf')) { if ($request->has('shelf')) {
$this->shelfContext->setShelfContext(intval($request->get('shelf'))); $this->shelfContext->setShelfContext(intval($request->input('shelf')));
} }
$this->setPageTitle($book->getShortName()); $this->setPageTitle($book->getShortName());
@@ -263,7 +263,7 @@ class BookController extends Controller
$this->checkOwnablePermission(Permission::BookView, $book); $this->checkOwnablePermission(Permission::BookView, $book);
$this->checkPermission(Permission::BookCreateAll); $this->checkPermission(Permission::BookCreateAll);
$newName = $request->get('name') ?: $book->name; $newName = $request->input('name') ?: $book->name;
$bookCopy = $cloner->cloneBook($book, $newName); $bookCopy = $cloner->cloneBook($book, $newName);
$this->showSuccessNotification(trans('entities.books_copy_success')); $this->showSuccessNotification(trans('entities.books_copy_success'));

4
app/Entities/Controllers/BookshelfApiController.php
View File

@@ -49,7 +49,7 @@ class BookshelfApiController extends ApiController
$this->checkPermission(Permission::BookshelfCreateAll); $this->checkPermission(Permission::BookshelfCreateAll);
$requestData = $this->validate($request, $this->rules()['create']); $requestData = $this->validate($request, $this->rules()['create']);
$bookIds = $request->get('books', []); $bookIds = $request->input('books', []);
$shelf = $this->bookshelfRepo->create($requestData, $bookIds); $shelf = $this->bookshelfRepo->create($requestData, $bookIds);
return response()->json($this->forJsonDisplay($shelf)); return response()->json($this->forJsonDisplay($shelf));
@@ -88,7 +88,7 @@ class BookshelfApiController extends ApiController
$this->checkOwnablePermission(Permission::BookshelfUpdate, $shelf); $this->checkOwnablePermission(Permission::BookshelfUpdate, $shelf);
$requestData = $this->validate($request, $this->rules()['update']); $requestData = $this->validate($request, $this->rules()['update']);
$bookIds = $request->get('books', null); $bookIds = $request->input('books', null);
$shelf = $this->bookshelfRepo->update($shelf, $requestData, $bookIds); $shelf = $this->bookshelfRepo->update($shelf, $requestData, $bookIds);

4
app/Entities/Controllers/BookshelfController.php
View File

@@ -94,7 +94,7 @@ class BookshelfController extends Controller
'tags' => ['array'], 'tags' => ['array'],
]); ]);
$bookIds = explode(',', $request->get('books', '')); $bookIds = explode(',', $request->input('books', ''));
$shelf = $this->shelfRepo->create($validated, $bookIds); $shelf = $this->shelfRepo->create($validated, $bookIds);
return redirect($shelf->getUrl()); return redirect($shelf->getUrl());
@@ -196,7 +196,7 @@ class BookshelfController extends Controller
unset($validated['image']); unset($validated['image']);
} }
$bookIds = explode(',', $request->get('books', '')); $bookIds = explode(',', $request->input('books', ''));
$shelf = $this->shelfRepo->update($shelf, $validated, $bookIds); $shelf = $this->shelfRepo->update($shelf, $validated, $bookIds);
return redirect($shelf->getUrl()); return redirect($shelf->getUrl());

2
app/Entities/Controllers/ChapterApiController.php
View File

@@ -64,7 +64,7 @@ class ChapterApiController extends ApiController
{ {
$requestData = $this->validate($request, $this->rules['create']); $requestData = $this->validate($request, $this->rules['create']);
$bookId = $request->get('book_id'); $bookId = $request->input('book_id');
$book = $this->entityQueries->books->findVisibleByIdOrFail(intval($bookId)); $book = $this->entityQueries->books->findVisibleByIdOrFail(intval($bookId));
$this->checkOwnablePermission(Permission::ChapterCreate, $book); $this->checkOwnablePermission(Permission::ChapterCreate, $book);

6
app/Entities/Controllers/ChapterController.php
View File

@@ -203,7 +203,7 @@ class ChapterController extends Controller
$this->checkOwnablePermission(Permission::ChapterUpdate, $chapter); $this->checkOwnablePermission(Permission::ChapterUpdate, $chapter);
$this->checkOwnablePermission(Permission::ChapterDelete, $chapter); $this->checkOwnablePermission(Permission::ChapterDelete, $chapter);
$entitySelection = $request->get('entity_selection', null); $entitySelection = $request->input('entity_selection', null);
if ($entitySelection === null || $entitySelection === '') { if ($entitySelection === null || $entitySelection === '') {
return redirect($chapter->getUrl()); return redirect($chapter->getUrl());
} }
@@ -248,7 +248,7 @@ class ChapterController extends Controller
{ {
$chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug); $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
$entitySelection = $request->get('entity_selection') ?: null; $entitySelection = $request->input('entity_selection') ?: null;
$newParentBook = $entitySelection ? $this->entityQueries->findVisibleByStringIdentifier($entitySelection) : $chapter->getParent(); $newParentBook = $entitySelection ? $this->entityQueries->findVisibleByStringIdentifier($entitySelection) : $chapter->getParent();
if (!$newParentBook instanceof Book) { if (!$newParentBook instanceof Book) {
@@ -259,7 +259,7 @@ class ChapterController extends Controller
$this->checkOwnablePermission(Permission::ChapterCreate, $newParentBook); $this->checkOwnablePermission(Permission::ChapterCreate, $newParentBook);
$newName = $request->get('name') ?: $chapter->name; $newName = $request->input('name') ?: $chapter->name;
$chapterCopy = $cloner->cloneChapter($chapter, $newParentBook, $newName); $chapterCopy = $cloner->cloneChapter($chapter, $newParentBook, $newName);
$this->showSuccessNotification(trans('entities.chapters_copy_success')); $this->showSuccessNotification(trans('entities.chapters_copy_success'));

8
app/Entities/Controllers/PageApiController.php
View File

@@ -74,9 +74,9 @@ class PageApiController extends ApiController
$this->validate($request, $this->rules['create']); $this->validate($request, $this->rules['create']);
if ($request->has('chapter_id')) { if ($request->has('chapter_id')) {
$parent = $this->entityQueries->chapters->findVisibleByIdOrFail(intval($request->get('chapter_id'))); $parent = $this->entityQueries->chapters->findVisibleByIdOrFail(intval($request->input('chapter_id')));
} else { } else {
$parent = $this->entityQueries->books->findVisibleByIdOrFail(intval($request->get('book_id'))); $parent = $this->entityQueries->books->findVisibleByIdOrFail(intval($request->input('book_id')));
} }
$this->checkOwnablePermission(Permission::PageCreate, $parent); $this->checkOwnablePermission(Permission::PageCreate, $parent);
@@ -133,9 +133,9 @@ class PageApiController extends ApiController
$parent = null; $parent = null;
if ($request->has('chapter_id')) { if ($request->has('chapter_id')) {
$parent = $this->entityQueries->chapters->findVisibleByIdOrFail(intval($request->get('chapter_id'))); $parent = $this->entityQueries->chapters->findVisibleByIdOrFail(intval($request->input('chapter_id')));
} elseif ($request->has('book_id')) { } elseif ($request->has('book_id')) {
$parent = $this->entityQueries->books->findVisibleByIdOrFail(intval($request->get('book_id'))); $parent = $this->entityQueries->books->findVisibleByIdOrFail(intval($request->input('book_id')));
} }
if ($parent && !$parent->matches($page->getParent())) { if ($parent && !$parent->matches($page->getParent())) {

8
app/Entities/Controllers/PageController.php
View File

@@ -88,7 +88,7 @@ class PageController extends Controller
$page = $this->pageRepo->getNewDraftPage($parent); $page = $this->pageRepo->getNewDraftPage($parent);
$this->pageRepo->publishDraft($page, [ $this->pageRepo->publishDraft($page, [
'name' => $request->get('name'), 'name' => $request->input('name'),
]); ]);
return redirect($page->getUrl('/edit')); return redirect($page->getUrl('/edit'));
@@ -408,7 +408,7 @@ class PageController extends Controller
$this->checkOwnablePermission(Permission::PageUpdate, $page); $this->checkOwnablePermission(Permission::PageUpdate, $page);
$this->checkOwnablePermission(Permission::PageDelete, $page); $this->checkOwnablePermission(Permission::PageDelete, $page);
$entitySelection = $request->get('entity_selection', null); $entitySelection = $request->input('entity_selection', null);
if ($entitySelection === null || $entitySelection === '') { if ($entitySelection === null || $entitySelection === '') {
return redirect($page->getUrl()); return redirect($page->getUrl());
} }
@@ -453,7 +453,7 @@ class PageController extends Controller
$page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug); $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
$this->checkOwnablePermission(Permission::PageView, $page); $this->checkOwnablePermission(Permission::PageView, $page);
$entitySelection = $request->get('entity_selection') ?: null; $entitySelection = $request->input('entity_selection') ?: null;
$newParent = $entitySelection ? $this->entityQueries->findVisibleByStringIdentifier($entitySelection) : $page->getParent(); $newParent = $entitySelection ? $this->entityQueries->findVisibleByStringIdentifier($entitySelection) : $page->getParent();
if (!$newParent instanceof Book && !$newParent instanceof Chapter) { if (!$newParent instanceof Book && !$newParent instanceof Chapter) {
@@ -464,7 +464,7 @@ class PageController extends Controller
$this->checkOwnablePermission(Permission::PageCreate, $newParent); $this->checkOwnablePermission(Permission::PageCreate, $newParent);
$newName = $request->get('name') ?: $page->name; $newName = $request->input('name') ?: $page->name;
$pageCopy = $cloner->clonePage($page, $newParent, $newName); $pageCopy = $cloner->clonePage($page, $newParent, $newName);
$this->showSuccessNotification(trans('entities.pages_copy_success')); $this->showSuccessNotification(trans('entities.pages_copy_success'));

4
app/Entities/Controllers/PageTemplateController.php
View File

@@ -21,8 +21,8 @@ class PageTemplateController extends Controller
*/ */
public function list(Request $request) public function list(Request $request)
{ {
$page = $request->get('page', 1); $page = $request->input('page', 1);
$search = $request->get('search', ''); $search = $request->input('search', '');
$count = 10; $count = 10;
$query = $this->pageQueries->visibleTemplates() $query = $this->pageQueries->visibleTemplates()

4
app/Entities/Tools/PermissionsUpdater.php
View File

@@ -20,8 +20,8 @@ class PermissionsUpdater
*/ */
public function updateFromPermissionsForm(Entity $entity, Request $request): void public function updateFromPermissionsForm(Entity $entity, Request $request): void
{ {
$permissions = $request->get('permissions', null); $permissions = $request->input('permissions', null);
$ownerId = $request->get('owned_by', null); $ownerId = $request->input('owned_by', null);
$entity->permissions()->delete(); $entity->permissions()->delete();

6
app/Search/SearchApiController.php
View File

@@ -40,9 +40,9 @@ class SearchApiController extends ApiController
{ {
$this->validate($request, $this->rules['all']); $this->validate($request, $this->rules['all']);
$options = SearchOptions::fromString($request->get('query') ?? ''); $options = SearchOptions::fromString($request->input('query') ?? '');
$page = intval($request->get('page', '0')) ?: 1; $page = intval($request->input('page', '0')) ?: 1;
$count = min(intval($request->get('count', '0')) ?: 20, 100); $count = min(intval($request->input('count', '0')) ?: 20, 100);
$results = $this->searchRunner->searchEntities($options, 'all', $page, $count); $results = $this->searchRunner->searchEntities($options, 'all', $page, $count);
$this->resultsFormatter->format($results['results']->all(), $options); $this->resultsFormatter->format($results['results']->all(), $options);

20
app/Search/SearchController.php
View File

@@ -24,7 +24,7 @@ class SearchController extends Controller
{ {
$searchOpts = SearchOptions::fromRequest($request); $searchOpts = SearchOptions::fromRequest($request);
$fullSearchString = $searchOpts->toString(); $fullSearchString = $searchOpts->toString();
$page = intval($request->get('page', '0')) ?: 1; $page = intval($request->input('page', '0')) ?: 1;
$count = setting()->getInteger('lists-page-count-search', 18, 1, 1000); $count = setting()->getInteger('lists-page-count-search', 18, 1, 1000);
$results = $this->searchRunner->searchEntities($searchOpts, 'all', $page, $count); $results = $this->searchRunner->searchEntities($searchOpts, 'all', $page, $count);
@@ -49,7 +49,7 @@ class SearchController extends Controller
*/ */
public function searchBook(Request $request, int $bookId) public function searchBook(Request $request, int $bookId)
{ {
$term = $request->get('term', ''); $term = $request->input('term', '');
$results = $this->searchRunner->searchBook($bookId, $term); $results = $this->searchRunner->searchBook($bookId, $term);
return view('entities.list', ['entities' => $results]); return view('entities.list', ['entities' => $results]);
@@ -60,7 +60,7 @@ class SearchController extends Controller
*/ */
public function searchChapter(Request $request, int $chapterId) public function searchChapter(Request $request, int $chapterId)
{ {
$term = $request->get('term', ''); $term = $request->input('term', '');
$results = $this->searchRunner->searchChapter($chapterId, $term); $results = $this->searchRunner->searchChapter($chapterId, $term);
return view('entities.list', ['entities' => $results]); return view('entities.list', ['entities' => $results]);
@@ -72,9 +72,9 @@ class SearchController extends Controller
*/ */
public function searchForSelector(Request $request, QueryPopular $queryPopular) public function searchForSelector(Request $request, QueryPopular $queryPopular)
{ {
$entityTypes = $request->filled('types') ? explode(',', $request->get('types')) : ['page', 'chapter', 'book']; $entityTypes = $request->filled('types') ? explode(',', $request->input('types')) : ['page', 'chapter', 'book'];
$searchTerm = $request->get('term', false); $searchTerm = $request->input('term', false);
$permission = $request->get('permission', 'view'); $permission = $request->input('permission', 'view');
// Search for entities otherwise show most popular // Search for entities otherwise show most popular
if ($searchTerm !== false) { if ($searchTerm !== false) {
@@ -93,7 +93,7 @@ class SearchController extends Controller
*/ */
public function templatesForSelector(Request $request) public function templatesForSelector(Request $request)
{ {
$searchTerm = $request->get('term', false); $searchTerm = $request->input('term', false);
if ($searchTerm !== false) { if ($searchTerm !== false) {
$searchOptions = SearchOptions::fromString($searchTerm); $searchOptions = SearchOptions::fromString($searchTerm);
@@ -119,7 +119,7 @@ class SearchController extends Controller
*/ */
public function searchSuggestions(Request $request) public function searchSuggestions(Request $request)
{ {
$searchTerm = $request->get('term', ''); $searchTerm = $request->input('term', '');
$entities = $this->searchRunner->searchEntities(SearchOptions::fromString($searchTerm), 'all', 1, 5)['results']; $entities = $this->searchRunner->searchEntities(SearchOptions::fromString($searchTerm), 'all', 1, 5)['results'];
foreach ($entities as $entity) { foreach ($entities as $entity) {
@@ -136,8 +136,8 @@ class SearchController extends Controller
*/ */
public function searchSiblings(Request $request, SiblingFetcher $siblingFetcher) public function searchSiblings(Request $request, SiblingFetcher $siblingFetcher)
{ {
$type = $request->get('entity_type', null); $type = $request->input('entity_type', null);
$id = $request->get('entity_id', null); $id = $request->input('entity_id', null);
$entities = $siblingFetcher->fetch($type, $id); $entities = $siblingFetcher->fetch($type, $id);

2
app/Search/SearchOptions.php
View File

@@ -51,7 +51,7 @@ class SearchOptions
} }
if ($request->has('term')) { if ($request->has('term')) {
return static::fromString($request->get('term')); return static::fromString($request->input('term'));
} }
$instance = new SearchOptions(); $instance = new SearchOptions();

4
app/Settings/AppSettingsStore.php
View File

@@ -44,7 +44,7 @@ class AppSettingsStore
} }
// Clear icon image if requested // Clear icon image if requested
if ($request->get('app_icon_reset')) { if ($request->input('app_icon_reset')) {
$this->destroyExistingSettingImage('app-icon'); $this->destroyExistingSettingImage('app-icon');
setting()->remove('app-icon'); setting()->remove('app-icon');
foreach ($sizes as $size) { foreach ($sizes as $size) {
@@ -67,7 +67,7 @@ class AppSettingsStore
} }
// Clear logo image if requested // Clear logo image if requested
if ($request->get('app_logo_reset')) { if ($request->input('app_logo_reset')) {
$this->destroyExistingSettingImage('app-logo'); $this->destroyExistingSettingImage('app-logo');
setting()->remove('app-logo'); setting()->remove('app-logo');
} }

2
app/Settings/MaintenanceController.php
View File

@@ -38,7 +38,7 @@ class MaintenanceController extends Controller
$this->checkPermission(Permission::SettingsManage); $this->checkPermission(Permission::SettingsManage);
$this->logActivity(ActivityType::MAINTENANCE_ACTION_RUN, 'cleanup-images'); $this->logActivity(ActivityType::MAINTENANCE_ACTION_RUN, 'cleanup-images');
$checkRevisions = !($request->get('ignore_revisions', 'false') === 'true'); $checkRevisions = !($request->input('ignore_revisions', 'false') === 'true');
$dryRun = !($request->has('confirm')); $dryRun = !($request->has('confirm'));
$imagesToDelete = $imageService->deleteUnusedImages($checkRevisions, $dryRun); $imagesToDelete = $imageService->deleteUnusedImages($checkRevisions, $dryRun);

4
app/Sorting/BookSortController.php
View File

@@ -58,7 +58,7 @@ class BookSortController extends Controller
// Sort via map // Sort via map
if ($request->filled('sort-tree')) { if ($request->filled('sort-tree')) {
(new DatabaseTransaction(function () use ($book, $request, $sorter, &$loggedActivityForBook) { (new DatabaseTransaction(function () use ($book, $request, $sorter, &$loggedActivityForBook) {
$sortMap = BookSortMap::fromJson($request->get('sort-tree')); $sortMap = BookSortMap::fromJson($request->input('sort-tree'));
$booksInvolved = $sorter->sortUsingMap($sortMap); $booksInvolved = $sorter->sortUsingMap($sortMap);
// Add activity for involved books. // Add activity for involved books.
@@ -72,7 +72,7 @@ class BookSortController extends Controller
} }
if ($request->filled('auto-sort')) { if ($request->filled('auto-sort')) {
$sortSetId = intval($request->get('auto-sort')) ?: null; $sortSetId = intval($request->input('auto-sort')) ?: null;
if ($sortSetId && SortRule::query()->find($sortSetId) === null) { if ($sortSetId && SortRule::query()->find($sortSetId) === null) {
$sortSetId = null; $sortSetId = null;
} }

4
app/Uploads/Controllers/AttachmentApiController.php
View File

@@ -50,7 +50,7 @@ class AttachmentApiController extends ApiController
$this->checkPermission(Permission::AttachmentCreateAll); $this->checkPermission(Permission::AttachmentCreateAll);
$requestData = $this->validate($request, $this->rules()['create']); $requestData = $this->validate($request, $this->rules()['create']);
$pageId = $request->get('uploaded_to'); $pageId = $request->input('uploaded_to');
$page = $this->pageQueries->findVisibleByIdOrFail($pageId); $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
$this->checkOwnablePermission(Permission::PageUpdate, $page); $this->checkOwnablePermission(Permission::PageUpdate, $page);
@@ -134,7 +134,7 @@ class AttachmentApiController extends ApiController
$page = $attachment->page; $page = $attachment->page;
if ($requestData['uploaded_to'] ?? false) { if ($requestData['uploaded_to'] ?? false) {
$pageId = $request->get('uploaded_to'); $pageId = $request->input('uploaded_to');
$page = $this->pageQueries->findVisibleByIdOrFail($pageId); $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
$attachment->uploaded_to = $requestData['uploaded_to']; $attachment->uploaded_to = $requestData['uploaded_to'];
} }

16
app/Uploads/Controllers/AttachmentController.php
View File

@@ -39,7 +39,7 @@ class AttachmentController extends Controller
'file' => array_merge(['required'], $this->attachmentService->getFileValidationRules()), 'file' => array_merge(['required'], $this->attachmentService->getFileValidationRules()),
]); ]);
$pageId = $request->get('uploaded_to'); $pageId = $request->input('uploaded_to');
$page = $this->pageQueries->findVisibleByIdOrFail($pageId); $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
$this->checkPermission(Permission::AttachmentCreateAll); $this->checkPermission(Permission::AttachmentCreateAll);
@@ -125,8 +125,8 @@ class AttachmentController extends Controller
$this->checkOwnablePermission(Permission::AttachmentUpdate, $attachment); $this->checkOwnablePermission(Permission::AttachmentUpdate, $attachment);
$attachment = $this->attachmentService->updateFile($attachment, [ $attachment = $this->attachmentService->updateFile($attachment, [
'name' => $request->get('attachment_edit_name'), 'name' => $request->input('attachment_edit_name'),
'link' => $request->get('attachment_edit_url'), 'link' => $request->input('attachment_edit_url'),
]); ]);
return view('attachments.manager-edit-form', [ return view('attachments.manager-edit-form', [
@@ -141,7 +141,7 @@ class AttachmentController extends Controller
*/ */
public function attachLink(Request $request) public function attachLink(Request $request)
{ {
$pageId = $request->get('attachment_link_uploaded_to'); $pageId = $request->input('attachment_link_uploaded_to');
try { try {
$this->validate($request, [ $this->validate($request, [
@@ -161,8 +161,8 @@ class AttachmentController extends Controller
$this->checkPermission(Permission::AttachmentCreateAll); $this->checkPermission(Permission::AttachmentCreateAll);
$this->checkOwnablePermission(Permission::PageUpdate, $page); $this->checkOwnablePermission(Permission::PageUpdate, $page);
$attachmentName = $request->get('attachment_link_name'); $attachmentName = $request->input('attachment_link_name');
$link = $request->get('attachment_link_url'); $link = $request->input('attachment_link_url');
$this->attachmentService->saveNewFromLink($attachmentName, $link, intval($pageId)); $this->attachmentService->saveNewFromLink($attachmentName, $link, intval($pageId));
return view('attachments.manager-link-form', [ return view('attachments.manager-link-form', [
@@ -198,7 +198,7 @@ class AttachmentController extends Controller
$page = $this->pageQueries->findVisibleByIdOrFail($pageId); $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
$this->checkOwnablePermission(Permission::PageUpdate, $page); $this->checkOwnablePermission(Permission::PageUpdate, $page);
$attachmentOrder = $request->get('order'); $attachmentOrder = $request->input('order');
$this->attachmentService->updateFileOrderWithinPage($attachmentOrder, $pageId); $this->attachmentService->updateFileOrderWithinPage($attachmentOrder, $pageId);
return response()->json(['message' => trans('entities.attachments_order_updated')]); return response()->json(['message' => trans('entities.attachments_order_updated')]);
@@ -231,7 +231,7 @@ class AttachmentController extends Controller
$attachmentStream = $this->attachmentService->streamAttachmentFromStorage($attachment); $attachmentStream = $this->attachmentService->streamAttachmentFromStorage($attachment);
$attachmentSize = $this->attachmentService->getAttachmentFileSize($attachment); $attachmentSize = $this->attachmentService->getAttachmentFileSize($attachment);
if ($request->get('open') === 'true') { if ($request->input('open') === 'true') {
return $this->download()->streamedInline($attachmentStream, $fileName, $attachmentSize); return $this->download()->streamedInline($attachmentStream, $fileName, $attachmentSize);
} }

12
app/Uploads/Controllers/DrawioImageController.php
View File

@@ -24,10 +24,10 @@ class DrawioImageController extends Controller
*/ */
public function list(Request $request, ImageResizer $resizer) public function list(Request $request, ImageResizer $resizer)
{ {
$page = $request->get('page', 1); $page = $request->input('page', 1);
$searchTerm = $request->get('search', null); $searchTerm = $request->input('search', null);
$uploadedToFilter = $request->get('uploaded_to', null); $uploadedToFilter = $request->input('uploaded_to', null);
$parentTypeFilter = $request->get('filter_type', null); $parentTypeFilter = $request->input('filter_type', null);
$imgData = $this->imageRepo->getEntityFiltered('drawio', $parentTypeFilter, $page, 24, $uploadedToFilter, $searchTerm); $imgData = $this->imageRepo->getEntityFiltered('drawio', $parentTypeFilter, $page, 24, $uploadedToFilter, $searchTerm);
$viewData = [ $viewData = [
@@ -59,10 +59,10 @@ class DrawioImageController extends Controller
]); ]);
$this->checkPermission(Permission::ImageCreateAll); $this->checkPermission(Permission::ImageCreateAll);
$imageBase64Data = $request->get('image'); $imageBase64Data = $request->input('image');
try { try {
$uploadedTo = $request->get('uploaded_to', 0); $uploadedTo = $request->input('uploaded_to', 0);
$image = $this->imageRepo->saveDrawing($imageBase64Data, $uploadedTo); $image = $this->imageRepo->saveDrawing($imageBase64Data, $uploadedTo);
} catch (ImageUploadException $e) { } catch (ImageUploadException $e) {
return response($e->getMessage(), 500); return response($e->getMessage(), 500);

10
app/Uploads/Controllers/GalleryImageController.php
View File

@@ -24,10 +24,10 @@ class GalleryImageController extends Controller
*/ */
public function list(Request $request, ImageResizer $resizer) public function list(Request $request, ImageResizer $resizer)
{ {
$page = $request->get('page', 1); $page = $request->input('page', 1);
$searchTerm = $request->get('search', null); $searchTerm = $request->input('search', null);
$uploadedToFilter = $request->get('uploaded_to', null); $uploadedToFilter = $request->input('uploaded_to', null);
$parentTypeFilter = $request->get('filter_type', null); $parentTypeFilter = $request->input('filter_type', null);
$imgData = $this->imageRepo->getEntityFiltered('gallery', $parentTypeFilter, $page, 30, $uploadedToFilter, $searchTerm); $imgData = $this->imageRepo->getEntityFiltered('gallery', $parentTypeFilter, $page, 30, $uploadedToFilter, $searchTerm);
$viewData = [ $viewData = [
@@ -69,7 +69,7 @@ class GalleryImageController extends Controller
try { try {
$imageUpload = $request->file('file'); $imageUpload = $request->file('file');
$uploadedTo = $request->get('uploaded_to', 0); $uploadedTo = $request->input('uploaded_to', 0);
$image = $this->imageRepo->saveNew($imageUpload, 'gallery', $uploadedTo); $image = $this->imageRepo->saveNew($imageUpload, 'gallery', $uploadedTo);
} catch (ImageUploadException $e) { } catch (ImageUploadException $e) {
return response($e->getMessage(), 500); return response($e->getMessage(), 500);

4
app/Users/Controllers/RoleController.php
View File

@@ -55,7 +55,7 @@ class RoleController extends Controller
/** @var ?Role $role */ /** @var ?Role $role */
$role = null; $role = null;
if ($request->has('copy_from')) { if ($request->has('copy_from')) {
$role = Role::query()->find($request->get('copy_from')); $role = Role::query()->find($request->input('copy_from'));
} }
if ($role) { if ($role) {
@@ -150,7 +150,7 @@ class RoleController extends Controller
$this->checkPermission(Permission::UserRolesManage); $this->checkPermission(Permission::UserRolesManage);
try { try {
$migrateRoleId = intval($request->get('migrate_role_id') ?: "0"); $migrateRoleId = intval($request->input('migrate_role_id') ?: "0");
$this->permissionsRepo->deleteRole($id, $migrateRoleId); $this->permissionsRepo->deleteRole($id, $migrateRoleId);
} catch (PermissionsException $e) { } catch (PermissionsException $e) {
$this->showErrorNotification($e->getMessage()); $this->showErrorNotification($e->getMessage());

6
app/Users/Controllers/UserAccountController.php
View File

@@ -106,8 +106,8 @@ class UserAccountController extends Controller
*/ */
public function updateShortcuts(Request $request) public function updateShortcuts(Request $request)
{ {
$enabled = $request->get('enabled') === 'true'; $enabled = $request->input('enabled') === 'true';
$providedShortcuts = $request->get('shortcut', []); $providedShortcuts = $request->input('shortcut', []);
$shortcuts = new UserShortcutMap($providedShortcuts); $shortcuts = new UserShortcutMap($providedShortcuts);
setting()->putForCurrentUser('ui-shortcuts', $shortcuts->toJson()); setting()->putForCurrentUser('ui-shortcuts', $shortcuts->toJson());
@@ -218,7 +218,7 @@ class UserAccountController extends Controller
{ {
$this->preventAccessInDemoMode(); $this->preventAccessInDemoMode();
$requestNewOwnerId = intval($request->get('new_owner_id')) ?: null; $requestNewOwnerId = intval($request->input('new_owner_id')) ?: null;
$newOwnerId = userCan(Permission::UsersManage) ? $requestNewOwnerId : null; $newOwnerId = userCan(Permission::UsersManage) ? $requestNewOwnerId : null;
$this->userRepo->destroy(user(), $newOwnerId); $this->userRepo->destroy(user(), $newOwnerId);

2
app/Users/Controllers/UserApiController.php
View File

@@ -141,7 +141,7 @@ class UserApiController extends ApiController
public function delete(Request $request, string $id) public function delete(Request $request, string $id)
{ {
$user = $this->userRepo->getById($id); $user = $this->userRepo->getById($id);
$newOwnerId = $request->get('migrate_ownership_id', null); $newOwnerId = $request->input('migrate_ownership_id', null);
$this->userRepo->destroy($user, $newOwnerId); $this->userRepo->destroy($user, $newOwnerId);

4
app/Users/Controllers/UserController.php
View File

@@ -77,7 +77,7 @@ class UserController extends Controller
$this->checkPermission(Permission::UsersManage); $this->checkPermission(Permission::UsersManage);
$authMethod = config('auth.method'); $authMethod = config('auth.method');
$sendInvite = ($request->get('send_invite', 'false') === 'true'); $sendInvite = ($request->input('send_invite', 'false') === 'true');
$externalAuth = $authMethod === 'ldap' || $authMethod === 'saml2' || $authMethod === 'oidc'; $externalAuth = $authMethod === 'ldap' || $authMethod === 'saml2' || $authMethod === 'oidc';
$passwordRequired = ($authMethod === 'standard' && !$sendInvite); $passwordRequired = ($authMethod === 'standard' && !$sendInvite);
@@ -202,7 +202,7 @@ class UserController extends Controller
$this->checkPermission(Permission::UsersManage); $this->checkPermission(Permission::UsersManage);
$user = $this->userRepo->getById($id); $user = $this->userRepo->getById($id);
$newOwnerId = intval($request->get('new_owner_id')) ?: null; $newOwnerId = intval($request->input('new_owner_id')) ?: null;
$this->userRepo->destroy($user, $newOwnerId); $this->userRepo->destroy($user, $newOwnerId);

8
app/Users/Controllers/UserPreferencesController.php
View File

@@ -23,7 +23,7 @@ class UserPreferencesController extends Controller
return $this->redirectToRequest($request); return $this->redirectToRequest($request);
} }
$view = $request->get('view'); $view = $request->input('view');
if (!in_array($view, ['grid', 'list'])) { if (!in_array($view, ['grid', 'list'])) {
$view = 'list'; $view = 'list';
} }
@@ -44,8 +44,8 @@ class UserPreferencesController extends Controller
return $this->redirectToRequest($request); return $this->redirectToRequest($request);
} }
$sort = substr($request->get('sort') ?: 'name', 0, 50); $sort = substr($request->input('sort') ?: 'name', 0, 50);
$order = $request->get('order') === 'desc' ? 'desc' : 'asc'; $order = $request->input('order') === 'desc' ? 'desc' : 'asc';
$sortKey = $type . '_sort'; $sortKey = $type . '_sort';
$orderKey = $type . '_sort_order'; $orderKey = $type . '_sort_order';
@@ -76,7 +76,7 @@ class UserPreferencesController extends Controller
return response('Invalid key', 500); return response('Invalid key', 500);
} }
$newState = $request->get('expand', 'false'); $newState = $request->input('expand', 'false');
setting()->putForCurrentUser('section_expansion#' . $type, $newState); setting()->putForCurrentUser('section_expansion#' . $type, $newState);
return response('', 204); return response('', 204);

4
app/Users/Controllers/UserSearchController.php
View File

@@ -26,7 +26,7 @@ class UserSearchController extends Controller
$this->showPermissionError(); $this->showPermissionError();
} }
$search = $request->get('search', ''); $search = $request->input('search', '');
$query = User::query() $query = User::query()
->orderBy('name', 'asc') ->orderBy('name', 'asc')
->take(20); ->take(20);
@@ -58,7 +58,7 @@ class UserSearchController extends Controller
$this->showPermissionError(); $this->showPermissionError();
} }
$search = $request->get('search', ''); $search = $request->input('search', '');
$query = User::query() $query = User::query()
->orderBy('name', 'asc') ->orderBy('name', 'asc')
->take(20); ->take(20);

2
app/Util/SimpleListOptions.php
View File

@@ -30,7 +30,7 @@ class SimpleListOptions
*/ */
public static function fromRequest(Request $request, string $typeKey, bool $sortDescDefault = false): self public static function fromRequest(Request $request, string $typeKey, bool $sortDescDefault = false): self
{ {
$search = $request->get('search', ''); $search = $request->input('search', '');
$sort = setting()->getForCurrentUser($typeKey . '_sort', ''); $sort = setting()->getForCurrentUser($typeKey . '_sort', '');
$order = setting()->getForCurrentUser($typeKey . '_sort_order', $sortDescDefault ? 'desc' : 'asc'); $order = setting()->getForCurrentUser($typeKey . '_sort_order', $sortDescDefault ? 'desc' : 'asc');