Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Platform
Commits
6fbfdd6f
Unverified
Commit
6fbfdd6f
authored
Oct 05, 2017
by
Nicolas Widart
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding extra size validation rule
parent
5d4fba7d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
54 additions
and
2 deletions
+54
-2
UploadDropzoneMediaRequest.php
Modules/Media/Http/Requests/UploadDropzoneMediaRequest.php
+28
-1
UploadMediaRequest.php
Modules/Media/Http/Requests/UploadMediaRequest.php
+26
-1
No files found.
Modules/Media/Http/Requests/UploadDropzoneMediaRequest.php
View file @
6fbfdd6f
...
...
@@ -9,8 +9,25 @@ class UploadDropzoneMediaRequest extends FormRequest
{
public
function
rules
()
{
$extensions
=
'mimes:'
.
str_replace
(
'.'
,
''
,
config
(
'asgard.media.config.allowed-types'
));
$maxFileSize
=
$this
->
getMaxFileSizeInKilobytes
();
return
[
'file'
=>
[
'required'
,
new
MaxFolderSizeRule
(),
$extensions
,
"size:
$maxFileSize
"
,
],
];
}
public
function
messages
()
{
$size
=
$this
->
getMaxFileSize
();
return
[
'file
'
=>
[
'required'
,
new
MaxFolderSizeRule
()],
'file
.size'
=>
"File is too large. Must be below
{
$size
}
MB."
];
}
...
...
@@ -18,4 +35,14 @@ class UploadDropzoneMediaRequest extends FormRequest
{
return
true
;
}
private
function
getMaxFileSizeInKilobytes
()
{
return
$this
->
getMaxFileSize
()
*
1000
;
}
private
function
getMaxFileSize
()
{
return
config
(
'asgard.media.config.max-file-size'
);
}
}
Modules/Media/Http/Requests/UploadMediaRequest.php
View file @
6fbfdd6f
...
...
@@ -10,9 +10,24 @@ class UploadMediaRequest extends FormRequest
public
function
rules
()
{
$extensions
=
'mimes:'
.
str_replace
(
'.'
,
''
,
config
(
'asgard.media.config.allowed-types'
));
$maxFileSize
=
$this
->
getMaxFileSizeInKilobytes
();
return
[
'file'
=>
[
'required'
,
new
MaxFolderSizeRule
(),
$extensions
],
'file'
=>
[
'required'
,
new
MaxFolderSizeRule
(),
$extensions
,
"size:
$maxFileSize
"
,
],
];
}
public
function
messages
()
{
$size
=
$this
->
getMaxFileSize
();
return
[
'file.size'
=>
"File is too large. Must be below
{
$size
}
MB."
];
}
...
...
@@ -20,4 +35,14 @@ class UploadMediaRequest extends FormRequest
{
return
true
;
}
private
function
getMaxFileSizeInKilobytes
()
{
return
$this
->
getMaxFileSize
()
*
1000
;
}
private
function
getMaxFileSize
()
{
return
config
(
'asgard.media.config.max-file-size'
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment