Commit Graph

332 Commits

Author SHA1 Message Date
Dan Poltawski c5338156c5 Revert "MDL-39832 Files: Revert MDL-39688 commit, 6ce0c9ce42fa7849e67d7611a628ece51c336c5f"
This reverts commit 1cb1157809.
2013-06-13 13:58:00 +08:00
Dan Poltawski db1a0b53c5 Revert "MDL-39832 Files: Fixed ETag format according with RFC2616."
This reverts commit bf4a95e6a3.
2013-06-13 13:57:58 +08:00
Matteo Scaramuccia bf4a95e6a3 MDL-39832 Files: Fixed ETag format according with RFC2616.
ETag must be double quoted,
http://tools.ietf.org/html/rfc2616#section-3.11:

      entity-tag = [ weak ] opaque-tag
      weak       = "W/"
      opaque-tag = quoted-string
2013-06-06 23:06:04 +02:00
Matteo Scaramuccia 1cb1157809 MDL-39832 Files: Revert MDL-39688 commit, 6ce0c9ce42
MDL-39688 has been successful in providing a solution for the issue but further
investigations done in MDL-39832 have got the evidence that the given solution
is more likely a workaround.
2013-06-06 23:06:02 +02:00
Petr Škoda 6ce0c9ce42 MDL-39688 do not set Etag when sending http ranges 2013-05-25 09:13:39 +02:00
Marina Glancy 6d5bcdebf1 MDL-39177 Updating userid when file is overwritten 2013-05-21 10:57:44 +10:00
Marina Glancy 239eb7e230 MDL-39177 More comments about confusing files.source field 2013-05-14 17:07:55 +10:00
Marina Glancy 02890b991a MDL-39177 Perform all checks on draftfile area before saving the files 2013-05-14 17:07:54 +10:00
Marina Glancy 7627b9999c MDL-39177 Remove code duplication 2013-05-14 17:07:54 +10:00
Marina Glancy 77947f22ff MDL-39177 Update file in filearea only if original is present
Now when file was deleted in filemanager and new file with the same file was uploaded the references will be converted to copies exactly like UI warns in filemanager.
Also do not delete original information from draftfiles.
2013-05-14 17:07:54 +10:00
Marina Glancy 73c6550ddb MDL-39177 File reference is not updated when overwriting the file 2013-05-14 17:07:53 +10:00
Damyon Wiese 2ec0ba91b8 MDL-38468 Filelib: Fix ordering of new mimetypes and upgrade step 2013-03-26 15:30:24 +08:00
Matteo Scaramuccia 4c1689ba52 MDL-38468 Files API: fixed the support for MTHML (MIME HTML: web page archive) files
Conflicts:

	version.php
2013-03-26 15:28:21 +08:00
Eloy Lafuente (stronk7) 51f55920b5 Merge branch 'MDL-38268-m23' of https://github.com/jfilip/moodle into MOODLE_23_STABLE 2013-03-13 01:14:59 +01:00
Justin Filip d567c29dc9 MDL-38268 files: Must be explicit about switching cURL request method from HEAD to GET. 2013-03-05 11:22:20 -05:00
Eloy Lafuente (stronk7) c3dd18842b Merge branch 'MDL-38170-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE 2013-03-04 16:26:25 +01:00
sam marshall e97baa19ca MDL-38170 SimplePie: Cannot read https feeds through proxy 2013-03-01 10:35:31 +00:00
sam marshall 29c7332585 MDL-38168 Filelib: Curl class does not honour proxybypass option 2013-02-22 14:24:07 +00:00
Frederic Massart 3c509fdc04 MDL-35622 files: Fixed typo in galleryitem extension 2013-02-20 14:28:44 +08:00
Frederic Massart e4594f737e MDL-35622 files: Add support for SMART Notebook MIME types
- The MIME type for Notebook files is: application/x-smarttech-notebook
- The MIME type for Gallery files is also: application/x-smarttech-notebook
Refs: http://exchange-forum.smarttech.com/forums/p/5152/11945.aspx#11945

Original author: Matteo Scaramuccia <moodle@matteoscaramuccia.com>
Fixed by: Paul Holden <pholden@greenhead.ac.uk>

Conflicts:

	lib/db/upgrade.php
	version.php
2013-02-18 11:35:31 +08:00
Howard Miller 3c21fdc9ce MDL-37797 HTML block: add contextid to block_positions query and make it more unique. 2013-02-05 16:24:26 +08:00
sam marshall 52f37ef475 MDL-37395 Add .jar filetype so Moodle doesn't incorrectly call it a zip file 2013-01-08 12:51:24 +00:00
Petr Škoda f6ca5cf303 MDL-29442 add missing utf-8 to entity html encoding and decoding 2012-12-11 10:23:12 +13:00
Frederic Massart ac247b4e84 MDL-30731 calendar: Fixed display of images in event descriptions 2012-11-20 14:59:23 +08:00
Eloy Lafuente (stronk7) 5cb3d27681 Merge branch 'MDL-35141-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE 2012-10-09 00:47:11 +02:00
Rex Lorenzo 102d0bd05b MDL-35376 - Shortcut/alias not working for Private file repo 2012-09-11 14:24:02 -07:00
sam marshall d6d63941d7 MDL-35141 Filelib: No icon for epub filetype 2012-08-30 12:20:44 +01:00
Marina Glancy f8dea58be9 MDL-34290 remove class cache_file as not used
in fact we have moodle filepool that can work perfectly for caching files, no need to create new class and storage
2012-08-29 13:12:05 +08:00
Marina Glancy a6b0ac5362 MDL-34290 Allow to have several requests to the same instance of oauth_helper 2012-08-29 13:12:04 +08:00
Marina Glancy 9001c7242e MDL-34290 repository API: add repository function to import referenced file
it must be independed from sync_external_file because sync often does not actually download contents, it is used just to retrieve
the size of the file. Besides the timeouts for get_file and sync requests are very different.

