Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.3] The "Forbidden MIME Types" parameter is not used #39196

Closed
wants to merge 10 commits into from
8 changes: 0 additions & 8 deletions administrator/components/com_media/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,6 @@
showon="restrict_uploads:1"
/>

<field
name="upload_mime_illegal"
type="text"
label="COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_LABEL"
description="COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_DESC"
default="text/html"
showon="restrict_uploads:1"
/>
</fieldset>

<fieldset
Expand Down
2 changes: 0 additions & 2 deletions administrator/language/en-GB/com_media.ini
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ COM_MEDIA_FIELD_CHECK_MIME_DESC="Use MIME Magic or Fileinfo to attempt to verify
COM_MEDIA_FIELD_CHECK_MIME_LABEL="Check MIME Types"
COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC="Ignored file extensions for MIME type checking and restricted uploads."
COM_MEDIA_FIELD_IGNORED_EXTENSIONS_LABEL="Ignored Extensions"
COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_DESC="A comma separated list of forbidden MIME types to upload."
COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_LABEL="Forbidden MIME Types"
COM_MEDIA_FIELD_LEGAL_AUDIO_EXTENSIONS_DESC="Audio extensions (file types) you are allowed to upload (comma separated). These are used to check for valid audio headers."
COM_MEDIA_FIELD_LEGAL_AUDIO_EXTENSIONS_LABEL="Legal Audio Extensions (File Types)"
COM_MEDIA_FIELD_LEGAL_DOCUMENT_EXTENSIONS_DESC="Document extensions (file types) you are allowed to upload (comma separated). These are used to check for valid document headers."
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.media-toolbar {
position: sticky;
top: 67px;
z-index: 1;
z-index: 10;
display: flex;
flex-wrap: wrap;
padding: 0;
Expand Down
5 changes: 5 additions & 0 deletions build/media_source/system/css/fields/calendar-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -171,3 +171,8 @@ div.calendar-container table td.title { /* This holds the current "month, year"
background-repeat: no-repeat;
background-position: center;
}
/* Fix cursor on js-btn and time select */
.calendar-container select,
.calendar-container .js-btn {
cursor: pointer;
}
5 changes: 5 additions & 0 deletions build/media_source/system/css/fields/calendar.css
Original file line number Diff line number Diff line change
Expand Up @@ -172,3 +172,8 @@ div.calendar-container table td.title { /* This holds the current "month, year"
background-repeat: no-repeat;
background-position: center;
}
/* Fix cursor on js-btn and time select */
.calendar-container select,
.calendar-container .js-btn {
cursor: pointer;
}
7 changes: 7 additions & 0 deletions components/com_users/tmpl/profile/default_custom.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
$customFields[$customField->name] = $customField;
}

unset($tmp);

?>
<?php foreach ($fieldsets as $group => $fieldset) : ?>
<?php $fields = $this->form->getFieldset($group); ?>
Expand All @@ -43,6 +45,11 @@
<?php endif; ?>
<dl class="dl-horizontal">
<?php foreach ($fields as $field) : ?>
<?php // Correct the field name so that subform custom fields show up. ?>
<?php if ($field->type === 'Subform' && $field->fieldname === 'row') : ?>
<?php preg_match("/jform\[com_fields]\[(.*)]/", $field->name, $matches); ?>
<?php $field->fieldname = $matches[1]; ?>
<?php endif; ?>
<?php if (!$field->hidden && $field->type !== 'Spacer') : ?>
<dt>
<?php echo $field->title; ?>
Expand Down
2 changes: 0 additions & 2 deletions language/en-GB/com_media.ini
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ COM_MEDIA_FIELD_CHECK_MIME_DESC="Use MIME Magic or Fileinfo to try to verify fil
COM_MEDIA_FIELD_CHECK_MIME_LABEL="Check MIME Types"
COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC="Ignored file extensions for MIME type checking and restricted uploads."
COM_MEDIA_FIELD_IGNORED_EXTENSIONS_LABEL="Ignored Extensions"
COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_DESC="A comma separated list of forbidden MIME types to upload."
COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_LABEL="Forbidden MIME Types"
COM_MEDIA_FIELD_LEGAL_EXTENSIONS_DESC="Extensions (file types) you are allowed to upload (comma separated)."
COM_MEDIA_FIELD_LEGAL_EXTENSIONS_LABEL="Legal Extensions (File Types)"
COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_DESC="Image extensions (file types) you are allowed to upload (comma separated). These are used to check for valid image headers."
Expand Down
2 changes: 1 addition & 1 deletion libraries/src/Installer/Adapter/ModuleAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ protected function storeExtension()
// Install failed, roll back changes
throw new \RuntimeException(
Text::sprintf(
'JLIB_INSTALLER_ABORT_MOD_INSTALL_ALLREADY_EXISTS',
'JLIB_INSTALLER_ABORT_ALREADY_EXISTS',
Text::_('JLIB_INSTALLER_' . $this->route),
$this->name
)
Expand Down