From 2385e6de5bdfa97b17e539d29a921adcd6ba5148 Mon Sep 17 00:00:00 2001 From: Dongsheng Cai Date: Tue, 6 Jul 2010 07:28:03 +0000 Subject: [PATCH] MDL-13766, fixed mimetype validation. --- repository/repository_ajax.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repository/repository_ajax.php b/repository/repository_ajax.php index d8d9f2dcf7a..f50c37accc6 100755 --- a/repository/repository_ajax.php +++ b/repository/repository_ajax.php @@ -164,14 +164,14 @@ switch ($action) { case 'download': // validate mimetype $mimetypes = array(); - if (in_array('*', $accepted_types) or $accepted_types == '*') { + if ((is_array($accepted_types) and in_array('*', $accepted_types)) or $accepted_types == '*') { $mimetypes = '*'; } else { foreach ($accepted_types as $type) { $mimetypes[] = mimeinfo('type', $type); } if (!in_array(mimeinfo('type', $saveas_filename), $mimetypes)) { - throw new moodle_exception('invalidfiletype', 'repository', '', mimeinfo('type', $_FILES[$elname]['name'])); + throw new moodle_exception('invalidfiletype', 'repository', '', mimeinfo('type', $saveas_filename)); } } -- 2.17.1