Also add option to send_stored_file() to ignore reference and send cached contents
2012-08-29 13:12:03 +08:00
Marina Glancy 26aaa7e835 MDL-34290 update all references after the source is changed
- When several records in {files} have the same record in {files_reference} and the synchronisation is performed, we need to update
all records in {files} so all files know if source is changed and that sync was performed;
- also when local moodle file content is changed we immediately update all files referencing to it (therefore sync of references
to the local files is unnecessary);
2012-08-29 13:12:00 +08:00
Marina Glancy 2e0b5fef48 MDL-34290 curl class: add functions to return error code and to download one file 2012-08-29 13:12:00 +08:00
Petr Škoda 3a933cdf10 MDL-34585 fix broken blog file access control 2012-08-02 09:58:50 +02:00
David Balch d36249d6d6 MDL-34143 Add file type information for .mdb .accdb (MS Access databases) 2012-07-09 13:05:40 +08:00
David Balch 2425229c88 MDL-34063 XHTML files should use the HTML icon, not the markup icon 2012-07-05 18:34:55 +02:00
Jonathan Harker 3bcca35591 MDL-27125 better manage file handles when downloading multiple files.
Based on Dongsheng Cai's branch: s11_MDL-27125_curl_file_handler_master
2012-07-04 09:33:12 +12:00
Marina Glancy ec3fe6e123 MDL-33948 file_save_draft_area_files() validates if references are allowed and allows unlimited file size 2012-07-02 17:44:38 +08:00
Martin Dougiamas 386a862f95 MDL-34004 - reinstate the custom HTML icon as separate from other markup icons, because it usually means a "page" to most people that displays in the browser. These icons are temporary (but workable) until Barbara can put in some nice ones that work as a set. The 16px one is from Moodle 2.2 and the others are copies of "unknown". 2012-06-25 23:05:44 +08:00
Barbara Ramiro 5a322c8cfc MDL-33381 Icon label removed for all file types to make it generic 2012-06-21 18:19:33 +08:00
Marina Glancy 83d2700ec9 MDL-33832 Fixed filling of files.source field
- also supress the error on unserialise (because people already may have broken files.source field)
- also display details about unparseable JSON error
- make source field look the same across repositories
2012-06-20 16:09:37 +08:00
Dongsheng Cai d6453211b6 MDL-33513: Make files->source field consistent 2012-06-15 14:51:07 +08:00
Dan Poltawski 4585e6ac98 Merge branch 'wip-MDL-33550-master' of git://github.com/marinaglancy/moodle 2012-06-14 16:23:08 +08:00
Dan Poltawski 414ce30812 Revert MDL-33513
This reverts commit b2cf2b807f.
This reverts commit 24b96f0170.
This reverts commit 39c60294a6.
This reverts commit 8a288971e2.
2012-06-14 13:57:45 +08:00
Dan Poltawski cd925ac79b Merge branch 'dev_MDL-33513_files_source' of git://github.com/danpoltawski/moodle 2012-06-14 11:12:21 +08:00
Marina Glancy 0b2bfbd1c6 MDL-33550 Correctly process situation when file reference source is missing
- do not die with fatal error if source file in moodle internal repository is missing;
- moved code duplication for moodle repositories into class repository (functions send_file, get_reference_details, get_file_by_reference, get_file_reference);
- update file status after repository::sync_external_file so we know that it is missing (or not missing anymore). Do not run this function more than once for file within one request;
- display readable name for Private Files and Server files with the new format;
- display broken icon in filemanager if we know that source is missing, display information (for admin) where it was located before: see repository::get_reference_details() and extending classes;
- removed unnecessary queries in stored_file::sync_external_file();
- syncronize files before displaying it's size in mod_resource, do not query  directly
2012-06-13 12:11:06 +08:00
Marina Glancy ff32444a7c MDL-33590 Correctly determine that file is an archive to enable unzip in filemanager 2012-06-13 08:57:10 +08:00
Dongsheng Cai 8a288971e2 MDL-33513: Make files->source field consistent 2012-06-10 17:47:00 +10:00
Sam Hemelryk 238858e362 MDL-26277: Fixed whitespace post integration 2012-06-06 09:15:18 +12:00
Sam Hemelryk 7df271d9b3 Merge branch 'MDL-27559-master-v2' of https://github.com/mackensen/moodle 2012-06-06 08:51:11 +12:00
Dan Poltawski 9856d05c26 Merge branch 'MDL-33378-tiff-thumb' of git://github.com/mudrd8mz/moodle 2012-05-29 15:00:21 +08:00