Log of /moodle/mod/resource/type/file/resource.class.php

"MDL-8677, fixed mimetype name"

MDL-20836 fixed new resource preset value

MDL-15686 Resolved the mutually-disabling code for forcedownload and windowpopup in resource mod, file type.

resource/file MDL-20327 force target attributes on frame navigation for non-JS

resource/file MDL-20327 force target attributes on frame navigation for non-JS

resource MDL-20320 PDF are now displayed the same way as HTML filse by the resource module. Also renamed 'Keep navigation visible on the same page' into 'Show navigation', and added a warning about this option.

MDL-20065 new implementation of File module, modules sub-types are being migrated to separate modules; remaining issues to be listed as sub-tasks in tracker

MDL-19814 Migrated calls to close_window_button()

MDL-19814 Migrated calls to print_spacer()

javascript-UFO MDL-19738 Stopped ufo.js being included in outputlib and included it in each place it was actually being used.
It will no only be loaded when it is being used. If something new comes along they will need to remember to require it.
At the same time cleaned up a few deprecated calls

mod-resource-file MDL-16706 Removed inline JS and replaced with new PAGE methods

MDL-19580 cleanup of require css and js filepicker code

javascript: MDL-19475 replace require_js calls with $PAGE->requires->js.
This is the final batch.

MDL-13826 link/file resource - check maximum length ; merged from 19_STABLE

MDL-13826 link/file resource - check maximum length

"MDL-19037, use getremoteaddr to get remote ip address, backported from 2.0"

"MDL-19037, use getremoteaddr to get remote ip address"

MDL-18910 full support for module intro editor with embedded images

MDL-18910 normalised module intro and introformat

MDL-18644 Bugs found by syntax checker, merged from MOODLE_19_STABLE

MDL-18644 Function name must be enclosed in quotes

MDL-17934 flv player in resources - allow full screen. Credit goes to Darren Jones. Merged from 19_STABLE

MDL-17934 flv player in resources - allow full screen. Credit goes to Darren Jones.

"RESOURCE/MDL-17696, remove extra div, merged from 1.9"

"RESOURCE/MDL-17696, remove extra div"

resource: MDL-10021 upload file resource: change "keep navigation visible" into select box (No, yes with frame, yes without frame)

resource: MDL-10021 upload file resource: change "keep navigation visible" into a select box. Choice are now: No - Yes, with frame - Yes, without frame

resource: MDL-10021 upload file resource: change "keep navigation visible" into a select box. Choice are now No - Yes, Frame tag - Yes, Object tag

"MDL-17570,clean align property, merged from 1.9"

"MDL-17570, cleanup inline css"

file resources: MDL-14541 Object tag embedding PDF's and nested Flash objects does not work reliably

Merged from MOODLE_19_STABLE.

Credit goes to David Boyer for reporting and suggesting the fix for PDF files,
and Jon Witts & Mauno Korpelainen for proving a way to reproduce the Flash
issue and tips to fix it.

file resources: MDL-14541 Object tag embedding PDF's and nested Flash objects does not work reliably

Merged from MOODLE_19_STABLE.

Credit goes to David Boyer for reporting and suggesting the fix for PDF files,
and Jon Witts & Mauno Korpelainen for proving a way to reproduce the Flash
issue and tips to fix it.

file resources: MDL-14541 Object tag embedding PDF's and nested Flash objects does not work reliably

Credit goes to David Boyer for reporting and suggesting the fix for PDF files,
and Jon Witts & Mauno Korpelainen for proving a way to reproduce the Flash
issue and tips to fix it.

cleanup: MDL-17083 Remove the old teacher, teachers, student and students columns from the course table.

For something that has been deprecated for over two years, they were still used in a lot of places!

MDL-10021: display iframe when the resource is on another domain, merged from 19

MDL-10021: display iframe when the resource is on another domain, merged from 19

MDL-10021: display iframe when the resource is on another domain

