Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
cc2cb795
Commit
cc2cb795
authored
Dec 06, 2006
by
Steven Wittens
Browse files
#101714
: Allow OpenDocument file extensions by default.
parent
dd9d2726
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/upload/upload.module
View file @
cc2cb795
...
...
@@ -158,7 +158,7 @@ function upload_admin_settings_validate($form_id, $form_values) {
* Menu callback for the upload settings form.
*/
function
upload_admin_settings
()
{
$upload_extensions_default
=
variable_get
(
'upload_extensions_default'
,
'jpg jpeg gif png txt html doc xls pdf ppt pps'
);
$upload_extensions_default
=
variable_get
(
'upload_extensions_default'
,
'jpg jpeg gif png txt html doc xls pdf ppt pps
odt ods odp
'
);
$upload_uploadsize_default
=
variable_get
(
'upload_uploadsize_default'
,
1
);
$upload_usersize_default
=
variable_get
(
'upload_usersize_default'
,
1
);
...
...
@@ -423,7 +423,7 @@ function _upload_validate(&$node) {
$total_usersize
=
upload_space_used
(
$user
->
uid
)
+
$filesize
;
$error
=
array
();
foreach
(
$user
->
roles
as
$rid
=>
$name
)
{
$extensions
=
variable_get
(
"upload_extensions_
$rid
"
,
variable_get
(
'upload_extensions_default'
,
'jpg jpeg gif png txt html doc xls pdf ppt pps'
));
$extensions
=
variable_get
(
"upload_extensions_
$rid
"
,
variable_get
(
'upload_extensions_default'
,
'jpg jpeg gif png txt html doc xls pdf ppt pps
odt ods odp
'
));
$uploadsize
=
variable_get
(
"upload_uploadsize_
$rid
"
,
variable_get
(
'upload_uploadsize_default'
,
1
))
*
1024
*
1024
;
$usersize
=
variable_get
(
"upload_usersize_
$rid
"
,
variable_get
(
'upload_usersize_default'
,
1
))
*
1024
*
1024
;
...
...
@@ -641,7 +641,7 @@ function upload_munge_filename($filename, $extensions = NULL, $alerts = 1) {
if
(
!
isset
(
$extensions
))
{
$extensions
=
''
;
foreach
(
$user
->
roles
as
$rid
=>
$name
)
{
$extensions
.
=
' '
.
variable_get
(
"upload_extensions_
$rid
"
,
variable_get
(
'upload_extensions_default'
,
'jpg jpeg gif png txt html doc xls pdf ppt pps'
));
$extensions
.
=
' '
.
variable_get
(
"upload_extensions_
$rid
"
,
variable_get
(
'upload_extensions_default'
,
'jpg jpeg gif png txt html doc xls pdf ppt pps
odt ods odp
'
));
}
}
...
...
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