From 19c9f09430a5196baf478294b44afa8853d97a23 Mon Sep 17 00:00:00 2001
From: samhemelryk <samhemelryk>
Date: Tue, 7 Jul 2009 06:16:01 +0000
Subject: [PATCH] filelib MDL-19707 Converted existing
 ...str_replace('png','gif')... to use file_extension_icon and
 file_mimetype_icon

---
 blog/lib.php                                          | 3 +--
 course/lib.php                                        | 4 ++--
 files/draftfiles.php                                  | 3 +--
 files/index.php                                       | 3 +--
 mod/assignment/lib.php                                | 3 +--
 mod/assignment/type/upload/assignment.class.php       | 9 +++------
 mod/assignment/type/uploadsingle/assignment.class.php | 3 +--
 mod/data/field/file/field.class.php                   | 6 ++----
 mod/forum/lib.php                                     | 3 +--
 mod/glossary/lib.php                                  | 3 +--
 mod/resource/type/directory/resource.class.php        | 4 ++--
 mod/wiki/ewiki/plugins/moodle/downloads.php           | 3 +--
 question/contextmove_form.php                         | 5 ++---
 question/contextmoveq_form.php                        | 3 +--
 repository/alfresco/repository.class.php              | 2 +-
 repository/boxnet/repository.class.php                | 2 +-
 repository/filesystem/repository.class.php            | 2 +-
 repository/lib.php                                    | 4 ++--
 repository/mahara/repository.class.php                | 2 +-
 repository/s3/repository.class.php                    | 2 +-
 repository/url/repository.class.php                   | 2 +-
 repository/webdav/repository.class.php                | 2 +-
 repository/wikimedia/repository.class.php             | 2 +-
 23 files changed, 30 insertions(+), 45 deletions(-)

diff --git a/blog/lib.php b/blog/lib.php
index c9db0f630a..aaec990732 100755
--- a/blog/lib.php
+++ b/blog/lib.php
@@ -281,10 +281,9 @@
             $filename = $file->get_filename();
             $ffurl    = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.SYSCONTEXTID.'/blog/'.$blogentry->id.'/'.$filename);
             $type     = $file->get_mimetype();
-            $icon     = str_replace(array('.gif', '.png'), '', mimeinfo_from_type("icon", $type));
             $type     = mimeinfo_from_type("type", $type);
 
-            $image = "<img src=\"" . $OUTPUT->old_icon_url('f/' . $icon) . "\" class=\"icon\" alt=\"\" />";
+            $image = "<img src=\"" . $OUTPUT->old_icon_url(file_mimetype_icon($type)) . "\" class=\"icon\" alt=\"\" />";
 
             if ($return == "html") {
                 $output .= "<a href=\"$ffurl\">$image</a> ";
diff --git a/course/lib.php b/course/lib.php
index 8bd2627f12..f4ddffd97c 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -1333,9 +1333,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->mod_icon_url(str_replace(array('.gif', '.png'), '', $iconname), $modname);
+                        $icon = $OUTPUT->mod_icon_url(file_extension_icon($iconname), $modname);
                     } else {
-                        $icon = $OUTPUT->old_icon_url(str_replace(array('.gif', '.png'), '', $customicon));
+                        $icon = $OUTPUT->old_icon_url(file_extension_icon($customicon));
                     }
                 } else {
                     $icon = "" . $OUTPUT->mod_icon_url('icon', $mod->modname) . "";
diff --git a/files/draftfiles.php b/files/draftfiles.php
index 5e46e23dd6..ae1d8055e7 100644
--- a/files/draftfiles.php
+++ b/files/draftfiles.php
@@ -156,10 +156,9 @@ foreach ($files as $file) {
         }
 
     } else {
-        $icon = str_replace(array('.gif', '.png'), '', mimeinfo_from_type('icon', $mimetype));
         $viewurl = file_encode_url("$CFG->wwwroot/draftfile.php", "/$contextid/user_draft/$itemid".$filepath.$filename, false, false);
         echo '<div class="file">';
-        echo "<a href=\"$viewurl\"><img src=\"" . $OUTPUT->old_icon_url('f/' . $icon) . "\" class=\"icon\" alt=\"$strfile\" />&nbsp;".s($filename)." ($filesize)</a> ";
+        echo "<a href=\"$viewurl\"><img src=\"" . $OUTPUT->old_icon_url(file_mimetype_icon($mimetype)) . "\" class=\"icon\" alt=\"$strfile\" />&nbsp;".s($filename)." ($filesize)</a> ";
         echo "<a href=\"draftfiles.php?itemid=$itemid&amp;filepath=$filepath&amp;delete=$filenameurl&amp;subdirs=$subdirs&amp;maxbytes=$maxbytes\"><img src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a>";;
         echo '</div>';
     }
