echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB.";
}
?>'); control_selected_file_extension(<?php
- echo jirafeau_escape(json_encode(array_map('strtolower', $cfg['disallowed_extensions'])));
+ echo jirafeau_escape(json_encode(jirafeau_disallowed_extensions($cfg)));
?>, '<?php echo t('EXT_NOT_ALLOWED'); ?>.')"/>
</p>
echo '<p class="config"></p>';
}
if (!empty($cfg['disallowed_extensions'])) {
- echo '<p class="config">' . t('EXT_LIM') . ' ' . implode(', ', $cfg['disallowed_extensions']) . '</p>';
+ echo '<p class="config">' . t('EXT_LIM') . ' ' . implode(', ', jirafeau_disallowed_extensions($cfg)) . '</p>';
}
?>
/* Forbid specific file extensions from being uploaded.
* Leave empty to allow every extension.
- * Extensions are matched case-insensitively and without the leading dot.
+ * Extensions are matched case-insensitively; a leading dot is optional.
* Compound extensions such as 'tar.gz' are supported. Note that 'gz'
* also covers 'tar.gz', while 'tar.gz' leaves plain '.gz' files allowed.
* $cfg['disallowed_extensions'] = array('exe', 'bat', 'sh', 'php', 'tar.gz');
return $bytes;
}
+/**
+ * returns the configured disallowed extensions, lower-cased and without
+ * a leading dot
+ * @param $cfg jirafeau config
+ * @returns array of normalized extensions
+ */
+function jirafeau_disallowed_extensions($cfg)
+{
+ if (empty($cfg['disallowed_extensions'])) {
+ return array();
+ }
+
+ // tolerate a leading dot in the config, e.g. '.jpg' instead of 'jpg'
+ $extensions = array();
+ foreach ($cfg['disallowed_extensions'] as $extension) {
+ $extension = ltrim(strtolower(trim($extension)), '.');
+ if ($extension !== '') {
+ $extensions[] = $extension;
+ }
+ }
+
+ return $extensions;
+}
+
/**
* checks if a file name's extension is allowed to be uploaded
* @param $cfg jirafeau config
*/
function jirafeau_is_extension_allowed($cfg, $filename)
{
- if (empty($cfg['disallowed_extensions'])) {
+ $extensions = jirafeau_disallowed_extensions($cfg);
+ if (empty($extensions)) {
return true;
}
// suffix match so that compound extensions such as 'tar.gz' work too;
// 'gz' still covers 'archive.tar.gz'
- foreach ($cfg['disallowed_extensions'] as $extension) {
- $suffix = '.' . strtolower($extension);
+ foreach ($extensions as $extension) {
+ $suffix = '.' . $extension;
if (substr($filename, -strlen($suffix)) === $suffix) {
return false;
}