reading metadata in shared link RC

This commit is contained in:
Peter Papp
2020-08-25 12:36:21 +02:00
parent f3a2758bcc
commit af1228e363
17 changed files with 27 additions and 46 deletions
@@ -129,7 +129,7 @@ class AppFunctionsController extends Controller
$metadata = [ $metadata = [
'is_protected' => $shared->protected, 'is_protected' => $shared->protected,
'url' => $file->thumbnail ? $file->thumbnail : null, 'url' => url('/shared', ['token' => $token]),
'user' => $user->name, 'user' => $user->name,
'name' => $file->name, 'name' => $file->name,
'size' => $file->filesize, 'size' => $file->filesize,
@@ -137,8 +137,6 @@ class AppFunctionsController extends Controller
]; ];
} }
return $metadata;
// Handle single file // Handle single file
if ($shared->type === 'folder') { if ($shared->type === 'folder') {
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -5,7 +5,7 @@
*/ */
/*! /*!
* vue-i18n v8.21.0 * vue-i18n v8.18.2
* (c) 2020 kazuya kawaguchi * (c) 2020 kazuya kawaguchi
* Released under the MIT License. * Released under the MIT License.
*/ */
@@ -17,7 +17,7 @@
*/ */
/** /**
* vee-validate v3.3.9 * vee-validate v3.3.7
* (c) 2020 Abdelrahman Awad * (c) 2020 Abdelrahman Awad
* @license MIT * @license MIT
*/ */
+1 -24
View File
@@ -1,46 +1,25 @@
{ {
"/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js",
"/js/main.js": "/js/main.js", "/js/main.js": "/js/main.js",
"/css/app.css": "/css/app.css", "/css/app.css": "/css/app.css",
"/js/main.12cf59750f6cfa2f7c9a.hot-update.js": "/js/main.12cf59750f6cfa2f7c9a.hot-update.js",
"/js/main.5763ac51fedad16ae10b.hot-update.js": "/js/main.5763ac51fedad16ae10b.hot-update.js",
"/js/main.575c1846985c2cb9abb7.hot-update.js": "/js/main.575c1846985c2cb9abb7.hot-update.js",
"/js/main.0122ca7064f9abfd6a91.hot-update.js": "/js/main.0122ca7064f9abfd6a91.hot-update.js",
"/js/main.bc521312bfe2daa15aab.hot-update.js": "/js/main.bc521312bfe2daa15aab.hot-update.js",
"/js/main.3f995b7fb3f3fc65b4b8.hot-update.js": "/js/main.3f995b7fb3f3fc65b4b8.hot-update.js",
"/js/main.da94e65c457965ad6295.hot-update.js": "/js/main.da94e65c457965ad6295.hot-update.js",
"/js/main.c14c38dd70a5c0de9953.hot-update.js": "/js/main.c14c38dd70a5c0de9953.hot-update.js",
"/js/main.b6227483c960ebe442d6.hot-update.js": "/js/main.b6227483c960ebe442d6.hot-update.js",
"/js/main.6ac5211eeba47b7e6828.hot-update.js": "/js/main.6ac5211eeba47b7e6828.hot-update.js",
"/js/main.970f8f7978f932df42f3.hot-update.js": "/js/main.970f8f7978f932df42f3.hot-update.js",
"/chunks/admin.js": "/chunks/admin.js", "/chunks/admin.js": "/chunks/admin.js",
"/chunks/admin-account.js": "/chunks/admin-account.js", "/chunks/admin-account.js": "/chunks/admin-account.js",
"/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js",
"/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js",
"/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/trash.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/trash.js",
"/chunks/app-appearance.js": "/chunks/app-appearance.js", "/chunks/app-appearance.js": "/chunks/app-appearance.js",
"/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js",
"/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js",
"/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js",
"/chunks/app-billings.js": "/chunks/app-billings.js", "/chunks/app-billings.js": "/chunks/app-billings.js",
"/chunks/app-email.js": "/chunks/app-email.js", "/chunks/app-email.js": "/chunks/app-email.js",
"/chunks/app-index.js": "/chunks/app-index.js", "/chunks/app-index.js": "/chunks/app-index.js",
"/chunks/app-others.js": "/chunks/app-others.js", "/chunks/app-others.js": "/chunks/app-others.js",
"/chunks/app-payments.js": "/chunks/app-payments.js", "/chunks/app-payments.js": "/chunks/app-payments.js",
"/chunks/app-settings.js": "/chunks/app-settings.js", "/chunks/app-settings.js": "/chunks/app-settings.js",
"/chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~8a0e1d25.js": "/chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~8a0e1d25.js",
"/chunks/app-setup.js": "/chunks/app-setup.js", "/chunks/app-setup.js": "/chunks/app-setup.js",
"/chunks/billings-detail.js": "/chunks/billings-detail.js", "/chunks/billings-detail.js": "/chunks/billings-detail.js",
"/chunks/contact-us.js": "/chunks/contact-us.js", "/chunks/contact-us.js": "/chunks/contact-us.js",
"/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js": "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js",
"/chunks/create-new-password.js": "/chunks/create-new-password.js", "/chunks/create-new-password.js": "/chunks/create-new-password.js",
"/chunks/dashboard.js": "/chunks/dashboard.js", "/chunks/dashboard.js": "/chunks/dashboard.js",
"/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js",
"/chunks/database.js": "/chunks/database.js", "/chunks/database.js": "/chunks/database.js",
"/chunks/dynamic-page.js": "/chunks/dynamic-page.js", "/chunks/dynamic-page.js": "/chunks/dynamic-page.js",
"/chunks/environment-setup.js": "/chunks/environment-setup.js", "/chunks/environment-setup.js": "/chunks/environment-setup.js",
"/chunks/files.js": "/chunks/files.js", "/chunks/files.js": "/chunks/files.js",
"/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js",
"/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js",
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js", "/chunks/forgotten-password.js": "/chunks/forgotten-password.js",
"/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js", "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js",
"/chunks/invoices.js": "/chunks/invoices.js", "/chunks/invoices.js": "/chunks/invoices.js",
@@ -55,7 +34,6 @@
"/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js", "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js",
"/chunks/plans.js": "/chunks/plans.js", "/chunks/plans.js": "/chunks/plans.js",
"/chunks/profile.js": "/chunks/profile.js", "/chunks/profile.js": "/chunks/profile.js",
"/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js",
"/chunks/purchase-code.js": "/chunks/purchase-code.js", "/chunks/purchase-code.js": "/chunks/purchase-code.js",
"/chunks/settings.js": "/chunks/settings.js", "/chunks/settings.js": "/chunks/settings.js",
"/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js", "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js",
@@ -75,7 +53,6 @@
"/chunks/trash.js": "/chunks/trash.js", "/chunks/trash.js": "/chunks/trash.js",
"/chunks/upgrade.js": "/chunks/upgrade.js", "/chunks/upgrade.js": "/chunks/upgrade.js",
"/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js", "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js",
"/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js",
"/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js", "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js",
"/chunks/user.js": "/chunks/user.js", "/chunks/user.js": "/chunks/user.js",
"/chunks/user-create.js": "/chunks/user-create.js", "/chunks/user-create.js": "/chunks/user-create.js",
+4
View File
@@ -52,4 +52,8 @@ return [
'col_amount' => 'Amount', 'col_amount' => 'Amount',
'total' => 'Total', 'total' => 'Total',
// OG Page
'user_sending' => ':name is sending you this file',
'protected_file' => 'This link is protected by password',
]; ];
+2 -2
View File
@@ -54,6 +54,6 @@ return [
'total' => 'Total', 'total' => 'Total',
// OG Page // OG Page
'user_sending' => '', 'user_sending' => ':name is sending you this file',
'protected_file' => '', 'protected_file' => 'This link is protected by password',
]; ];
+4
View File
@@ -52,4 +52,8 @@ return [
'col_amount' => 'Čiastka', 'col_amount' => 'Čiastka',
'total' => 'Spolu', 'total' => 'Spolu',
// OG Page
'user_sending' => ':name ti posiela súbor.',
'protected_file' => 'Tento link je chránený heslom',
]; ];
-1
View File
@@ -15,7 +15,6 @@
.error-message { .error-message {
position: absolute; position: absolute;
left: 0; left: 0;
top: 50px;
} }
} }
} }
+4 -5
View File
@@ -7,23 +7,22 @@
<meta name="fragment" content="!"> <meta name="fragment" content="!">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="{{ $metadata['user'] }} is sending you this file"> <meta name="description" content="{{ __('vuefilemanager.user_sending', ['name' => $metadata['user']]) }}">
{{--OG Public items--}} {{--OG Public items--}}
<meta property="og:url" content="{{ $metadata['url'] }}"> <meta property="og:url" content="{{ $metadata['url'] }}">
<meta property="og:description" content="{{ $metadata['user'] }} is sending you this file"> <meta property="og:description" content="{{ __('vuefilemanager.user_sending', ['name' => $metadata['user']]) }}">
{{--Show protected og metadata--}} {{--Show protected og metadata--}}
@if($metadata['is_protected']) @if($metadata['is_protected'])
<meta property="og:title" content="This file is protected by password"> <meta property="og:title" content="{{ __('vuefilemanager.protected_file') }}">
<title>This file is protected by password</title> <title>{{ __('vuefilemanager.protected_file') }}</title>
@endif @endif
{{--Show public og metadata--}} {{--Show public og metadata--}}
@if(! $metadata['is_protected']) @if(! $metadata['is_protected'])
@if($metadata['thumbnail']) @if($metadata['thumbnail'])
<meta property="og:type" content="image" />
<meta property="og:image" content="{{ $metadata['thumbnail'] }}"> <meta property="og:image" content="{{ $metadata['thumbnail'] }}">
@endif @endif