diff --git a/files/index.php b/files/index.php
index 1523d39a8e..7e1d733e1a 100644
--- a/files/index.php
+++ b/files/index.php
@@ -295,7 +295,6 @@ function displaydir($file_info) {
 
             } else {
 
-                $icon = str_replace(array('.gif', '.png'), '', mimeinfo_from_type("icon", $mimetype));
                 if ($downloadurl = $child_info->get_url(true)) {
                     $downloadurl = "&nbsp;<a href=\"$downloadurl\" title=\"" . get_string('downloadfile') . "\"><img src=\"" . $OUTPUT->old_icon_url('t/down') . "\" class=\"iconsmall\" alt=\"$strdownload\" /></a>";
                 } else {
@@ -314,7 +313,7 @@ function displaydir($file_info) {
 
                 echo "<tr class=\"file\">";
                 print_cell();
-                print_cell("left", "<img src=\"" . $OUTPUT->old_icon_url('f/' . $icon) . "\" class=\"icon\" alt=\"$strfile\" />&nbsp;".s($filename).$downloadurl.$viewurl, 'name');
+                print_cell("left", "<img src=\"" . $OUTPUT->old_icon_url(file_mimetype_icon($mimetype)) . "\" class=\"icon\" alt=\"$strfile\" />&nbsp;".s($filename).$downloadurl.$viewurl, 'name');
                 print_cell("right", $filesize, 'size');
                 print_cell("right", $filedate, 'date');
                 if ($parentwritable) {
diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index ffe7097e80..96abda7c7b 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -1779,9 +1779,8 @@ class assignment_base {
                 $filename = $file->get_filename();
                 $found = true;
                 $mimetype = $file->get_mimetype();
-                $icon = str_replace(array('.gif', '.png'), '', mimeinfo_from_type('icon', $mimetype));
                 $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$userid.'/'.$filename);
-                $output .= '<a href="'.$path.'" ><img src="'.$OUTPUT->old_icon_url('f/'.$icon).'" class="icon" alt="'.$icon.'" />'.s($filename).'</a>';
+                $output .= '<a href="'.$path.'" ><img src="'.$OUTPUT->old_icon_url(file_mimetype_icon($mimetype)).'" class="icon" alt="'.$mimetype.'" />'.s($filename).'</a>';
                 if ($this->portfolio_exportable() && has_capability('mod/assignment:exportownsubmission', $this->context)) {
                     $button->set_callback_options('assignment_portfolio_caller', array('id' => $this->cm->id, 'fileid' => $file->get_id()));
                     $button->set_formats(portfolio_format_from_file($file));
diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php
index 89847e58c7..1ae3c40740 100644
--- a/mod/assignment/type/upload/assignment.class.php
+++ b/mod/assignment/type/upload/assignment.class.php
@@ -286,9 +286,8 @@ class assignment_upload extends assignment_base {
                 $filename = $file->get_filename();
                 $found = true;
                 $mimetype = $file->get_mimetype();
-                $icon = str_replace(array('.gif', '.png'), '', mimeinfo_from_type('icon', $mimetype));
                 $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$userid.'/'.$filename);
-                $output .= '<a href="'.$path.'" ><img class="icon" src="'.$OUTPUT->old_icon_url('f/'.$icon).'" alt="'.$icon.'" />'.s($filename).'</a>&nbsp;';
+                $output .= '<a href="'.$path.'" ><img class="icon" src="'.$OUTPUT->old_icon_url(file_mimetype_icon($mimetype)).'" alt="'.$mimetype.'" />'.s($filename).'</a>&nbsp;';
 
             }
 
@@ -346,9 +345,8 @@ class assignment_upload extends assignment_base {
             foreach ($files as $file) {
                 $filename = $file->get_filename();
                 $mimetype = $file->get_mimetype();
-                $icon = str_replace(array('.gif', '.png'), '', mimeinfo_from_type('icon', $mimetype));
                 $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$userid.'/'.$filename);
-                $output .= '<a href="'.$path.'" ><img src="'.$OUTPUT->old_icon_url('f/'.$icon).'" class="icon" alt="'.$icon.'" />'.s($filename).'</a>';
+                $output .= '<a href="'.$path.'" ><img src="'.$OUTPUT->old_icon_url(file_mimetype_icon($mimetype)).'" class="icon" alt="'.$mimetype.'" />'.s($filename).'</a>';
 
                 if ($candelete) {
                     $delurl  = "$CFG->wwwroot/mod/assignment/delete.php?id={$this->cm->id}&amp;file=".rawurlencode($filename)."&amp;userid={$submission->userid}&amp;mode=$mode&amp;offset=$offset";
@@ -408,10 +406,9 @@ class assignment_upload extends assignment_base {
                 $filename = $file->get_filename();
                 $found = true;
                 $mimetype = $file->get_mimetype();
-                $icon = str_replace(array('.gif', '.png'), '', mimeinfo_from_type('icon', $mimetype));
                 $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_response/'.$userid.'/'.$filename);
 
-                $output .= '<a href="'.$path.'" ><img src="'.$OUTPUT->old_icon_url('f/'.$icon).'" alt="'.$icon.'" />'.$filename.'</a>';
+                $output .= '<a href="'.$path.'" ><img src="'.$OUTPUT->old_icon_url(file_mimetype_icon($mimetype)).'" alt="'.$mimetype.'" />'.$filename.'</a>';
 
                 if ($candelete) {
                     $delurl  = "$CFG->wwwroot/mod/assignment/delete.php?id={$this->cm->id}&amp;file=".rawurlencode($filename)."&amp;userid=$userid&amp;mode=$mode&amp;offset=$offset&amp;action=response";
diff --git a/mod/assignment/type/uploadsingle/assignment.class.php b/mod/assignment/type/uploadsingle/assignment.class.php
index 116db58ab7..65690fc95c 100644
--- a/mod/assignment/type/uploadsingle/assignment.class.php
+++ b/mod/assignment/type/uploadsingle/assignment.class.php
@@ -21,9 +21,8 @@ class assignment_uploadsingle extends assignment_base {
                 $filename = $file->get_filename();
                 $found = true;
                 $mimetype = $file->get_mimetype();
-                $icon = str_replace(array('.gif', '.png'), '', mimeinfo_from_type('icon', $mimetype));
                 $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$userid.'/'.$filename);
-                $output .= '<a href="'.$path.'" ><img class="icon" src="'.$OUTPUT->old_icon_url('f/'.$icon).'" alt="'.$icon.'" />'.s($filename).'</a><br />';
+                $output .= '<a href="'.$path.'" ><img class="icon" src="'.$OUTPUT->old_icon_url(file_mimetype_icon($mimetype)).'" alt="'.$mimetype.'" />'.s($filename).'</a><br />';
             }
         }
 
diff --git a/mod/data/field/file/field.class.php b/mod/data/field/file/field.class.php
index 34d0af3e40..b4e0d75e4a 100755
--- a/mod/data/field/file/field.class.php
+++ b/mod/data/field/file/field.class.php
@@ -59,9 +59,8 @@ class data_field_file extends data_field_base {
         if ($file) {
             // Print icon if file already exists
             $browser = get_file_browser();
-            $icon    = str_replace(array('.gif', '.png'), '', mimeinfo_from_type('icon', $file->get_mimetype()));
             $src     = file_encode_url($CFG->wwwroot.'/pluginfile.php', $this->context->id.'/data_content/'.$content->id.'/'.$file->get_filename());
-            $str .= '<img src="'.$OUTPUT->old_icon_url('f/'.$icon).'" class="icon" alt="'.$icon.'" />'.
+            $str .= '<img src="'.$OUTPUT->old_icon_url(file_mimetype_icon($file->get_mimetype())).'" class="icon" alt="'.$file->get_mimetype().'" />'.
                     '<a href="'.$src.'" >'.s($file->get_filename()).'</a>';
         }
         return $str;
@@ -118,12 +117,11 @@ class data_field_file extends data_field_base {
         }
 
         $name   = empty($content->content1) ? $file->get_filename() : $content->content1;
-        $icon   = str_replace(array('.gif', '.png'), '', mimeinfo_from_type('icon', $file->get_mimetype()));
         $src    = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/data_content/'.$content->id.'/'.$file->get_filename());
         $width  = $this->field->param1 ? ' width  = "'.s($this->field->param1).'" ':' ';
         $height = $this->field->param2 ? ' height = "'.s($this->field->param2).'" ':' ';
 
-        $str = '<img src="'.$OUTPUT->old_icon_url('f/'.$icon).'" height="16" width="16" alt="'.$icon.'" />&nbsp;'.
+        $str = '<img src="'.$OUTPUT->old_icon_url(file_mimetype_icon($file->get_mimetype())).'" height="16" width="16" alt="'.$file->get_mimetype().'" />&nbsp;'.
                '<a href="'.$src.'" >'.s($name).'</a>';
         return $str;
     }
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 0d5ae62a7c..52d5006c80 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -4296,8 +4296,7 @@ function forum_print_attachments($post, $cm, $type) {
         foreach ($files as $file) {
             $filename = $file->get_filename();
             $mimetype = $file->get_mimetype();
-            $icon = str_replace(array('.gif', '.png'), '', mimeinfo_from_type('icon', $mimetype));
-            $iconimage = '<img src="'.$OUTPUT->old_icon_url('f/'.$icon).'" class="icon" alt="'.$icon.'" />';
+            $iconimage = '<img src="'.$OUTPUT->old_icon_url(file_mimetype_icon($mimetype)).'" class="icon" alt="'.$mimetype.'" />';
             $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$context->id.'/forum_attachment/'.$post->id.'/'.$filename);
 
             if ($type == 'html') {
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index a7ce4064d7..9eb76dc512 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -1256,8 +1256,7 @@ function glossary_print_attachments($entry, $cm, $type=NULL, $align="left") {
         foreach ($files as $file) {
             $filename = $file->get_filename();
             $mimetype = $file->get_mimetype();
-            $icon = str_replace(array('.gif', '.png'), '', mimeinfo_from_type('icon', $mimetype));
-            $iconimage = '<img src="'.$OUTPUT->old_icon_url('f/'.$icon).'" class="icon" alt="'.$icon.'" />';
+            $iconimage = '<img src="'.$OUTPUT->old_icon_url(file_mimetype_icon($mimetype)).'" class="icon" alt="'.$mimetype.'" />';
             $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$context->id.'/glossary_attachment/'.$entry->id.'/'.$filename);
 
             if ($type == 'html') {
diff --git a/mod/resource/type/directory/resource.class.php b/mod/resource/type/directory/resource.class.php
index 353cd50ddf..5fe31562a0 100644
--- a/mod/resource/type/directory/resource.class.php
+++ b/mod/resource/type/directory/resource.class.php
@@ -121,7 +121,7 @@ function display() {
             $filesize = display_size(get_directory_size("$CFG->dataroot/$relativepath/$file"));
 
         } else {
-            $icon = str_replace(array('.gif', '.png'), '', mimeinfo("icon", $file));
+            $icon = file_extension_icon($file);
             $relativeurl = get_file_url("$relativepath/$file");
             $filesize = display_size(filesize("$CFG->dataroot/$relativepath/$file"));
         }
@@ -134,7 +134,7 @@ function display() {
         } else {
             echo '<tr class="file">';
             echo '<td class="name">';
-            link_to_popup_window($relativeurl, "resourcedirectory{$resource->id}", "<img src=\"" . $OUTPUT->old_icon_url('f/' . $icon) . "\" class=\"icon\" alt=\"$strfile\" />&nbsp;$file", 450, 600, '');
+            link_to_popup_window($relativeurl, "resourcedirectory{$resource->id}", "<img src=\"" . $OUTPUT->old_icon_url($icon) . "\" class=\"icon\" alt=\"$strfile\" />&nbsp;$file", 450, 600, '');
         }
         echo '</td>';
         echo '<td>&nbsp;</td>';
diff --git a/mod/wiki/ewiki/plugins/moodle/downloads.php b/mod/wiki/ewiki/plugins/moodle/downloads.php
index 7da8c60440..0f7886375f 100644
--- a/mod/wiki/ewiki/plugins/moodle/downloads.php
+++ b/mod/wiki/ewiki/plugins/moodle/downloads.php
@@ -329,8 +329,7 @@ function ewiki_entry_downloads($row, $show_section=0, $fullinfo=false) {
    
    /// Moodle Icon Handling
    global $CFG;
-   $icon = str_replace(array('.gif', '.png'), '', mimeinfo("icon", $id));
-   $p_icon = $OUTPUT->old_icon_url('f/' . $icon);
+   $p_icon = $OUTPUT->old_icon_url(file_extension_icon($id));
    $p_icon_t = '';
 
    $info->id = $id;
diff --git a/question/contextmove_form.php b/question/contextmove_form.php
index 1c4618ef89..f2f20d8b41 100644
--- a/question/contextmove_form.php
+++ b/question/contextmove_form.php
@@ -5,7 +5,7 @@ require_once($CFG->libdir.'/formslib.php');
 class question_context_move_form extends moodleform {
 
     function definition() {
-        global $CFG. $OUTPUT;
+        global $CFG, $OUTPUT;
         $mform    =& $this->_form;
 
 //--------------------------------------------------------------------------------
@@ -25,9 +25,8 @@ class question_context_move_form extends moodleform {
 
             $i = 0;
             foreach (array_keys($urls) as $url){
-                $iconname = str_replace(array('.gif', '.png'), '', mimeinfo('icon', $url));
                 $icontype = mimeinfo('type', $url);
-                $img = "<img src=\"" . $OUTPUT->old_icon_url('f/' . $iconname) . "\"  class=\"icon\" alt=\"$icontype\" />";
+                $img = "<img src=\"" . $OUTPUT->old_icon_url(file_extension_icon($url)) . "\"  class=\"icon\" alt=\"$icontype\" />";
                 if (in_array($url, $brokenurls)){
                     $mform->addElement('select', "urls[$i]", $img.$url, $brokenfileoptions);
                 } else {
diff --git a/question/contextmoveq_form.php b/question/contextmoveq_form.php
index 94b21f0a2e..ee0232de87 100644
--- a/question/contextmoveq_form.php
+++ b/question/contextmoveq_form.php
@@ -26,9 +26,8 @@ class question_context_move_question_form extends moodleform {
 
             $i = 0;
             foreach (array_keys($urls) as $url){
-                $iconname = str_replace(array('.gif', '.png'), '', mimeinfo('icon', $url));
                 $icontype = mimeinfo('type', $url);
-                $img = "<img src=\"" . $OUTPUT->old_icon_url('f/$iconname') . "\"  class=\"icon\" alt=\"$icontype\" />";
+                $img = "<img src=\"" . $OUTPUT->old_icon_url(file_extension_icon($url)) . "\"  class=\"icon\" alt=\"$icontype\" />";
                 if (in_array($url, $brokenurls)){
                     $mform->addElement('select', "urls[$i]", $img.$url, $brokenfileoptions);
                 } else {
diff --git a/repository/alfresco/repository.class.php b/repository/alfresco/repository.class.php
index 2e19ffa513..2b1334205d 100755
--- a/repository/alfresco/repository.class.php
+++ b/repository/alfresco/repository.class.php
@@ -128,7 +128,7 @@ class repository_alfresco extends repository {
                         'children'=>array());
                 } elseif ($child->child->type == $file_filter) {
                     $ret['list'][] = array('title'=>$child->child->cm_name,
-                        'thumbnail' => $OUTPUT->old_icon_url('f/'. str_replace(array('.png', '.gif'), '', mimeinfo('icon32', $child->child->cm_name))),
+                        'thumbnail' => $OUTPUT->old_icon_url(file_extension_icon($child->child->cm_name, 32)),
                         'source'=>$child->child->id);
                 }
             }
diff --git a/repository/boxnet/repository.class.php b/repository/boxnet/repository.class.php
index 5e04cb13ca..ef206cd648 100755
--- a/repository/boxnet/repository.class.php
+++ b/repository/boxnet/repository.class.php
@@ -154,7 +154,7 @@ class repository_boxnet extends repository {
                             'date'=>$filedates[$n],
                             'source'=>'http://box.net/api/1.0/download/'
                                 .$this->auth_token.'/'.$fileids[$n],
-                            'thumbnail'=>$OUTPUT->old_icon_url('f/'. str_replace(array('.png', '.gif'), '', mimeinfo('icon32', $v))));
+                            'thumbnail' => $OUTPUT->old_icon_url(file_extension_icon($v, 32)));
                 }
             }
         }
diff --git a/repository/filesystem/repository.class.php b/repository/filesystem/repository.class.php
index 25f2bea382..c0dc239625 100644
--- a/repository/filesystem/repository.class.php
+++ b/repository/filesystem/repository.class.php
@@ -64,7 +64,7 @@ class repository_filesystem extends repository {
                             'source' => $path.'/'.$file,
                             'size' => filesize($this->root_path.$file),
                             'date' => time(),
-                            'thumbnail' => $OUTPUT->old_icon_url('f/'. str_replace(array('.png', '.gif'), '', mimeinfo('icon32', $this->root_path.$file)))
+                            'thumbnail' => $OUTPUT->old_icon_url(file_extension_icon($this->root_path.$file, 32))
                         );
                     } else {
                         if (!empty($path)) {
diff --git a/repository/lib.php b/repository/lib.php
index 63e7ddadf8..12f3ed9d3c 100644
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -769,7 +769,7 @@ abstract class repository {
                 return array('url'=>$ret->get_url(),
                     'id'=>$file->get_itemid(),
                     'file'=>$file->get_filename(),
-                    'icon'=>$OUTPUT->old_icon_url('f/'. str_replace(array('.png', '.gif'), '', mimeinfo('icon32', $path)))
+                    'icon' => $OUTPUT->old_icon_url(file_extension_icon($path, 32))
                 );
             } else {
                 return null;
@@ -960,7 +960,7 @@ abstract class repository {
                     'date' => $filedate,
                     //'source' => $child->get_url(),
                     'source' => base64_encode($source),
-                    'thumbnail' => $OUTPUT->old_icon_url('f/'. str_replace(array('.gif', '.png'), '', mimeinfo('icon32', $filename)))
+                    'thumbnail'=>$OUTPUT->old_icon_url(file_extension_icon($filename, 32)),
                 );
                 $filecount++;
             }
diff --git a/repository/mahara/repository.class.php b/repository/mahara/repository.class.php
index 10dc68372e..75cc8a96e6 100644
--- a/repository/mahara/repository.class.php
+++ b/repository/mahara/repository.class.php
@@ -214,7 +214,7 @@ class repository_mahara extends repository {
                 if ($file['artefacttype'] == 'image') {
                     $thumbnail = $host->wwwroot."/artefact/file/download.php?file=".$file['id']."&size=70x55";
                 } else {
-                    $thumbnail = $OUTPUT->old_icon_url('f/'. str_replace(array('.png', '.gif'), '', mimeinfo('icon32', $file['title'])));
+                    $thumbnail = $OUTPUT->old_icon_url(file_extension_icon( $file['title'], 32));
                 }
                 $list[] = array( 'title'=>$file['title'], 'date'=>$file['mtime'], 'source'=>$file['id'], 'thumbnail' => $thumbnail);
             }
diff --git a/repository/s3/repository.class.php b/repository/s3/repository.class.php
index aaf9b3879a..185764c51d 100644
--- a/repository/s3/repository.class.php
+++ b/repository/s3/repository.class.php
@@ -45,7 +45,7 @@ class repository_s3 extends repository {
                     'size'=>$file['size'],
                     'date'=>userdate($file['time']),
                     'source'=>$path.'/'.$file['name'],
-                    'thumbnail'=>$OUTPUT->old_icon_url('f/'. str_replace(array('.png', '.gif'), '', mimeinfo('icon32', $file['name'])))
+                    'thumbnail' => $OUTPUT->old_icon_url(file_extension_icon($file['name'], 32))
                     );
             }
         }
diff --git a/repository/url/repository.class.php b/repository/url/repository.class.php
index 4a99f1368f..b67a390619 100755
--- a/repository/url/repository.class.php
+++ b/repository/url/repository.class.php
@@ -101,7 +101,7 @@ EOD;
                 $ret['list'][] = array(
                     'title'=>$filename,
                     'source'=>$this->file_url,
-                    'thumbnail' => $OUTPUT->old_icon_url('f/'. str_replace(array('.png', '.gif'), '', mimeinfo('icon32', $filename)))
+                    'thumbnail' => $OUTPUT->old_icon_url(file_extension_icon($filename, 32))
                     );
             }
         }
diff --git a/repository/webdav/repository.class.php b/repository/webdav/repository.class.php
index c6755877f4..d32771363c 100644
--- a/repository/webdav/repository.class.php
+++ b/repository/webdav/repository.class.php
@@ -121,7 +121,7 @@ class repository_webdav extends repository {
                 $size = !empty($v['getcontentlength'])? $v['getcontentlength']:'';
                 $ret['list'][] = array(
                     'title'=>$title,
-                    'thumbnail' => $OUTPUT->old_icon_url('f/'. str_replace(array('.png', '.gif'), '', mimeinfo('icon32', $title))),
+                    'thumbnail' => $OUTPUT->old_icon_url(file_extension_icon($title, 32)),
                     'size'=>$size,
                     'date'=>$filedate,
                     'source'=>$v['href']
diff --git a/repository/wikimedia/repository.class.php b/repository/wikimedia/repository.class.php
index bc76c06737..5d985a715b 100644
--- a/repository/wikimedia/repository.class.php
+++ b/repository/wikimedia/repository.class.php
@@ -15,7 +15,7 @@ class repository_wikimedia extends repository {
         foreach ($result as $title=>$url) {
             $list['list'][] = array(
                 'title'=>substr($title, 5),
-                'thumbnail'=>$OUTPUT->old_icon_url('f/'.str_replace(array('.gif', '.png'), '', mimeinfo('icon32', 'xx.jpg'))),
+                'thumbnail'=>$OUTPUT->old_icon_url(file_extension_icon('xx.jpg', 32)),
                 // plugin-dependent unique path to the file (id, url, path, etc.)
                 'source'=>$url,
                 // the accessible url of the file
-- 
2.39.5