MOved the file icons into the proper place (at last)

diff --git a/files/index.php b/files/index.php
index 7e86ae67218242d3d9247d11c728f8e253b122d6..53332d4d81efdde7a0829afa5fee6747053cd286 100644 (file)
--- a/files/index.php
+++ b/files/index.php
@@ -135,7 +135,7 @@
                 displaydir($wdir);
                     
             } else {
-                $upload_max_filesize = get_max_upload_file_size($CFG->maxbytes);
+                $upload_max_filesize = get_max_upload_file_size($CFG->maxbytes);  // Restricted by site setting
                 $filesize = display_size($upload_max_filesize);
 
                 $struploadafile = get_string("uploadafile");
@@ -618,11 +618,11 @@ function clearfilelist() {
 
 
 function printfilelist($filelist) {
-    global $basedir;
+    global $CFG, $basedir;
 
     foreach ($filelist as $file) {
         if (is_dir($basedir.$file)) {
-            echo "<IMG SRC=\"pix/folder.gif\" HEIGHT=16 WIDTH=16> $file<BR>";
+            echo "<img src=\"$CFG->pixpath/f/folder.gif\" height=16 width=16> $file<br>";
             $subfilelist = array();
             $currdir = opendir($basedir.$file);
             while ($subfile = readdir($currdir)) { 
@@ -634,7 +634,7 @@ function printfilelist($filelist) {
 
         } else { 
             $icon = mimeinfo("icon", $file);
-            echo "<IMG SRC=\"pix/$icon\"  HEIGHT=16 WIDTH=16> $file<BR>";
+            echo "<img src=\"$CFG->pixpath/f/$icon\"  height=16 width=16> $file<br>";
         }
     }
 }
@@ -720,7 +720,7 @@ function displaydir ($wdir) {
             echo "<TR>";
 
             print_cell("center", "<INPUT TYPE=checkbox NAME=\"file$count\" VALUE=\"$fileurl\">");
-            print_cell("left", "<A HREF=\"index.php?id=$id&wdir=$fileurl\"><IMG SRC=\"pix/folder.gif\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"Folder\"></A> <A HREF=\"index.php?id=$id&wdir=$fileurl\">".htmlspecialchars($dir)."</A>");
+            print_cell("left", "<A HREF=\"index.php?id=$id&wdir=$fileurl\"><IMG SRC=\"$CFG->pixpath/f/folder.gif\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"Folder\"></A> <A HREF=\"index.php?id=$id&wdir=$fileurl\">".htmlspecialchars($dir)."</A>");
             print_cell("right", "-");
             print_cell("right", $filedate);
             print_cell("right", "<A HREF=\"index.php?id=$id&wdir=$wdir&file=$filesafe&action=rename\">$strrename</A>");
@@ -753,7 +753,7 @@ function displaydir ($wdir) {
                 $ffurl = "/file.php?file=/$id$fileurl";
             }
             link_to_popup_window ($ffurl, "display", 
-                                  "<IMG SRC=\"pix/$icon\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"File\">", 
+                                  "<IMG SRC=\"$CFG->pixpath/f/$icon\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"File\">", 
                                   480, 640);
             echo "<font size=\"-1\" face=\"Arial, Helvetica\">";
             link_to_popup_window ($ffurl, "display", 

diff --git a/lib/editor/courseimages.php b/lib/editor/courseimages.php
index 15984c7e9dd960d18ceec4a170880221366bded9..254b1f106893fe3d30a851eab28a5f3274e212f5 100644 (file)
--- a/lib/editor/courseimages.php
+++ b/lib/editor/courseimages.php
@@ -646,7 +646,7 @@ function printfilelist($filelist) {
 
     foreach ($filelist as $file) {
         if (is_dir($basedir.$file)) {
-            echo "<IMG SRC=\"$CFG->wwwroot/files/pix/folder.gif\" HEIGHT=16 WIDTH=16> $file<BR>";
+            echo "<img src=\"$CFG->pixpath/f/folder.gif\" height=16 width=16> $file<br>";
             $subfilelist = array();
             $currdir = opendir($basedir.$file);
             while ($subfile = readdir($currdir)) { 
@@ -658,7 +658,7 @@ function printfilelist($filelist) {
 
         } else { 
             $icon = mimeinfo("icon", $file);
-            echo "<IMG SRC=\"$CFG->wwwroot/files/pix/$icon\"  HEIGHT=16 WIDTH=16> $file<BR>";
+            echo "<img src=\"$CFG->pixpath/f/$icon\"  height=16 width=16> $file<br>";
         }
     }
 }
@@ -743,7 +743,7 @@ function displaydir ($wdir) {
             echo "<TR>";
 
             print_cell("center", "<INPUT TYPE=checkbox NAME=\"file$count\" VALUE=\"$fileurl\">");
-            print_cell("left", "<A HREF=\"".basename($_SERVER['PHP_SELF'])."?id=$id&wdir=$fileurl\"><IMG SRC=\"$CFG->wwwroot/files/pix/folder.gif\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"Folder\"></A> <A HREF=\"".basename($_SERVER['PHP_SELF'])."?id=$id&wdir=$fileurl\">".htmlspecialchars($dir)."</A>");
+            print_cell("left", "<A HREF=\"".basename($_SERVER['PHP_SELF'])."?id=$id&wdir=$fileurl\"><IMG SRC=\"$CFG->pixpath/f/folder.gif\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"Folder\"></A> <A HREF=\"".basename($_SERVER['PHP_SELF'])."?id=$id&wdir=$fileurl\">".htmlspecialchars($dir)."</A>");
             print_cell("right", "-");
             print_cell("right", $filedate);
             print_cell("right", "<A HREF=\"".basename($_SERVER['PHP_SELF'])."?id=$id&wdir=$wdir&file=$filesafe&action=rename\">$strrename</A>");
@@ -776,7 +776,7 @@ function displaydir ($wdir) {
                 $ffurl = "/file.php?file=/$id$fileurl";
             }
             link_to_popup_window ($ffurl, "display", 
-                                  "<IMG SRC=\"$CFG->wwwroot/files/pix/$icon\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"File\">", 
+                                  "<IMG SRC=\"$CFG->pixpath/f/$icon\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"File\">", 
                                   480, 640);
             echo "<font size=\"-1\" face=\"Arial, Helvetica\">";
             link_to_popup_window ($ffurl, "display", 

diff --git a/mod/resource/coursefiles.php b/mod/resource/coursefiles.php
index c443bbbfb48ab286574ed3b711755d3a8c862a1d..2bd11c335f1ac026f098da493987ac4f0fedab07 100644 (file)
--- a/mod/resource/coursefiles.php
+++ b/mod/resource/coursefiles.php
@@ -639,7 +639,7 @@ function printfilelist($filelist) {
 
     foreach ($filelist as $file) {
         if (is_dir($basedir.$file)) {
-            echo "<IMG SRC=\"$CFG->wwwroot/files/pix/folder.gif\" HEIGHT=16 WIDTH=16> $file<BR>";
+            echo "<img src=\"$CFG->pixpath/f/folder.gif\" height=16 width=16> $file<br>";
             $subfilelist = array();
             $currdir = opendir($basedir.$file);
             while ($subfile = readdir($currdir)) { 
@@ -651,7 +651,7 @@ function printfilelist($filelist) {
 
         } else { 
             $icon = mimeinfo("icon", $file);
-            echo "<IMG SRC=\"$CFG->wwwroot/files/pix/$icon\"  HEIGHT=16 WIDTH=16> $file<BR>";
+            echo "<img src=\"$CFG->pixpath/f/$icon\"  height=16 width=16> $file<br>";
         }
     }
 }
@@ -736,7 +736,7 @@ function displaydir ($wdir) {
             echo "<TR>";
 
             print_cell("center", "<INPUT TYPE=checkbox NAME=\"file$count\" VALUE=\"$fileurl\">");
-            print_cell("left", "<A HREF=\"".basename($_SERVER['PHP_SELF'])."?id=$id&wdir=$fileurl\"><IMG SRC=\"$CFG->wwwroot/files/pix/folder.gif\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"Folder\"></A> <A HREF=\"".basename($_SERVER['PHP_SELF'])."?id=$id&wdir=$fileurl\">".htmlspecialchars($dir)."</A>");
+            print_cell("left", "<A HREF=\"".basename($_SERVER['PHP_SELF'])."?id=$id&wdir=$fileurl\"><IMG SRC=\"$CFG->pixpath/f/folder.gif\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"Folder\"></A> <A HREF=\"".basename($_SERVER['PHP_SELF'])."?id=$id&wdir=$fileurl\">".htmlspecialchars($dir)."</A>");
             print_cell("right", "-");
             print_cell("right", $filedate);
             print_cell("right", "<A HREF=\"".basename($_SERVER['PHP_SELF'])."?id=$id&wdir=$wdir&file=$filesafe&action=rename\">$strrename</A>");
@@ -776,7 +776,7 @@ function displaydir ($wdir) {
 
             echo "<td align=left nowrap>";
             link_to_popup_window ($ffurl, "display", 
-                                  "<img src=\"$CFG->wwwroot/files/pix/$icon\" height=16 width=16 border=0 alt=\"file\">", 
+                                  "<img src=\"$CFG->pixpath/f/$icon\" height=16 width=16 border=0 alt=\"file\">", 
                                   480, 640);
             echo "<font size=\"-1\" face=\"Arial, Helvetica\">";
             link_to_popup_window ($ffurl, "display", htmlspecialchars($file), 480, 640);

diff --git a/files/pix/audio.gif b/pix/f/audio.gif
similarity index 100%
rename from files/pix/audio.gif
rename to pix/f/audio.gif

diff --git a/files/pix/avi.gif b/pix/f/avi.gif
similarity index 100%
rename from files/pix/avi.gif
rename to pix/f/avi.gif

diff --git a/files/pix/edit.gif b/pix/f/edit.gif
similarity index 100%
rename from files/pix/edit.gif
rename to pix/f/edit.gif

diff --git a/files/pix/env.gif b/pix/f/env.gif
similarity index 100%
rename from files/pix/env.gif
rename to pix/f/env.gif

diff --git a/files/pix/excel.gif b/pix/f/excel.gif
similarity index 100%
rename from files/pix/excel.gif
rename to pix/f/excel.gif

diff --git a/files/pix/explore.gif b/pix/f/explore.gif
similarity index 100%
rename from files/pix/explore.gif
rename to pix/f/explore.gif

diff --git a/files/pix/flash.gif b/pix/f/flash.gif
similarity index 100%
rename from files/pix/flash.gif
rename to pix/f/flash.gif

diff --git a/files/pix/folder.gif b/pix/f/folder.gif
similarity index 100%
rename from files/pix/folder.gif
rename to pix/f/folder.gif

diff --git a/files/pix/help.gif b/pix/f/help.gif
similarity index 100%
rename from files/pix/help.gif
rename to pix/f/help.gif

diff --git a/files/pix/html.gif b/pix/f/html.gif
similarity index 100%
rename from files/pix/html.gif
rename to pix/f/html.gif

diff --git a/files/pix/image.gif b/pix/f/image.gif
similarity index 100%
rename from files/pix/image.gif
rename to pix/f/image.gif

diff --git a/files/pix/move.gif b/pix/f/move.gif
similarity index 100%
rename from files/pix/move.gif
rename to pix/f/move.gif

diff --git a/files/pix/parent.gif b/pix/f/parent.gif
similarity index 100%
rename from files/pix/parent.gif
rename to pix/f/parent.gif

diff --git a/files/pix/pdf.gif b/pix/f/pdf.gif
similarity index 100%
rename from files/pix/pdf.gif
rename to pix/f/pdf.gif

diff --git a/files/pix/powerpoint.gif b/pix/f/powerpoint.gif
similarity index 100%
rename from files/pix/powerpoint.gif
rename to pix/f/powerpoint.gif

diff --git a/files/pix/text.gif b/pix/f/text.gif
similarity index 100%
rename from files/pix/text.gif
rename to pix/f/text.gif

diff --git a/files/pix/unknown.gif b/pix/f/unknown.gif
similarity index 100%
rename from files/pix/unknown.gif
rename to pix/f/unknown.gif

diff --git a/files/pix/video.gif b/pix/f/video.gif
similarity index 100%
rename from files/pix/video.gif
rename to pix/f/video.gif

diff --git a/files/pix/word.gif b/pix/f/word.gif
similarity index 100%
rename from files/pix/word.gif
rename to pix/f/word.gif

diff --git a/files/pix/xml.gif b/pix/f/xml.gif
similarity index 100%
rename from files/pix/xml.gif
rename to pix/f/xml.gif

diff --git a/files/pix/zip.gif b/pix/f/zip.gif
similarity index 100%
rename from files/pix/zip.gif
rename to pix/f/zip.gif

diff --git a/theme/cordoroyblue/pix/f/audio.gif b/theme/cordoroyblue/pix/f/audio.gif
new file mode 100755 (executable)
index 0000000..7b4e7cc
Binary files /dev/null and b/theme/cordoroyblue/pix/f/audio.gif differ

diff --git a/theme/cordoroyblue/pix/f/avi.gif b/theme/cordoroyblue/pix/f/avi.gif
new file mode 100644 (file)
index 0000000..117706c
Binary files /dev/null and b/theme/cordoroyblue/pix/f/avi.gif differ

diff --git a/theme/cordoroyblue/pix/f/edit.gif b/theme/cordoroyblue/pix/f/edit.gif
new file mode 100644 (file)
index 0000000..cd3aaec
Binary files /dev/null and b/theme/cordoroyblue/pix/f/edit.gif differ

diff --git a/theme/cordoroyblue/pix/f/env.gif b/theme/cordoroyblue/pix/f/env.gif
new file mode 100644 (file)
index 0000000..3f82213
Binary files /dev/null and b/theme/cordoroyblue/pix/f/env.gif differ

diff --git a/theme/cordoroyblue/pix/f/excel.gif b/theme/cordoroyblue/pix/f/excel.gif
new file mode 100644 (file)
index 0000000..86c5e13
Binary files /dev/null and b/theme/cordoroyblue/pix/f/excel.gif differ

diff --git a/theme/cordoroyblue/pix/f/explore.gif b/theme/cordoroyblue/pix/f/explore.gif
new file mode 100644 (file)
index 0000000..a19c9be
Binary files /dev/null and b/theme/cordoroyblue/pix/f/explore.gif differ

diff --git a/theme/cordoroyblue/pix/f/flash.gif b/theme/cordoroyblue/pix/f/flash.gif
new file mode 100644 (file)
index 0000000..deb1347
Binary files /dev/null and b/theme/cordoroyblue/pix/f/flash.gif differ

diff --git a/theme/cordoroyblue/pix/f/folder.gif b/theme/cordoroyblue/pix/f/folder.gif
new file mode 100755 (executable)
index 0000000..e75b283
Binary files /dev/null and b/theme/cordoroyblue/pix/f/folder.gif differ

diff --git a/theme/cordoroyblue/pix/f/help.gif b/theme/cordoroyblue/pix/f/help.gif
new file mode 100644 (file)
index 0000000..1600716
Binary files /dev/null and b/theme/cordoroyblue/pix/f/help.gif differ

diff --git a/theme/cordoroyblue/pix/f/html.gif b/theme/cordoroyblue/pix/f/html.gif
new file mode 100644 (file)
index 0000000..550df5d
Binary files /dev/null and b/theme/cordoroyblue/pix/f/html.gif differ

diff --git a/theme/cordoroyblue/pix/f/image.gif b/theme/cordoroyblue/pix/f/image.gif
new file mode 100644 (file)
index 0000000..deb1347
Binary files /dev/null and b/theme/cordoroyblue/pix/f/image.gif differ

diff --git a/theme/cordoroyblue/pix/f/move.gif b/theme/cordoroyblue/pix/f/move.gif
new file mode 100644 (file)
index 0000000..776d89e
Binary files /dev/null and b/theme/cordoroyblue/pix/f/move.gif differ

diff --git a/theme/cordoroyblue/pix/f/parent.gif b/theme/cordoroyblue/pix/f/parent.gif
new file mode 100755 (executable)
index 0000000..885b2f9
Binary files /dev/null and b/theme/cordoroyblue/pix/f/parent.gif differ

diff --git a/theme/cordoroyblue/pix/f/pdf.gif b/theme/cordoroyblue/pix/f/pdf.gif
new file mode 100644 (file)
index 0000000..fbead2f
Binary files /dev/null and b/theme/cordoroyblue/pix/f/pdf.gif differ

diff --git a/theme/cordoroyblue/pix/f/powerpoint.gif b/theme/cordoroyblue/pix/f/powerpoint.gif
new file mode 100755 (executable)
index 0000000..cc13287
Binary files /dev/null and b/theme/cordoroyblue/pix/f/powerpoint.gif differ

diff --git a/theme/cordoroyblue/pix/f/text.gif b/theme/cordoroyblue/pix/f/text.gif
new file mode 100644 (file)
index 0000000..dc681dd
Binary files /dev/null and b/theme/cordoroyblue/pix/f/text.gif differ

diff --git a/theme/cordoroyblue/pix/f/unknown.gif b/theme/cordoroyblue/pix/f/unknown.gif
new file mode 100644 (file)
index 0000000..fd34f38
Binary files /dev/null and b/theme/cordoroyblue/pix/f/unknown.gif differ

diff --git a/theme/cordoroyblue/pix/f/video.gif b/theme/cordoroyblue/pix/f/video.gif
new file mode 100755 (executable)
index 0000000..117706c
Binary files /dev/null and b/theme/cordoroyblue/pix/f/video.gif differ

diff --git a/theme/cordoroyblue/pix/f/word.gif b/theme/cordoroyblue/pix/f/word.gif
new file mode 100644 (file)
index 0000000..ca4feca
Binary files /dev/null and b/theme/cordoroyblue/pix/f/word.gif differ

diff --git a/theme/cordoroyblue/pix/f/xml.gif b/theme/cordoroyblue/pix/f/xml.gif
new file mode 100755 (executable)
index 0000000..dc681dd
Binary files /dev/null and b/theme/cordoroyblue/pix/f/xml.gif differ

diff --git a/theme/cordoroyblue/pix/f/zip.gif b/theme/cordoroyblue/pix/f/zip.gif
new file mode 100755 (executable)
index 0000000..854946f
Binary files /dev/null and b/theme/cordoroyblue/pix/f/zip.gif differ