From 5b3bd8ff2a29e2c1ada4c49de4c50c132b603863 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 26 Mar 2023 12:41:44 +0300 Subject: [PATCH] Add some info about allowed filesizes and filetypes for attachments and avatars. Thanks to Meeques and xet7 ! Fixes #4863 --- client/components/cards/cardDetails.jade | 7 +++++++ client/components/users/userAvatar.jade | 7 +++++++ imports/i18n/data/en.i18n.json | 7 ++++++- server/max-size.js | 8 ++++++++ 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 server/max-size.js diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 6299f04dd..6f4d16358 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -554,6 +554,13 @@ template(name="cardDetails") h3.card-details-item-title i.fa.fa-paperclip | {{_ 'attachments'}} + if Meteor.settings.public.attachmentsUploadMaxSize + | {{_ 'max-upload-filesize'}} {{Meteor.settings.public.attachmentsUploadMaxSize}} + br + if Meteor.settings.public.attachmentsUploadMimeTypes + | {{_ 'allowed-upload-filetypes'}} {{Meteor.settings.public.attachmentsUploadMimeTypes}} + br + | {{_ 'invalid-file'}} .card-checklist-attachmentGalery.card-attachmentGalery +attachmentsGalery hr diff --git a/client/components/users/userAvatar.jade b/client/components/users/userAvatar.jade index 8d0fec8b3..db123f282 100644 --- a/client/components/users/userAvatar.jade +++ b/client/components/users/userAvatar.jade @@ -102,6 +102,13 @@ template(name="changeAvatarPopup") i.fa.fa-check p.sub-name {{_ 'default-avatar'}} input.hide.js-upload-avatar-input(accept="image/*;capture=camera" type="file") + if Meteor.settings.public.avatarsUploadMaxSize + | {{_ 'max-avatar-filesize'}} {{Meteor.settings.public.avatarsUploadMaxSize}} + br + if Meteor.settings.public.avatarsUploadMimeTypes + | {{_ 'allowed-avatar-filetypes'}} {{Meteor.settings.public.avatarsUploadMimeTypes}} + br + | {{_ 'invalid-file'}} button.full.js-upload-avatar i.fa.fa-upload | {{_ 'upload-avatar'}} diff --git a/imports/i18n/data/en.i18n.json b/imports/i18n/data/en.i18n.json index c75345468..e4e4b680c 100644 --- a/imports/i18n/data/en.i18n.json +++ b/imports/i18n/data/en.i18n.json @@ -1202,5 +1202,10 @@ "forgot-password": "Forgot password", "minicardDetailsActionsPopup-title": "Card Details", "Mongo_sessions_count": "Mongo sessions count", - "change-visibility": "Change Visibility" + "change-visibility": "Change Visibility", + "max-upload-filesize": "Max upload filesize in bytes:", + "allowed-upload-filetypes": "Allowed upload filetypes:", + "max-avatar-filesize": "Max avatar filesize in bytes:", + "allowed-avatar-filetypes": "Allowed avatar filetypes:", + "invalid-file": "If filename is invalid, upload or rename is cancelled." } diff --git a/server/max-size.js b/server/max-size.js new file mode 100644 index 000000000..68dd1ea03 --- /dev/null +++ b/server/max-size.js @@ -0,0 +1,8 @@ +Meteor.startup(() => { + if (process.env.HEADER_LOGIN_ID) { + Meteor.settings.public.attachmentsUploadMaxSize = process.env.ATTACHMENTS_UPLOAD_MAX_SIZE; + Meteor.settings.public.attachmentsUploadMimeTypes = process.env.ATTACHMENTS_UPLOAD_MIME_TYPES; + Meteor.settings.public.avatarsUploadMaxSize = process.env.AVATARS_UPLOAD_MAX_SIZE; + Meteor.settings.public.avatarsUploadMimeTypes = process.env.AVATARS_UPLOAD_MIME_TYPES; + } +});