Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
976451f8
Commit
976451f8
authored
Sep 09, 2010
by
Ruslan Kabalin
Browse files
filebrowser: File upload errors are not catched (bug #634147)
Signed-off-by:
Ruslan Kabalin
<
ruslan.kabalin@luns.net.uk
>
parent
4f2c1577
Changes
1
Hide whitespace changes
Inline
Side-by-side
htdocs/artefact/file/form/elements/filebrowser.php
View file @
976451f8
...
...
@@ -491,39 +491,38 @@ function pieform_element_filebrowser_doupdate(Pieform $form, $element) {
'browse'
=>
1
,
);
}
}
if
(
isset
(
$_FILES
[
'userfile'
][
'error'
])
&&
$_FILES
[
'userfile'
][
'error'
]
==
0
)
{
if
(
strlen
(
$_FILES
[
'userfile'
][
'name'
])
>
1024
)
{
return
array
(
'error'
=>
true
,
'message'
=>
get_string
(
'nametoolong'
,
'artefact.file'
),
);
}
else
if
(
$element
[
'config'
][
'uploadagreement'
]
&&
!
param_boolean
(
$prefix
.
'_notice'
,
false
))
{
return
array
(
'error'
=>
true
,
'message'
=>
get_string
(
'youmustagreetothecopyrightnotice'
,
'artefact.file'
),
'browse'
=>
1
,
);
}
$result
=
pieform_element_filebrowser_upload
(
$form
,
$element
,
array
(
'userfile'
=>
$_FILES
[
'userfile'
],
'uploadnumber'
=>
param_integer
(
$prefix
.
'_uploadnumber'
),
'uploadfolder'
=>
$element
[
'folder'
]
?
$element
[
'folder'
]
:
null
,
'uploadfoldername'
=>
param_variable
(
$prefix
.
'_foldername'
),
));
// If it's a non-js upload, automatically select the newly uploaded file.
$result
[
'browse'
]
=
1
;
if
(
!
$form
->
submitted_by_js
()
&&
!
$result
[
'error'
]
&&
!
empty
(
$element
[
'config'
][
'select'
]))
{
if
(
isset
(
$element
[
'selectcallback'
])
&&
is_callable
(
$element
[
'selectcallback'
]))
{
$element
[
'selectcallback'
](
$result
[
'highlight'
]);
else
{
if
(
strlen
(
$_FILES
[
'userfile'
][
'name'
])
>
1024
)
{
return
array
(
'error'
=>
true
,
'message'
=>
get_string
(
'nametoolong'
,
'artefact.file'
),
);
}
else
{
$result
[
'select'
]
=
$result
[
'highlight'
];
else
if
(
$element
[
'config'
][
'uploadagreement'
]
&&
!
param_boolean
(
$prefix
.
'_notice'
,
false
))
{
return
array
(
'error'
=>
true
,
'message'
=>
get_string
(
'youmustagreetothecopyrightnotice'
,
'artefact.file'
),
'browse'
=>
1
,
);
}
$result
=
pieform_element_filebrowser_upload
(
$form
,
$element
,
array
(
'userfile'
=>
$_FILES
[
'userfile'
],
'uploadnumber'
=>
param_integer
(
$prefix
.
'_uploadnumber'
),
'uploadfolder'
=>
$element
[
'folder'
]
?
$element
[
'folder'
]
:
null
,
'uploadfoldername'
=>
param_variable
(
$prefix
.
'_foldername'
),
));
// If it's a non-js upload, automatically select the newly uploaded file.
$result
[
'browse'
]
=
1
;
if
(
!
$form
->
submitted_by_js
()
&&
!
$result
[
'error'
]
&&
!
empty
(
$element
[
'config'
][
'select'
]))
{
if
(
isset
(
$element
[
'selectcallback'
])
&&
is_callable
(
$element
[
'selectcallback'
]))
{
$element
[
'selectcallback'
](
$result
[
'highlight'
]);
}
else
{
$result
[
'select'
]
=
$result
[
'highlight'
];
}
}
return
$result
;
}
return
$result
;
}
if
(
!
$form
->
submitted_by_js
())
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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