nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-06 02:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

upload-limit v0.2

Browse Source
This commit is contained in:
Milos Holba
2020-11-06 12:19:31 +01:00
committed by Peter Papp
parent 2b4060cb7b
commit 966145d384
12 changed files with 26 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Tools/Editor.php
View File

@@ -258,7 +258,7 @@ class Editor
//Size of file
$file_size = File::size($file_path);
//File size handling
if($file_size > get_setting('upload_limit') * 1000000) abort(413);
if($file_size > format_bytes(get_setting('upload_limit')) && get_setting('upload_limit') !== null) abort(413);
// If last then process file
if ($request->boolean('is_last')) {

30
public/mix-manifest.json
View File

@@ -13,7 +13,7 @@
"/chunks/app-billings.js": "/chunks/app-billings.js?id=56dbf797866f9127c903",
"/chunks/app-email.js": "/chunks/app-email.js?id=37d70468d3ede6a2d5c0",
"/chunks/app-index.js": "/chunks/app-index.js?id=93085b19900c2dfedad7",
"/chunks/app-others.js": "/chunks/app-others.js?id=96f544cf246b7c83798e",
"/chunks/app-others.js": "/chunks/app-others.js?id=e3429b67edb552370955",
"/chunks/app-payments.js": "/chunks/app-payments.js?id=58a7319b7ec435ba7905",
"/chunks/app-settings.js": "/chunks/app-settings.js?id=be61c2db5a777bc9564c",
"/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?id=d453042783979afa9e8d",
@@ -29,7 +29,7 @@
"/chunks/environment-setup.js": "/chunks/environment-setup.js?id=72998371a634f818fdfd",
"/chunks/files.js": "/chunks/files.js?id=3b608964757ef9dda7c6",
"/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?id=93090f58b637eeb86ded",
"/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js?id=8972c9075ea16ab0013e",
"/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js?id=836be9ce495be50208a5",
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=f78ef9c665238797e92a",
"/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=4fb27bef1f7595b94047",
"/chunks/invoices.js": "/chunks/invoices.js?id=95740d62a1ed253ef2ff",
@@ -74,29 +74,5 @@
"/chunks/user-password.js": "/chunks/user-password.js?id=4d9e46c209e88d5f47ab",
"/chunks/user-storage.js": "/chunks/user-storage.js?id=fafc88cef747e911e17b",
"/chunks/user-subscription.js": "/chunks/user-subscription.js?id=106a3b5ccd6d467ac524",
"/chunks/users.js": "/chunks/users.js?id=f213041c6b6095cd03e1",
"/js/main.6d4c9379e93b7fd722dd.hot-update.js": "/js/main.6d4c9379e93b7fd722dd.hot-update.js",
"/js/main.4b15d11dd959b8b3d2db.hot-update.js": "/js/main.4b15d11dd959b8b3d2db.hot-update.js",
"/js/main.7e232f51ea37b33d6e6e.hot-update.js": "/js/main.7e232f51ea37b33d6e6e.hot-update.js",
"/js/main.5112e48fd1fe599851a5.hot-update.js": "/js/main.5112e48fd1fe599851a5.hot-update.js",
"/js/main.0c2a451981e2dd0c1715.hot-update.js": "/js/main.0c2a451981e2dd0c1715.hot-update.js",
"/js/main.cff8a34ed097736a59e1.hot-update.js": "/js/main.cff8a34ed097736a59e1.hot-update.js",
"/js/main.0cdd771e759ea265140e.hot-update.js": "/js/main.0cdd771e759ea265140e.hot-update.js",
"/js/main.69bba4f0cf9c152cc806.hot-update.js": "/js/main.69bba4f0cf9c152cc806.hot-update.js",
"/js/main.881a819d23cee16eb6d7.hot-update.js": "/js/main.881a819d23cee16eb6d7.hot-update.js",
"/js/main.07c2afbdae54b92f6c36.hot-update.js": "/js/main.07c2afbdae54b92f6c36.hot-update.js",
"/js/main.543c3914b4cd8c8a41e7.hot-update.js": "/js/main.543c3914b4cd8c8a41e7.hot-update.js",
"/js/main.2fc14ec56633cef5c01d.hot-update.js": "/js/main.2fc14ec56633cef5c01d.hot-update.js",
"/js/main.2252386941b35f477203.hot-update.js": "/js/main.2252386941b35f477203.hot-update.js",
"/js/main.356bde86b81bb809e395.hot-update.js": "/js/main.356bde86b81bb809e395.hot-update.js",
"/js/main.d07fa64a7eca9af40986.hot-update.js": "/js/main.d07fa64a7eca9af40986.hot-update.js",
"/js/main.db2aca618459d70e657c.hot-update.js": "/js/main.db2aca618459d70e657c.hot-update.js",
"/js/main.cbb6fa78757671216c7f.hot-update.js": "/js/main.cbb6fa78757671216c7f.hot-update.js",
"/js/main.0dda53bffacab5dede99.hot-update.js": "/js/main.0dda53bffacab5dede99.hot-update.js",
"/js/main.e44b21862f6cd329bb3a.hot-update.js": "/js/main.e44b21862f6cd329bb3a.hot-update.js",
"/js/main.8a0ab76eefcf5fa29a20.hot-update.js": "/js/main.8a0ab76eefcf5fa29a20.hot-update.js",
"/js/main.785455fdc69e948b483f.hot-update.js": "/js/main.785455fdc69e948b483f.hot-update.js",
"/js/main.1c424901e55bf50e3480.hot-update.js": "/js/main.1c424901e55bf50e3480.hot-update.js",
"/js/main.0684608c5c2bee18c2b3.hot-update.js": "/js/main.0684608c5c2bee18c2b3.hot-update.js",
"/js/main.cccce713877598037388.hot-update.js": "/js/main.cccce713877598037388.hot-update.js"
"/chunks/users.js": "/chunks/users.js?id=f213041c6b6095cd03e1"
}

6
resources/js/components/FilesView/FileItemGrid.vue
View File

@@ -22,15 +22,15 @@
<div class="icon-item">
<!--If is file or image, then link item-->
<span v-if="isFile" class="file-icon-text">
<span v-if="isFile || (isImage && !data.thumbnail)" class="file-icon-text">
{{ data.mimetype }}
</span>
<!--Folder thumbnail-->
<FontAwesomeIcon v-if="isFile" class="file-icon" icon="file"/>
<FontAwesomeIcon v-if="isFile || (isImage && !data.thumbnail)" class="file-icon" icon="file"/>
<!--Image thumbnail-->
<img loading="lazy" v-if="isImage" class="image" :src="data.thumbnail" :alt="data.name"/>
<img loading="lazy" v-if="isImage && data.thumbnail" class="image" :src="data.thumbnail" :alt="data.name"/>
<!--Else show only folder icon-->
<FontAwesomeIcon v-if="isFolder" :class="{'is-deleted': isDeleted}" class="folder-icon" icon="folder"/>

6
resources/js/components/FilesView/FileItemList.vue
View File

@@ -16,15 +16,15 @@
<!--Thumbnail for item-->
<div class="icon-item">
<!--If is file or image, then link item-->
<span v-if="isFile" class="file-icon-text">
<span v-if="isFile || (isImage && !data.thumbnail)" class="file-icon-text">
{{ data.mimetype | limitCharacters }}
</span>
<!--Folder thumbnail-->
<FontAwesomeIcon v-if="isFile" class="file-icon" icon="file" />
<FontAwesomeIcon v-if="isFile || (isImage && !data.thumbnail)" class="file-icon" icon="file" />
<!--Image thumbnail-->
<img loading="lazy" v-if="isImage" class="image" :src="data.thumbnail" :alt="data.name" />
<img loading="lazy" v-if="isImage && data.thumbnail" class="image" :src="data.thumbnail" :alt="data.name" />
<!--Else show only folder icon-->
<FontAwesomeIcon v-if="isFolder" :class="{ 'is-deleted': isDeleted }" class="folder-icon" icon="folder" />

