Skip to content

Use file-specific attachment folder for uploaded images #1928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
julien-nc merged 12 commits into from
Nov 22, 2021
Merged

Use file-specific attachment folder for uploaded images #1928

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b2ed068
display/upload/add-link works with attachment folder in user context
Oct 22, 2021
ac273bf
identify image by name instead of id in text file content
Oct 22, 2021
15ae70e
serve attached images to public links
Oct 22, 2021
4958c7a
public upload/link-insertion almost done, issue with missing fileId i…
Oct 22, 2021
8d22717
fix upload/link-dl in single file share edition, get it from upload r…
Oct 22, 2021
f71bae3
fix share link permissions check
Oct 22, 2021
7cfc803
add user share permissions check
Oct 22, 2021
d74c36c
cleanup server side stuff
Nov 2, 2021
b4705da
check mime type on upload (client and server side)
Nov 2, 2021
76ad986
provide content-type header when serving images
Nov 2, 2021
d477769
serve image previews
Nov 2, 2021
2d72f6c
hide image link input when closing image action popup
Nov 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix share link permissions check 
Signed-off-by: Julien Veyssier <[email protected]>
  • Loading branch information
Julien Veyssier committed Nov 2, 2021
commit f71bae36d6bd5f3a38d0c486952371e9d8fb2130
2 changes: 1 addition & 1 deletion lib/Service/ImageService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ public function insertImageLinkPublic(?int $textFileId, string $link, string $to
private function hasUpdatePermissions(string $token): bool {
try {
$share = $this->shareManager->getShareByToken($token);
return ($share->getShareType() === IShare::TYPE_LINK && $share->getPermissions() | Constants::PERMISSION_UPDATE);
return ($share->getShareType() === IShare::TYPE_LINK && $share->getPermissions() & Constants::PERMISSION_UPDATE);
} catch (ShareNotFound $e) {
return false;
}
Expand Down