Skip to content

Commit

Permalink
MDL-23784 finally getting rid of all legacy .gif and .png extensions,…
Browse files Browse the repository at this point in the history 
… yay! fixing issues with incorrect & in JS code
  • Loading branch information
@skodak
skodak committed Aug 12, 2010
1 parent 0c3c549 commit ede7252
Show file tree
Hide file tree
Showing 20 changed files with 232 additions and 233 deletions.
6 changes: 3 additions & 3 deletions blocks/private_files/renderer.php
View file
Expand Up @@ -60,14 +60,14 @@ protected function htmllize_tree($tree, $dir) {
}
$result = '<ul>';
foreach ($dir['subdirs'] as $subdir) {
$image = $this->output->pix_icon("/f/folder", $subdir['dirname'], 'moodle', array('class'=>'icon'));
$image = $this->output->pix_icon("f/folder", $subdir['dirname'], 'moodle', array('class'=>'icon'));
$result .= '<li yuiConfig=\''.json_encode($yuiconfig).'\'><div>'.$image.' '.s($subdir['dirname']).'</div> '.$this->htmllize_tree($tree, $subdir).'</li>';
}
foreach ($dir['files'] as $file) {
$url = file_encode_url("$CFG->wwwroot/pluginfile.php", '/'.$tree->context->id.'/user/private'.$file->get_filepath().$file->get_filename(), true);
$filename = $file->get_filename();
$icon = substr(mimeinfo("icon", $filename), 0, -4);
$image = $this->output->pix_icon("/f/$icon", $filename, 'moodle', array('class'=>'icon'));
$icon = mimeinfo("icon", $filename);
$image = $this->output->pix_icon("f/$icon", $filename, 'moodle', array('class'=>'icon'));
$result .= '<li yuiConfig=\''.json_encode($yuiconfig).'\'><div>'.$image.' '.html_writer::link($url, $filename).'</div></li>';
}
$result .= '</ul>';
Expand Down
4 changes: 2 additions & 2 deletions blog/locallib.php
View file
Expand Up @@ -501,10 +501,10 @@ public function print_attachments($return=false) {
$ffurl = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.SYSCONTEXTID.'/blog/attachment/'.$this->id.'/'.$filename);
$mimetype = $file->get_mimetype();

$icon = substr(mimeinfo_from_type("icon", $mimetype), 0, -4);
$icon = mimeinfo_from_type("icon", $mimetype);
$type = mimeinfo_from_type("type", $mimetype);

$image = $OUTPUT->pix_icon("/f/$icon", $filename, 'moodle', array('class'=>'icon'));
$image = $OUTPUT->pix_icon("f/$icon", $filename, 'moodle', array('class'=>'icon'));

