X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/18f406d97bfb0583e49e195817dd8a274cb0619d..refs/pull/3406/head:/app/Uploads/Attachment.php diff --git a/app/Uploads/Attachment.php b/app/Uploads/Attachment.php index 3367594ef..5e637246a 100644 --- a/app/Uploads/Attachment.php +++ b/app/Uploads/Attachment.php @@ -1,14 +1,42 @@ - 'bool', + ]; /** * Get the downloadable file name for this upload. + * * @return mixed|string */ public function getFileName() @@ -16,14 +44,14 @@ class Attachment extends Ownable if (strpos($this->name, '.') !== false) { return $this->name; } + return $this->name . '.' . $this->extension; } /** * Get the page this file was uploaded to. - * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function page() + public function page(): BelongsTo { return $this->belongsTo(Page::class, 'uploaded_to'); } @@ -31,21 +59,43 @@ class Attachment extends Ownable /** * Get the url of this file. */ - public function getUrl(): string + public function getUrl($openInline = false): string { if ($this->external && strpos($this->path, 'http') !== 0) { return $this->path; } - return url('/http/source.bookstackapp.com/attachments/' . $this->id); + + return url('/http/source.bookstackapp.com/attachments/' . $this->id . ($openInline ? '?open=true' : '')); } + /** + * Generate a HTML link to this attachment. + */ public function htmlLink(): string { - return ''.e($this->name).''; + return '' . e($this->name) . ''; } + /** + * Generate a markdown link to this attachment. + */ public function markdownLink(): string { + return '[' . $this->name . '](' . $this->getUrl() . ')'; + } + + /** + * Scope the query to those attachments that are visible based upon related page permissions. + */ + public function scopeVisible(): Builder + { + $permissionService = app()->make(PermissionService::class); + return $permissionService->filterRelatedEntity( + Page::class, + self::query(), + 'attachments', + 'uploaded_to' + ); } }