2
resources/js/components/FilesView/FilePreview.vue
View File

@@ -1,6 +1,6 @@
<template>
<div v-if="canBePreview" class="preview">
<img v-if="fileInfoDetail.type == 'image'" :src="fileInfoDetail.thumbnail" :alt="fileInfoDetail.name" />
<img v-if="fileInfoDetail.type == 'image' && fileInfoDetail.thumbnail" :src="fileInfoDetail.thumbnail" :alt="fileInfoDetail.name" />
<audio v-else-if="fileInfoDetail.type == 'audio'" :src="fileInfoDetail.file_url" controlsList="nodownload" controls></audio>
<video v-else-if="fileInfoDetail.type == 'video'" controlsList="nodownload" disablePictureInPicture playsinline controls>
<source :src="fileInfoDetail.file_url" type="video/mp4">

14
resources/js/helpers.js vendored
View File

@@ -177,7 +177,7 @@ const Helpers = {
if (files.length == 0) return
if (!this.$checkFileMimetype(files) || !this.$checkUploadLimit(files)) return
if (!this.$checkFileMimetype(files) || !this.$checkUploadLimit(files)) return
this.$handleUploading(files, undefined)
}
@@ -301,8 +301,6 @@ const Helpers = {
title: i18n.t('popup_mimetypes_blacklist.title'),
message: i18n.t('popup_mimetypes_blacklist.message', {mimetype: fileType[1]}),
})
}else {
validated = true
}
}
return validated
@@ -310,21 +308,19 @@ const Helpers = {
Vue.prototype.$checkUploadLimit = function (files) {
let uploadLimit = store.getters.config.uploadLimit
let validate = true
console.log(store.getters.config.uploadLimitPopup)
for (let i = 0 ; i<files.length; i++ ) {
if(files[i].size > uploadLimit * 1000000 ) {
if(uploadLimit != 0 && files[i].size > uploadLimit) {
validate = false
events.$emit('alert:open', {
emoji: '😬😬😬',
emoji: '😟😟😟',
title: i18n.t('popup_upload_limit.title'),
message: i18n.t('popup_upload_limit.message', {uploadLimit: uploadLimit}),
message: i18n.t('popup_upload_limit.message', {uploadLimit: store.getters.config.uploadLimitPopup}),
})
break
}else {
validate = true
}
}
return validate
}

4
resources/js/i18n/lang/cn.json
View File

@@ -210,7 +210,7 @@
"others": {
"upload_limit": "Upload Limit",
"upload_limit_plac": "Type your upload limit in MB",
"upload_limit_help": "If you want make a limit of files size upload add size of you'r limit in MB",
"upload_limit_help": "If you want make a size limit of one file upload, add size of your limit in MB.",
"mimetypes_blacklist": "Mimetypes Blacklist",
"mimetypes_blacklist_plac":"Add mimetypes to Blacklist" ,
"mimetypes_blacklist_help" :"If you want to prevent upload some type of files, just add them to blacklist like this: x-php,mp3,jpeg <br/> Use a comma between each mimetype. Don't use a dot before mimetypes." ,
@@ -499,7 +499,7 @@
},
"popup_upload_limit": {
"title": "Oh No",
"message": "Size of your file upload exceed the upload limit ({uploadLimit} MB)"
"message": "Size of your uploaded file exceeds the upload limit ({uploadLimit} MB)."
},
"popup_mimetypes_blacklist": {
"title": "Oh no",

4
resources/js/i18n/lang/en.json
View File

@@ -212,7 +212,7 @@
"others": {
"upload_limit": "Upload Limit",
"upload_limit_plac": "Type your upload limit in MB",
"upload_limit_help": "If you want make a limit of files size upload add size of you'r limit in MB",
"upload_limit_help": "If you want make a size limit of one file upload, add size of your limit in MB.",
"mimetypes_blacklist": "Mimetypes Blacklist",
"mimetypes_blacklist_plac":"Add mimetypes to Blacklist" ,
"mimetypes_blacklist_help" :"If you want to prevent upload some type of files, just add them to blacklist like this: x-php,mp3,jpeg <br/> Use a comma between each mimetype. Don't use a dot before mimetypes." ,
@@ -501,7 +501,7 @@
},
"popup_upload_limit": {
"title": "Oh No",
"message": "Size of your file upload exceed the upload limit ({uploadLimit} MB)"
"message": "Size of your uploaded file exceeds the upload limit ({uploadLimit} MB)."
},
"popup_mimetypes_blacklist": {
"title": "Oh No",

4
resources/js/i18n/lang/sk.json
View File

@@ -210,9 +210,9 @@
"username_plac": "Zadajte svoje používateľské meno pre poštu"
},
"others": {
"upload_limit": "Limit pre velkost nahrávaného súbor",
"upload_limit": "Limit nahrávania",
"upload_limit_plac": "Pridajte veľkosť limitu v MB",
"upload_limit_help": "Ak chcete vytvoriť limit pre nahravane súbory pridajte veľkosť vášho limitu v MB.",
"upload_limit_help": "Ak chcete vytvoriť limit pre nahravane jedneho súboru pridajte veľkosť vášho limitu v MB.",
"mimetypes_blacklist": "Čierna listina mimetypov",
"mimetypes_blacklist_plac":"Pridajte mimetypy do Čiernej listiny",
"mimetypes_blacklist_help" :"Ak chcete zakázať nahrávanie niektorých typov súborov, jednoducho ich pridajte na čiernu listinu, príklad: x-php, mp3, jpeg <br/> Medzi mimetypmi použite čiarku. Nevkladajte bodku pred mimetyp." ,

2
resources/js/store/modules/fileFunctions.js vendored
View File

@@ -133,7 +133,7 @@ const actions = {
events.$emit('alert:open', {
emoji: '😟😟😟',
title: i18n.t('popup_upload_limit.title'),
message: i18n.t('popup_upload_limit.message', {uploadLimit: getters.config.uploadLimit})
message: i18n.t('popup_upload_limit.message', {uploadLimit: getters.config.uploadLimitPopup})
})
break;
default:

2
resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue
View File

@@ -92,7 +92,7 @@
<div class="block-wrapper">
<label>{{ $t('admin_settings.others.upload_limit') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Mimetypes Blacklist" v-slot="{ errors }">
<input @input="$updateText('/settings', 'upload_limit', app.uploadLimit)" v-model="app.uploadLimit" :placeholder="$t('admin_settings.others.upload_limit_plac')" type="number" :class="{'is-error': errors[0]}"/>
<input @input="$updateText('/settings', 'upload_limit', app.uploadLimit)" v-model="app.uploadLimit" :placeholder="$t('admin_settings.others.upload_limit_plac')" type="number" min="0" :class="{'is-error': errors[0]}"/>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
<small class="input-help" v-html="$t('admin_settings.others.upload_limit_help')"></small>

3
resources/views/index.blade.php
View File

@@ -56,7 +56,8 @@
storageDefaultSpace: {{ isset($settings->storage_default) ? $settings->storage_default : 5 }},
storageDefaultSpaceFormatted: '{{ isset($settings->storage_default) ? format_gigabytes($settings->storage_default) : format_gigabytes(5) }}',
mimetypesBlacklist: '{{ isset($settings->mimetypes_blacklist) ? $settings->mimetypes_blacklist: null}}',
uploadLimit: '{{ isset($settings->upload_limit) ? $settings->upload_limit: null}}' ,
uploadLimit: '{{ format_bytes(isset($settings->upload_limit) ? $settings->upload_limit: null)}}' ,
uploadLimitPopup: '{{isset($settings->upload_limit)}}',
hasAuthCookie: {{ Cookie::has('token') ? 1 : 0 }},
isSaaS: {{ isset($settings->license) && $settings->license === 'Extended' ? 1 : 0 }},