Skip to content

fix: redirect to proper directory if file not found - #40515

Merged
skjnldsv merged 1 commit into
masterfrom
fix/redirect-if-wrong-dir
Oct 4, 2023
Merged

fix: redirect to proper directory if file not found#40515
skjnldsv merged 1 commit into
masterfrom
fix/redirect-if-wrong-dir

Conversation

@skjnldsv

@skjnldsvskjnldsv commented Sep 19, 2023•
edited by szaimen
Loading

Copy link
Copy Markdown
Member

Fix#32177
Fix#40104

  1. If you ask for a fileid in a dir
  2. And the fileid doesn't exists in that directory
  3. BUT the file only exists in one occurrence in another directory
  4. Then redirect to that file

@skjnldsvskjnldsv added this to the Nextcloud 28 milestone Sep 19, 2023
@skjnldsv
skjnldsv requested a review from a teamSeptember 19, 2023 19:01
@skjnldsvskjnldsv self-assigned this Sep 19, 2023
@skjnldsv
skjnldsv requested review from ArtificialOwl, icewind1991 and nfebe and removed request for a teamSeptember 19, 2023 19:01
skjnldsv
skjnldsv commented Sep 19, 2023
View reviewed changes
Comment threadapps/files/lib/Controller/ViewController.php
github-advanced-security[bot]
github-advanced-securityAI found potential problems Sep 19, 2023
View reviewed changes
Comment threadapps/files/lib/Controller/ViewController.php
if ($fileid && $dir !== '') {
$baseFolder = $this->rootFolder->getUserFolder($userId);
$nodes = $baseFolder->getById((int) $fileid);
$relativePath = dirname($baseFolder->getRelativePath($nodes[0]->getPath()));

Check notice

Code scanning / Psalm

PossiblyNullArgument

Argument 1 of dirname cannot be null, possibly null value provided
Comment threadapps/files/lib/Controller/ViewController.php Fixed
@skjnldsvskjnldsv mentioned this pull request Sep 24, 2023
Merged
@skjnldsv
skjnldsvforce-pushed the fix/redirect-if-wrong-dir branch from a2b76c8 to 3f0a9f2CompareSeptember 26, 2023 18:47
@skjnldsv

skjnldsv commented Oct 4, 2023

Copy link
Copy Markdown
MemberAuthor

Ping everyone! 🙏

@skjnldsv
skjnldsvforce-pushed the fix/redirect-if-wrong-dir branch from 3f0a9f2 to 1349e2aCompareOctober 4, 2023 06:50
max-nextcloud
max-nextcloud reviewed Oct 4, 2023
View reviewed changes
Comment threadapps/files/lib/Controller/ViewController.php
Altahrim
Altahrim approved these changes Oct 4, 2023
View reviewed changes
Comment threadapps/files/lib/Controller/ViewController.php Outdated
Comment threadapps/files/lib/Controller/ViewController.php Fixed
@skjnldsv
fix: redirect to proper directory if file not found
b05719c
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv
skjnldsvforce-pushed the fix/redirect-if-wrong-dir branch from 1349e2a to b05719cCompareOctober 4, 2023 09:29
@skjnldsv
skjnldsv merged commit ff9be6b into masterOct 4, 2023
@skjnldsv
skjnldsv deleted the fix/redirect-if-wrong-dir branch October 4, 2023 14:37
@joshtrichardsjoshtrichards mentioned this pull request Dec 21, 2023
Merged
@skjnldsvskjnldsv mentioned this pull request Jan 26, 2024
Closed
6 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AltahrimAltahrimAltahrim approved these changes
@miaulalalamiaulalalamiaulalala approved these changes
@max-nextcloudmax-nextcloudmax-nextcloud approved these changes
@ArtificialOwlArtificialOwlAwaiting requested review from ArtificialOwlArtificialOwl is a code owner automatically assigned from nextcloud/server-backend
@icewind1991icewind1991Awaiting requested review from icewind1991icewind1991 is a code owner automatically assigned from nextcloud/server-backend
@nfebenfebeAwaiting requested review from nfebenfebe is a code owner automatically assigned from nextcloud/server-backend
@schiessleschiessleAwaiting requested review from schiessle

Assignees

@skjnldsvskjnldsv

Labels

3. to reviewWaiting for reviewsenhancementfeature: files

Projects

Files to vue
Status: Done

Milestone

Nextcloud 28

Development

Successfully merging this pull request may close these issues.

[Bug]: url share not working [Bug]: internal links don't seem to get resolved properly

5 participants

@skjnldsv@Altahrim@miaulalala@github-advanced-security@max-nextcloud