MDL-10021: fix xhtml/javascript + build_navigation(), merged from 1.9

MDL-10021: fix xhtml/javascript

MDL-10021: fix xhtml/javascript

MDL-10021: use build_navigation() instead a string into print_header()

MDL-10021: change frame into object tag when display a Link Resource with navigation bar, merged from 19

MDL-10021: change frame into object tag when display a Link Resource with navigation bar, merged from 19

MDL-10021: change frame into object tag when display a Link Resource with navigation bar

file/link resource: Fix notice.

MDL-16600 forcedownload broken for file resources.

Prevent SQL error when forcing download. MDL-15921 ; merged from 19_STABLE

Prevent SQL error when forcing download. MDL-15921

MDL-14279: use get_file_url instead of checking $CFG->slashargument manually (merge from 1.9)

MDL-14279: use get_file_url instead of checking $CFG->slashargument manually

MDL-14865 Merged from 1.9  (Don't pass CFG to get_string)

MDL-14865 DOn't pass CFG to get_string

Force download checkbox is not initialized properly, credit goes to skodak. MDL-14010 ; merged from 19_STABLE

Force download checkbox is not initialized properly, credit goes to skodak. MDL-14010

MDL-13151 add a new language string: phone2, thanks for your idea, Jams Ballard.

MDL-13151, add a new language string: phone2, thanks for your idea, James

MDL-13481, Distinguish between course fullname and user fullname

MDL-13743 Added realmedia support. Merging from MOODLE_19_STABLE

MDL-13743 Added realmedia support. Merging from MOODLE_18_STABLE

MDL-13743 Added realmedia support

MDL-13903 New file resource option for forcing the download of the file instead of embedding it. Backporting from HEAD

MDL-13903 New file resource option for forcing the download of the file instead of embedding it.

MDL-13796 Backported recaptcha element from HEAD.

MDL-12694: Same change as in 1.9. Files that can be embedded will be embedded regardless of resource frame settings.

MDL-12930 - wrong title text on search webpages button, thanks to Mitsuhiro
Yoshida
merged from MOODLE_19_STABLE

MDL-12930 - wrong title text on search webpages button, thanks to Mitsuhiro
Yoshida

MDL-12221 reworked container autoclosing - error() and notice() do not work everywhere though; notice print header if needed now; new print_footer('empty') for empty footer - removes some hacky </body></html> - merged from MOODLE_19_STABLE

MDL-12221 reworked container autoclosing - error() and notice() do not work everywhere though; notice print header if needed now; new print_footer('empty') for empty footer - removes some hacky </body></html>

MDL-12098 Printing a closing div tag and the moodle footer

MDL-12098 Printing a closing div tag and the moodle footer

MDL-8992 Now only appearing once per page, and XHTML compliant. Also removed an ugly browser-sniffing css hack from the quicktime plugin, and applied the same browser detection as for the other plugins

MDL-8992 Now only appearing once per page, and XHTML compliant. Also removed an ugly browser-sniffing css hack from the quicktime plugin, and applied the same browser detection as for the other plugins

MDL-8992 Now only appearing once per page, and XHTML compliant. Also removed an ugly browser-sniffing css hack from the quicktime plugin, and applied the same browser detection as for the other plugins

MDL-11741 - Convert core modules to take advantage of recent improvements to build_navigation.

This check-in removes about 400 lines of code. I hope I have not screwed anything up. I would be grateful if people could review this change, and keep an eye on the navigation bar in modules.

Any navigation bar bugs you find in the near future, feel free to file them in the tracker and assign them to me. Thanks.

If not to many problems are found, I think I would like to backport this to 1.9 stable, but I am not sure that is a good idea. Opinions to the General Developer Forum please. I am about to start a thread there.

Backported from head. Will update merged tags in a few hours. I am late for orchestra. Sorry.

MDL-11741 - Convert core modules to take advantage of recent improvements to build_navigation.

This check-in removes about 400 lines of code. I hope I have not screwed anything up. I would be grateful if people could review this change, and keep an eye on the navigation bar in modules.

Any navigation bar bugs you find in the near future, feel free to file them in the tracker and assign them to me. Thanks.

If not to many problems are found, I think I would like to backport this to 1.9 stable, but I am not sure that is a good idea. Opinions to the General Developer Forum please. I am about to start a thread there.

MDL-10658, course short name repeated in breadcrumbs

MDL-10853 Fixed this bug plus others in the resource class

Merged zip file exception into HEAD    MDL-9478

Added a small exception to make a download link for zip files  MDL-9478

MDL-9664 Attempting to address the issue. I need feedback from many people on this, so this commit is only a temporary fix.

Merged fixes for mp3 and flv files from MDL-9739

Added support for flv files in  resources   MDL-9739

FIixes to show MP3 player properly  MDL-9739

Merged fix for navigation from HEAD

Fixed navigation on embedded media

MDL-9392 resource_popup: not working; merged from MOODLE_18_STABLE

MDL-9392 resource_popup: not working

MDL-9730 resource name is now used in accessibility pdf link instead of summary hat may not be always present; merged from MOODLE_18_STABLE

MDL-9730 resource name is now used in accessibility pdf link instead of summary hat may not be always present

MDL-9241 Fixed a typo: used if($mimetype = 'application/x-pdf') instead of ==

MDL-9241 Fixed a typo: used if($mimetype = 'application/x-pdf') instead of ==

MDL-9198: Embedded PDF now works fine in FF 1.5, FF 2, IE5, IE6, IE7 and Opera, and degrades beautifully in non-supported browsers (or when plugin is missing).

MDL-9198: Embedded PDF now works fine in FF 1.5, FF 2, IE5, IE6, IE7 and Opera, and degrades beautifully in non-supported browsers (or when plugin is missing).

Restoring changes all the changes in MOODLE_16_STABLE since MOODLE_16_BETA.

This had to be done because the MOODLE_16_STABLE branch tags were moved.

Hopefully after this MOODLE_16_STABLE will be back to how it was (and a
proper branch) but some of the history may look a bit odd.

See MDL-9032 for more discussion and details.

MDL-8860 - Enabled multilang filter for site title.

MDL-8860 - Enabled multilang filter for site title.

MDL-8870 - All major file formats (mp3, mpeg, wmv, mov, avi, swf) now support embedding when required, in all major browsers.

MDL-8870 - All major file formats (mp3, mpeg, wmv, mov, avi, swf) now support embedding when required, in all major browsers.

MDL-8870 - Added support for embedded flash, as well as css hooks for different embedded files (e.g. class="resourceswf")

MDL-8870 - Added support for embedded flash, and css hooks for all embedded resources (e.g. class="resourceswf")

MDL-8792 - Added a language string: keepnavigationvisible

MDL-8792 - Added a new language string: keepnavigationvisible

MDL-8792 - Simply added help icon to explain the options available regarding embedding media files in the site.

MDL-8792 - Simply added help icon to explain the options available regarding embedding media files in the site.

Converted embedded media files (avi, wmv and mov) to xhtml strict compliance. However, this is far from finished, since some browsers are not displaying correctly.

<table border="1" cellpadding="2" cellspacing="2">
<tr>
<td></td><th colspan="8">Browsers</th>
</tr>

<tr>
<th>File</th>
<td>FF 1.5</td>
<td>FF 2.0</td>
<td>IE 1.5</td>
<td>IE 1.6</td>
<td>IE 1.7</td>
<td>Safari 2.0</td>
<td>Opera 9.10</td>
<td>Konqueror</td>
</tr>

<tr>
<td>AVI (800x600)</td>
<td>?</td><!-- FF 1.5 -->
<td>?</td><!-- FF 2.0 -->
<td>?</td><!-- IE 1.5 -->
<td>?</td><!-- IE 1.6 -->
<td>?</td><!-- IE 1.7 -->
<td>?</td><!-- Safari 2.0 -->
<td>?</td><!-- Opera 2.0 -->
<td>?</td><!-- Konqueror 2.0 -->
</tr>

<tr>
<td>AVI (300x200)</td>
<td>?</td><!-- FF 1.5 -->
<td>OK (pb with size)</td><!-- FF 2.0 -->
<td>?</td><!-- IE 1.5 -->
<td>OK</td><!-- IE 1.6 -->
<td>OK</td><!-- IE 1.7 -->
<td>OK</td><!-- Safari 2.0 -->
<td>OK</td><!-- Opera 2.0 -->
<td>?</td><!-- Konqueror 2.0 -->
</tr>

<tr>
<td>WMV (800x600)</td>
<td>?</td><!-- FF 1.5 -->
<td>OK</td><!-- FF 2.0 -->
<td>?</td><!-- IE 1.5 -->
<td>OK</td><!-- IE 1.6 -->
<td>OK</td><!-- IE 1.7 -->
<td>NO</td><!-- Safari 2.0 -->
<td>OK</td><!-- Opera 2.0 -->
<td>?</td><!-- Konqueror 2.0 -->
</tr>

<tr>
<td>WMV (300x200)</td>
<td>?</td><!-- FF 1.5 -->
<td>OK (pb with size)</td><!-- FF 2.0 -->
<td>?</td><!-- IE 1.5 -->
<td>OK</td><!-- IE 1.6 -->
<td>OK</td><!-- IE 1.7 -->
<td>OK</td><!-- Safari 2.0 -->
<td>OK</td><!-- Opera 2.0 -->
<td>?</td><!-- Konqueror 2.0 -->
</tr>

<tr>
<td>MOV (800x600)</td>
<td>?</td><!-- FF 1.5 -->
<td>OK</td><!-- FF 2.0 -->
<td>?</td><!-- IE 1.5 -->
<td>OK</td><!-- IE 1.6 -->
<td>OK</td><!-- IE 1.7 -->
<td>NO</td><!-- Safari 2.0 -->
<td>OK</td><!-- Opera 2.0 -->
<td>?</td><!-- Konqueror 2.0 -->
</tr>

<tr>
<td>MOV (300x200)</td>
<td>?</td><!-- FF 1.5 -->
<td>OK</td><!-- FF 2.0 -->
<td>?</td><!-- IE 1.5 -->
<td>OK</td><!-- IE 1.6 -->
<td>OK</td><!-- IE 1.7 -->
<td>NO</td><!-- Safari 2.0 -->
<td>OK</td><!-- Opera 2.0 -->
<td>?</td><!-- Konqueror 2.0 -->
</tr>
</table>

Converted embedded media files (avi, wmv and mov) to xhtml strict compliance. However, this is far from finished, since some browsers are not displaying correctly.

<table border="1" cellpadding="2" cellspacing="2">
<tr>
<td></td><th colspan="8">Browsers</th>
</tr>

<tr>
<th>File</th>
<td>FF 1.5</td>
<td>FF 2.0</td>
<td>IE 1.5</td>
<td>IE 1.6</td>
<td>IE 1.7</td>
<td>Safari 2.0</td>
<td>Opera 9.10</td>
<td>Konqueror</td>
</tr>

<tr>
<td>AVI (800x600)</td>
<td>?</td><!-- FF 1.5 -->
<td>?</td><!-- FF 2.0 -->
<td>?</td><!-- IE 1.5 -->
<td>?</td><!-- IE 1.6 -->
<td>?</td><!-- IE 1.7 -->
<td>?</td><!-- Safari 2.0 -->
<td>?</td><!-- Opera 2.0 -->
<td>?</td><!-- Konqueror 2.0 -->
</tr>

<tr>
<td>AVI (300x200)</td>
<td>?</td><!-- FF 1.5 -->
<td>OK (pb with size)</td><!-- FF 2.0 -->
<td>?</td><!-- IE 1.5 -->
<td>OK</td><!-- IE 1.6 -->
<td>OK</td><!-- IE 1.7 -->
<td>OK</td><!-- Safari 2.0 -->
<td>OK</td><!-- Opera 2.0 -->
<td>?</td><!-- Konqueror 2.0 -->
</tr>

<tr>
<td>WMV (800x600)</td>
<td>?</td><!-- FF 1.5 -->
<td>OK</td><!-- FF 2.0 -->
<td>?</td><!-- IE 1.5 -->
<td>OK</td><!-- IE 1.6 -->
<td>OK</td><!-- IE 1.7 -->
<td>NO</td><!-- Safari 2.0 -->
<td>OK</td><!-- Opera 2.0 -->
<td>?</td><!-- Konqueror 2.0 -->
</tr>

<tr>
<td>WMV (300x200)</td>
<td>?</td><!-- FF 1.5 -->
<td>OK (pb with size)</td><!-- FF 2.0 -->
<td>?</td><!-- IE 1.5 -->
<td>OK</td><!-- IE 1.6 -->
<td>OK</td><!-- IE 1.7 -->
<td>OK</td><!-- Safari 2.0 -->
<td>OK</td><!-- Opera 2.0 -->
<td>?</td><!-- Konqueror 2.0 -->
</tr>

<tr>
<td>MOV (800x600)</td>
<td>?</td><!-- FF 1.5 -->
<td>OK</td><!-- FF 2.0 -->
<td>?</td><!-- IE 1.5 -->
<td>OK</td><!-- IE 1.6 -->
<td>OK</td><!-- IE 1.7 -->
<td>NO</td><!-- Safari 2.0 -->
<td>OK</td><!-- Opera 2.0 -->
<td>?</td><!-- Konqueror 2.0 -->
</tr>

<tr>
<td>MOV (300x200)</td>
<td>?</td><!-- FF 1.5 -->
<td>OK</td><!-- FF 2.0 -->
<td>?</td><!-- IE 1.5 -->
<td>OK</td><!-- IE 1.6 -->
<td>OK</td><!-- IE 1.7 -->
<td>NO</td><!-- Safari 2.0 -->
<td>OK</td><!-- Opera 2.0 -->
<td>?</td><!-- Konqueror 2.0 -->
</tr>
</table>

Merged Nicolas' changes from MDL-8582 into HEAD.

Fixed MDL-8582
Not sure if the hotpot module is converting ampersands correctly. $heading and $title are set up differently than in other modules: instead of outputting $course->title, a temporary $title variable is created and assigned that value. That made it difficult for me to decide whether it was already formatted elsewhere or not.

Also I didn't format_string() any of the variables included in $navigation rings, because I assume these strings get processed by print_navigation(), which includes format_string().

MDL-8519 teamspeak link support in resource mod; backported from HEAD

MDL-8519 teamspeak link support in resource mod

MDL-8460 Notice in resource/type/text class revisited

MDL-8323 Add proper setup of course $CFG variables, fix use of global $COURSE
new function course_setup() thats does proper $CFG-> , locale and themes setup much sooner than print_header() originally (needed for MDL-8067), cleanup of forgotten global $course issues

MDL-8067 Fixed several $HTTPSREQUIRED issues - html editor now loads from https (the old hack did not wotk with IE7, new hack is uglier but works), fixed formlibs images (we can not set them in library global scope, we must wait for httpsrequired() and require_login() and od that in function), fixed links in meta.php, fixed help images

fixed setting of new $USER values in user edit forms

fixed wrong disabledif conditions in resource subtypes - sorry

do not send passowrd hashes to other sites SC#353; merged from MOODLE_16_STABLE

do not send passowrd hashes to other sites SC#353

MDL-7013 advanced buttons inplemented in resource settings

MDL-7013 disabeldIf implemented in resource settings

fixed text field widths in new forms

MDL-7013 resource forms converted to use new forms library; locking is not implemented yet - will have to improve disabledif first

MDL-7861 resource mod related xhtml strict fixes (student visible interface only)

fixed potential problems with undefined $USER->screenreader

MDL-8050 1.2 Remove all target="_top" - refactoring of previous commit

MDL-8049 Remove all language=Javascript from javascript includes

MDL-8050 1.2 Remove all target="_top"

fix for MDL-7862, frames titles and frame accessibility for resources

we are going 100% unicode now - removed use of $CFG->unicodedb and current_charset(); MDL-7439 - part 2, only hotpot and wiki left

Resource frameset error in IE6 MDL-6842, patch submitted by Chris Fryer; backported from HEAD

Resource frameset error in IE6 MDL-6842, patch submitted by Chris Fryer.

Merged fix for bug 5830 into dev

Fix for resource parameters for users not logged in

Added a new string idnumber course to allow more customisation  bug 4337

More uses for current_charset().

Merged from MOODLE_16_UTF8. Abandoning the branch.

Merged with MOODLE_16_MULTIENROL_MP1

More uses for current_charset()

fixed encoding of page title of framed resources; merged from MOODLE_15_STABLE

fixed encoding of page title of framed resources

Whoops - typo!

complete the renaming of get_user_timezone to get_user_timezone_offset started by Martin

Now resource->name is working under filterall.

New feature for resources ... Local File Resources

A Resource Parameter controls this (it defaults to OFF).

When on, you see a third button when selecting a file, which lets
you select a LOCAL file on your own filesystem (but it isn't uploaded).

The local file is included in the web page when viewed.  All users see
a link that helps them set up a user_preference for the location of
these files on their own system (usually a CD_ROM drive).

Call the new MP# player properly

Better invocation of the new MP3 player

Fixed four more references to mimetypes.php (bug 2690)  Thanks, Gustav!

Merge fix from STABLE

Some notices fixed

Removed link from navigation bar

Made new serverurl more standard (don't include raw variables in strings)

Minor fix: language string lookup

Added hook for more flexible authentication to external url - backwards compatible with existing file resources

Removed $THEME from around the place

General tidy up of code, changes for XHTML and accessibility compatibility.

Tiny hack to make $course work OK in file resources (print_header)

Should be replaced with proper global $COURSE in 1.5

Merged changes from STABLE

Centralised some of the display stuff in the display function in the base class

Added better checking for students accessing hidden resources

XHTML and accessibility compatibility

Changes for XHTML compatibility

Some changes for XHTML compatibility

XHTML compliance
- fixed (hopefully) all <img> tags
- global replace on <br> to <br />
- &amp; in URLs
- got the forum module XHTML compliant
Julian Sedding

towards XHTML compliance

fixed capitalization and quoting of attribute values

Merged updates from stable

Added Password and Phone 2

Frame is now default again

Use the general word "Location" instead of "File name"

Use resource_defaulturl when it's blank ... somehow this got removed.

Fixed window choices on resources so that they use a radio button now.

bug 1741

Cleaned up some more things using some shortcut variables, and also
fixed bug 1711 that was preventing glossaries from working properly

Standardising the printing of content and summaries to use format_text()

Lots of little cleanups and these new things:

  - Reference resources are now history -> converted to HTML pages
      (the backup/restore has been taken care of, Eloy)

  - HTML pages and Text pages can now have popups!

  - Summaries are not shown when they should be blank (eg if they
    just contain a <br /> as the HTML editor usually inserts.

  - Fixed some notices for PHP 5

Fixed some notices, thanks Eloy!

Fixed lots of bodgy little things

Fixed some notices ... thanks, Eloy!  For some reason my server
isn't displaying these even though it's set up ...

Grr, fixed ID tag syntax

Added some ID tags to these files

Merged in the new resource structure to TRUNK

Program resources are now inlcuded in web/file as well ...

I had a bit of a CVS accident tonight, hopefully this is all sound

Checking in new resource module to a development branch

file resource.class.php was initially added on branch MOODLE_14_RESOURCE.