if ($return == "html") {
$output .= html_writer::link($ffurl, $image);
Expand Down
8 changes: 3 additions & 5 deletions course/lib.php
View file
Expand Up @@ -1391,9 +1391,9 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
if (!empty($customicon)) {
if (substr($customicon, 0, 4) === 'mod/') {
list($modname, $iconname) = explode('/', substr($customicon, 4), 2);
$icon = $OUTPUT->pix_url(str_replace(array('.gif', '.png'), '', $customicon), $modname);
$icon = $OUTPUT->pix_url($customicon, $modname);
} else {
$icon = $OUTPUT->pix_url(str_replace(array('.gif', '.png'), '', $customicon));
$icon = $OUTPUT->pix_url($customicon);
}
} else {
$icon = $OUTPUT->pix_url('icon', $mod->modname);
Expand All @@ -1405,9 +1405,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
if (!empty($customicon)) {
$archetype = plugin_supports('mod', $mod->modname, FEATURE_MOD_ARCHETYPE, MOD_ARCHETYPE_OTHER);
if ($archetype == MOD_ARCHETYPE_RESOURCE) {
$possaltname = str_replace(array('.gif', '.png'), '', $customicon).'.gif';

$mimetype = mimeinfo_from_icon('type', $possaltname);
$mimetype = mimeinfo_from_icon('type', $customicon);
$altname = get_mimetype_description($mimetype);
}
}
Expand Down
372 changes: 188 additions & 184 deletions lib/filelib.php
View file

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions lib/portfolio/formats.php
View file
Expand Up @@ -140,7 +140,7 @@ class portfolio_format_image extends portfolio_format_file {
* return all mimetypes that use image.gif (eg all images)
*/
public static function mimetypes() {
return mimeinfo_from_icon('type', 'image.gif', true);
return mimeinfo_from_icon('type', 'image', true);
}

public static function conflicts($format) {
Expand Down Expand Up @@ -174,8 +174,8 @@ public static function conflicts($format) {
class portfolio_format_video extends portfolio_format_file {
public static function mimetypes() {
return array_merge(
mimeinfo_from_icon('type', 'video.gif', true),
mimeinfo_from_icon('type', 'avi.gif', true)
mimeinfo_from_icon('type', 'video', true),
mimeinfo_from_icon('type', 'avi', true)
);
}
}
Expand Down Expand Up @@ -302,9 +302,9 @@ class portfolio_format_document extends portfolio_format_file {
public static function mimetypes() {
return array_merge(
array('text/plain', 'text/rtf'),
mimeinfo_from_icon('type', 'word.gif', true),
mimeinfo_from_icon('type', 'docx.gif', true),
mimeinfo_from_icon('type', 'odt.gif', true)
mimeinfo_from_icon('type', 'word', true),
mimeinfo_from_icon('type', 'docx', true),
mimeinfo_from_icon('type', 'odt', true)
);
}
}
Expand All @@ -317,9 +317,9 @@ public static function mimetypes() {
class portfolio_format_spreadsheet extends portfolio_format_file {
public static function mimetypes() {
return array_merge(
mimeinfo_from_icon('type', 'excel.gif', true),
mimeinfo_from_icon('type', 'xlsm.gif', true),
mimeinfo_from_icon('type', 'ods.gif', true)
mimeinfo_from_icon('type', 'excel', true),
mimeinfo_from_icon('type', 'xlsm', true),
mimeinfo_from_icon('type', 'ods', true)
);
}
}
Expand All @@ -331,6 +331,6 @@ public static function mimetypes() {
*/
class portfolio_format_presentation extends portfolio_format_file {
public static function mimetypes() {
return mimeinfo_from_icon('type', 'powerpoint.gif', true);
return mimeinfo_from_icon('type', 'powerpoint', true);
}
}
6 changes: 3 additions & 3 deletions mod/assignment/renderer.php
View file
Expand Up @@ -59,14 +59,14 @@ protected function htmllize_tree($tree, $dir) {

$result = '<ul>';
foreach ($dir['subdirs'] as $subdir) {
$image = $this->output->pix_icon("/f/folder", $subdir['dirname'], 'moodle', array('class'=>'icon'));
$image = $this->output->pix_icon("f/folder", $subdir['dirname'], 'moodle', array('class'=>'icon'));
$result .= '<li yuiConfig=\''.json_encode($yuiconfig).'\'><div>'.$image.' '.s($subdir['dirname']).'</div> '.$this->htmllize_tree($tree, $subdir).'</li>';
}

foreach ($dir['files'] as $file) {
$filename = $file->get_filename();
$icon = substr(mimeinfo("icon", $filename), 0, -4);
$image = $this->output->pix_icon("/f/$icon", $filename, 'moodle', array('class'=>'icon'));
$icon = mimeinfo("icon", $filename);
$image = $this->output->pix_icon("f/$icon", $filename, 'moodle', array('class'=>'icon'));
$result .= '<li yuiConfig=\''.json_encode($yuiconfig).'\'><div>'.$image.' '.$file->fileurl.' '.$file->portfoliobutton.'</div></li>';
}

Expand Down
2 changes: 1 addition & 1 deletion mod/resource/lib.php
View file
Expand Up @@ -248,7 +248,7 @@ function resource_get_coursemodule_info($coursemodule) {
$files = $fs->get_area_files($context->id, 'mod_resource', 'content', 0, 'sortorder');
if (count($files) >= 1) {
$mainfile = array_pop($files);
$info->icon = str_replace(array('.gif', '.png'), '', file_extension_icon($mainfile->get_filename()));
$info->icon = file_extension_icon($mainfile->get_filename());
$resource->mainfile = $mainfile->get_filename();
}

Expand Down
4 changes: 2 additions & 2 deletions mod/wiki/editors/wikifiletable.php
View file
Expand Up @@ -110,12 +110,12 @@ function toHtml() {

$action_icons = "";
if(!empty($tags['attach'])) {
$action_icons .= "<a href=\"javascript:void(0)\" class=\"wiki-attachment-attach\" ".$this->printInsertTags($tags['attach'], $file->get_filename())." title=\"".get_string('attachmentattach', 'wiki')."\"><img src=\"".$OUTPUT->pix_url('f/pdf')->out()."\" alt=\"Attach\" /></a>";
$action_icons .= "<a href=\"javascript:void(0)\" class=\"wiki-attachment-attach\" ".$this->printInsertTags($tags['attach'], $file->get_filename())." title=\"".get_string('attachmentattach', 'wiki')."\"><img src=\"".$OUTPUT->pix_url('f/pdf')->out()."\" alt=\"Attach\" /></a>"; //TODO: localize
}

$action_icons .= "&nbsp;&nbsp;<a href=\"javascript:void(0)\" class=\"wiki-attachment-link\" ".$this->printInsertTags($tags['link'], $file_url)." title=\"".get_string('attachmentlink', 'wiki')."\"><img src=\"".$OUTPUT->pix_url('f/web')->out()."\" alt=\"Link\" /></a>";

if ($icon == 'image.gif') {
if ($icon == 'image') {
$action_icons .= "&nbsp;&nbsp;<a href=\"javascript:void(0)\" class=\"wiki-attachment-image\" ".$this->printInsertTags($tags['image'], $file->get_filename())." title=\"".get_string('attachmentimage', 'wiki')."\"><img src=\"".$OUTPUT->pix_url('f/image')->out()."\" alt=\"Image\" /></a>"; //TODO: localize
}

Expand Down
2 changes: 1 addition & 1 deletion repository/alfresco/lib.php
View file
Expand Up @@ -173,7 +173,7 @@ public function get_listing($uuid = '', $path = '') {
'children'=>array());
} elseif ($child->child->type == $file_filter) {
$ret['list'][] = array('title'=>$child->child->cm_name,
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($child->child->cm_name, 32)),
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($child->child->cm_name, 32))->out(false),
'source'=>$child->child->id);
}
}
Expand Down
2 changes: 1 addition & 1 deletion repository/boxnet/lib.php
View file
Expand Up @@ -173,7 +173,7 @@ public function search($search_text) {
'date'=>$filedates[$n],
'source'=>'http://box.net/api/1.0/download/'
.$this->auth_token.'/'.$fileids[$n],
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($v, 32))->out());
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($v, 32))->out(false));
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions repository/draftfiles_manager.php
View file
Expand Up @@ -294,8 +294,8 @@
if ($file->type != 'folder') {
$drafturl = $file->url;
// a file
$fileicon = $CFG->wwwroot.'/pix/'.(file_extension_icon($file->filename));
$type = str_replace('.gif', '', mimeinfo('icon', $file->filename));
$fileicon = $OUTPUT->pix_url(file_extension_icon($file->filename))->out(false);
$type = mimeinfo('icon', $file->filename);
echo '<li>';
echo '<img src="'.$fileicon. '" class="iconsmall" />';
echo ' <a href="'.$drafturl.'">'.$file->filename.'</a> ';
Expand Down
4 changes: 2 additions & 2 deletions repository/dropbox/lib.php
View file
Expand Up @@ -168,7 +168,7 @@ public function get_listing($path = '', $page = '1') {
'path' => file_correct_filepath($file->path),
'size' => $file->size,
'date' => $file->modified,
'thumbnail' => $OUTPUT->pix_url('f/folder-32').'',
'thumbnail' => $OUTPUT->pix_url('f/folder-32')->out(false),
'children' => array(),
);
} else {
Expand All @@ -177,7 +177,7 @@ public function get_listing($path = '', $page = '1') {
'source' => $file->path,
'size' => $file->size,
'date' => $file->modified,
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($file->path, 32)).''
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($file->path, 32))->out(false)
);
}
}
Expand Down
4 changes: 2 additions & 2 deletions repository/filesystem/lib.php
View file
Expand Up @@ -84,7 +84,7 @@ public function get_listing($path = '', $page = '') {
'source' => $path.'/'.$file,
'size' => filesize($this->root_path.$file),
'date' => time(),
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($this->root_path.$file, 32)).''
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($this->root_path.$file, 32))->out(false)
);
} else {
if (!empty($path)) {
Expand All @@ -95,7 +95,7 @@ public function get_listing($path = '', $page = '') {
$list['list'][] = array(
'title' => $file,
'children' => array(),
'thumbnail' => $OUTPUT->pix_url('f/folder-32').'',
'thumbnail' => $OUTPUT->pix_url('f/folder-32')->out(false),
'path' => $current_path
);
}
Expand Down
5 changes: 2 additions & 3 deletions repository/local/lib.php
View file
Expand Up @@ -114,19 +114,18 @@ public function get_listing($encodedpath = '') {
'date' => '',
'path' => $encodedpath,
'children'=>array(),
'thumbnail' => $OUTPUT->pix_url('f/folder-32') . ''
'thumbnail' => $OUTPUT->pix_url('f/folder-32')->out(false)
);
$list[] = $node;
} else {
$encodedpath = base64_encode(serialize($child->get_params()));
$icon = 'f/'.str_replace('.gif', '', mimeinfo('icon', $child->get_visible_name())).'-32';
$node = array(
'title' => $child->get_visible_name(),
'shorttitle'=>$shorttitle,
'size' => 0,
'date' => '',
'source'=> $encodedpath,
'thumbnail' => $OUTPUT->pix_url($icon) . '',
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($child->get_visible_name(), 32))->out(false)
);
$list[] = $node;
}
Expand Down
2 changes: 1 addition & 1 deletion repository/merlot/lib.php
View file
Expand Up @@ -85,7 +85,7 @@ private function _get_collection($keyword, $author) {
foreach ($xml->results->material as $entry) {
$list[] = array(
'title'=>(string)$entry->title,
'thumbnail'=>$OUTPUT->pix_url('f/unknown-32'),
'thumbnail'=>$OUTPUT->pix_url('f/unknown-32')->out(false),
'date'=>userdate((int)$entry->creationDate),
'size'=>'',
'source'=>(string)$entry->URL
Expand Down
3 changes: 1 addition & 2 deletions repository/recent/lib.php
View file
Expand Up @@ -98,14 +98,13 @@ public function get_listing($encodedpath = '', $page = '') {
try {
foreach ($files as $file) {
$params = base64_encode(serialize($file));
$icon = 'f/'.str_replace('.gif', '', mimeinfo('icon', $file['filename'])) . '-32';
$node = array(
'title' => $file['filename'],
'shorttitle' => $this->get_short_filename($file['filename'], 12),
'size' => 0,
'date' => '',
'source'=> $params,
'thumbnail' => $OUTPUT->pix_url($icon) . '',
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($file['filename'], 32))->out(false),
);
$list[] = $node;
}
Expand Down
4 changes: 2 additions & 2 deletions repository/s3/lib.php
View file
Expand Up @@ -73,7 +73,7 @@ public function get_listing($path = '') {
$folder = array(
'title' => $bucket,
'children' => array(),
'thumbnail'=>$OUTPUT->pix_url('f/folder-32'),
'thumbnail'=>$OUTPUT->pix_url('f/folder-32')->out(false),
'path'=>$bucket
);
$tree[] = $folder;
Expand All @@ -87,7 +87,7 @@ public function get_listing($path = '') {
'size'=>$file['size'],
'date'=>userdate($file['time']),
'source'=>$path.'/'.$file['name'],
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($file['name'], 32))
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($file['name'], 32))->out(false)
);
}
}
Expand Down
2 changes: 1 addition & 1 deletion repository/url/lib.php
View file
Expand Up @@ -117,7 +117,7 @@ public function get_listing($path='', $page='') {
$ret['list'][] = array(
'title'=>$filename,
'source'=>$this->file_url,
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($filename, 32))
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($filename, 32))->out(false)
);
}
}
Expand Down
5 changes: 2 additions & 3 deletions repository/user/lib.php
View file
Expand Up @@ -90,18 +90,17 @@ public function get_listing($encodedpath = '') {
'date' => '',
'path' => $encodedpath,
'children'=>array(),
'thumbnail' => $OUTPUT->pix_url('f/folder-32') . ''
'thumbnail' => $OUTPUT->pix_url('f/folder-32')->out(false)
);
$list[] = $node;
} else {
$encodedpath = base64_encode(serialize($child->get_params()));
$icon = 'f/'.str_replace('.gif', '', mimeinfo('icon', $child->get_visible_name())).'-32';
$node = array(
'title' => $child->get_visible_name(),
'size' => 0,
'date' => '',
'source'=> $encodedpath,
'thumbnail' => $OUTPUT->pix_url($icon) . '',
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($child->get_visible_name(), 32))->out(false)
);
$list[] = $node;
}
Expand Down
6 changes: 3 additions & 3 deletions user/renderer.php
View file
Expand Up @@ -61,14 +61,14 @@ protected function htmllize_tree($tree, $dir) {
}
$result = '<ul>';
foreach ($dir['subdirs'] as $subdir) {
$image = $this->output->pix_icon("/f/folder", $subdir['dirname'], 'moodle', array('class'=>'icon'));
$image = $this->output->pix_icon("f/folder", $subdir['dirname'], 'moodle', array('class'=>'icon'));
$result .= '<li yuiConfig=\''.json_encode($yuiconfig).'\'><div>'.$image.' '.s($subdir['dirname']).'</div> '.$this->htmllize_tree($tree, $subdir).'</li>';
}
foreach ($dir['files'] as $file) {
$url = file_encode_url("$CFG->wwwroot/pluginfile.php", '/'.$tree->context->id.'/user/private'.$file->get_filepath().$file->get_filename(), true);
$filename = $file->get_filename();
$icon = substr(mimeinfo("icon", $filename), 0, -4);
$image = $this->output->pix_icon("/f/$icon", $filename, 'moodle', array('class'=>'icon'));
$icon = mimeinfo("icon", $filename);
$image = $this->output->pix_icon("f/$icon", $filename, 'moodle', array('class'=>'icon'));
$result .= '<li yuiConfig=\''.json_encode($yuiconfig).'\'><div>'.$image.' '.html_writer::link($url, $filename).'</div></li>';
}
$result .= '</ul>';
Expand Down

0 comments on commit ede7252

Please sign in to comment.