Skip to content
Permalink
Browse files

Merge branch 'wip-files23-fixes' of git://github.com/marinaglancy/moodle

  • Loading branch information...
danpoltawski committed May 22, 2012
2 parents afe23ae + 67fab8a commit 21878be7c8d479492737aea57e9e04096cca16d5
@@ -1385,7 +1385,7 @@ function &get_mimetypes_array() {
'dotm' => array ('type'=>'application/vnd.ms-word.template.macroEnabled.12', 'icon'=>'docx'),
'dcr' => array ('type'=>'application/x-director', 'icon'=>'flash'),
'dif' => array ('type'=>'video/x-dv', 'icon'=>'video', 'groups'=>array('mov'), 'string'=>'video'),
'dif' => array ('type'=>'video/x-dv', 'icon'=>'mov', 'groups'=>array('video'), 'string'=>'video'),
'dir' => array ('type'=>'application/x-director', 'icon'=>'flash'),
'dxr' => array ('type'=>'application/x-director', 'icon'=>'flash'),
'eps' => array ('type'=>'application/postscript', 'icon'=>'eps'),
@@ -1402,18 +1402,18 @@ function &get_mimetypes_array() {
'hqx' => array ('type'=>'application/mac-binhex40', 'icon'=>'zip', 'groups'=>array('archive'), 'string'=>'archive'),
'htc' => array ('type'=>'text/x-component', 'icon'=>'html'),
'html' => array ('type'=>'text/html', 'icon'=>'html', 'groups'=>array('web_file')),
'xhtml'=> array ('type'=>'application/xhtml+xml', 'icon'=>'html'),
'xhtml'=> array ('type'=>'application/xhtml+xml', 'icon'=>'html', 'groups'=>array('web_file')),
'htm' => array ('type'=>'text/html', 'icon'=>'html', 'groups'=>array('web_file')),
'ico' => array ('type'=>'image/vnd.microsoft.icon', 'icon'=>'image', 'groups'=>array('image'), 'string'=>'image'),
'ics' => array ('type'=>'text/calendar', 'icon'=>'text'),
'isf' => array ('type'=>'application/inspiration', 'icon'=>'isf'),
'ist' => array ('type'=>'application/inspiration.template', 'icon'=>'isf'),
'java' => array ('type'=>'text/plain', 'icon'=>'text'),
'jcb' => array ('type'=>'text/xml', 'icon'=>'text'),
'jcl' => array ('type'=>'text/xml', 'icon'=>'text'),
'jcw' => array ('type'=>'text/xml', 'icon'=>'text'),
'jmt' => array ('type'=>'text/xml', 'icon'=>'text'),
'jmx' => array ('type'=>'text/xml', 'icon'=>'text'),
'jcb' => array ('type'=>'text/xml', 'icon'=>'xml'),
'jcl' => array ('type'=>'text/xml', 'icon'=>'xml'),
'jcw' => array ('type'=>'text/xml', 'icon'=>'xml'),
'jmt' => array ('type'=>'text/xml', 'icon'=>'xml'),
'jmx' => array ('type'=>'text/xml', 'icon'=>'xml'),
'jpe' => array ('type'=>'image/jpeg', 'icon'=>'jpeg', 'groups'=>array('image', 'web_image'), 'string'=>'image'),
'jpeg' => array ('type'=>'image/jpeg', 'icon'=>'jpeg', 'groups'=>array('image', 'web_image'), 'string'=>'image'),
'jpg' => array ('type'=>'image/jpeg', 'icon'=>'jpeg', 'groups'=>array('image', 'web_image'), 'string'=>'image'),
@@ -1433,10 +1433,10 @@ function &get_mimetypes_array() {
'mpe' => array ('type'=>'video/mpeg', 'icon'=>'mpeg', 'groups'=>array('video'), 'string'=>'video'),
'mpg' => array ('type'=>'video/mpeg', 'icon'=>'mpeg', 'groups'=>array('video'), 'string'=>'video'),
'odt' => array ('type'=>'application/vnd.oasis.opendocument.text', 'icon'=>'odt', 'groups'=>array('odt')),
'ott' => array ('type'=>'application/vnd.oasis.opendocument.text-template', 'icon'=>'odt', 'groups'=>array('odt')),
'oth' => array ('type'=>'application/vnd.oasis.opendocument.text-web', 'icon'=>'odt', 'groups'=>array('odh')),
'odm' => array ('type'=>'application/vnd.oasis.opendocument.text-master', 'icon'=>'odh'),
'odt' => array ('type'=>'application/vnd.oasis.opendocument.text', 'icon'=>'odt', 'groups'=>array('document')),
'ott' => array ('type'=>'application/vnd.oasis.opendocument.text-template', 'icon'=>'odt', 'groups'=>array('document')),
'oth' => array ('type'=>'application/vnd.oasis.opendocument.text-web', 'icon'=>'oth', 'groups'=>array('document')),
'odm' => array ('type'=>'application/vnd.oasis.opendocument.text-master', 'icon'=>'odt'),
'odg' => array ('type'=>'application/vnd.oasis.opendocument.graphics', 'icon'=>'odg'),
'otg' => array ('type'=>'application/vnd.oasis.opendocument.graphics-template', 'icon'=>'odg'),
'odp' => array ('type'=>'application/vnd.oasis.opendocument.presentation', 'icon'=>'odp'),
@@ -1595,22 +1595,22 @@ function mimeinfo_from_type($element, $mimetype) {
foreach($mimeinfo as $filetype => $values) {
if ($values['type'] == $mimetype) {
if ($cached[$mimetype] === null) {
$cached[$mimetype] = $filetype;
$cached[$mimetype] = '.'.$filetype;
}
if (!empty($values['defaulticon'])) {
$cached[$mimetype] = $filetype;
$cached[$mimetype] = '.'.$filetype;
break;
}
}
}
if (empty($cached[$mimetype])) {
$cached[$mimetype] = 'xxx';
$cached[$mimetype] = '.xxx';
}
}
if ($element === 'extension') {
return $cached[$mimetype];
} else {
return mimeinfo($element, '.'.$cached[$mimetype]);
return mimeinfo($element, $cached[$mimetype]);
}
}
@@ -1831,7 +1831,7 @@ function file_get_typegroup($element, $groups) {
$mimeinfo = & get_mimetypes_array();
$cached[$element][$group] = array();
foreach ($mimeinfo as $extension => $value) {
$value['extension'] = $extension;
$value['extension'] = '.'.$extension;
if (empty($value[$element])) {
continue;
}
@@ -1859,7 +1859,7 @@ function file_get_typegroup($element, $groups) {
*/
function file_extension_in_typegroup($filename, $groups, $checktype = false) {
$extension = pathinfo($filename, PATHINFO_EXTENSION);
if (!empty($extension) && in_array(strtolower($extension), file_get_typegroup('extension', $groups))) {
if (!empty($extension) && in_array('.'.strtolower($extension), file_get_typegroup('extension', $groups))) {
return true;
}
return $checktype && file_mimetype_in_typegroup(mimeinfo('type', $filename), $groups);
BIN +10.2 KB pix/f/moodle-128.png
Binary file not shown.
BIN +2.09 KB pix/f/moodle-24.png
Binary file not shown.
BIN +21.4 KB pix/f/moodle-256.png
Binary file not shown.
BIN +2.63 KB pix/f/moodle-32.png
Binary file not shown.
BIN +3.82 KB pix/f/moodle-48.png
Binary file not shown.
BIN +4.77 KB pix/f/moodle-64.png
Binary file not shown.
BIN +5.62 KB pix/f/moodle-72.png
Binary file not shown.
BIN +6.22 KB pix/f/moodle-80.png
Binary file not shown.
BIN +7.66 KB pix/f/moodle-96.png
Binary file not shown.
BIN +1.58 KB pix/f/moodle.png
Binary file not shown.
BIN +11.8 KB pix/f/xml-128.png
Binary file not shown.
BIN +2.19 KB pix/f/xml-24.png
Binary file not shown.
BIN +20.2 KB pix/f/xml-256.png
Binary file not shown.
BIN +2.81 KB pix/f/xml-32.png
Binary file not shown.
BIN +4.24 KB pix/f/xml-48.png
Binary file not shown.
BIN +5.42 KB pix/f/xml-64.png
Binary file not shown.
BIN +6.33 KB pix/f/xml-72.png
Binary file not shown.
BIN +7.13 KB pix/f/xml-80.png
Binary file not shown.
BIN +8.63 KB pix/f/xml-96.png
Binary file not shown.
BIN +1.63 KB pix/f/xml.png
Binary file not shown.
@@ -1728,9 +1728,8 @@ public function filter(&$value) {
or (is_array($accepted_types) and in_array('*', $accepted_types))) {
return true;
} else {
$extensions = file_get_typegroup('extension', $accepted_types);
foreach ($extensions as $ext) {
if (preg_match('#\.'.$ext.'$#i', $value['title'])) {
foreach ($accepted_types as $ext) {
if (preg_match('#'.$ext.'$#i', $value['title'])) {
return true;
}
}
@@ -173,10 +173,7 @@ public function process_upload($saveas_filename, $maxbytes, $types = '*', $savep
// check filetype
$filemimetype = mimeinfo('type', $_FILES[$elname]['name']);
if (!in_array($filemimetype, $this->mimetypes)) {
if ($sm->string_exists($filemimetype, 'mimetypes')) {
$filemimetype = get_string($filemimetype, 'mimetypes');
}
throw new moodle_exception('invalidfiletype', 'repository', '', $filemimetype);
throw new moodle_exception('invalidfiletype', 'repository', '', get_mimetype_description(array('filename' => $_FILES[$elname]['name'])));
}
}
@@ -111,17 +111,23 @@ private function _get_collection($keyword, $start, $max, $sort) {
$links = $xml->children('http://www.w3.org/2005/Atom');
foreach ($xml->entry as $entry) {
$media = $entry->children('http://search.yahoo.com/mrss/');
$title = $media->group->title;
$title = (string)$media->group->title;
$description = (string)$media->group->description;
if (empty($description)) {
$description = $title;
}
$attrs = $media->group->thumbnail[2]->attributes();
$thumbnail = $attrs['url'];
$arr = explode('/', $entry->id);
$id = $arr[count($arr)-1];
$source = 'http://www.youtube.com/v/' . $id . '#' . $title;
$list[] = array(
'title'=>(string)$title,
'shorttitle'=>$title,
'thumbnail_title'=>$description,
'title'=>$title.'.avi', // this is a hack so we accept this file by extension
'thumbnail'=>(string)$attrs['url'],
'thumbnail_width'=>150,
'thumbnail_height'=>120,
'thumbnail_width'=>(int)$attrs['width'],
'thumbnail_height'=>(int)$attrs['height'],
'size'=>'',
'date'=>'',
'source'=>$source
@@ -186,7 +192,7 @@ public function print_login($ajax = true) {
* @return array
*/
public function supported_filetypes() {
return array('web_video');
return array('video');
}
/**

0 comments on commit 21878be

Please sign in to comment.
You can’t perform that action at this time.