mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-07-26 00:31:35 +02:00
Code Issues Projects Releases Wiki Activity

MDL-26887 Refactor file_save_draft_area_files to separate out the file_rewrite_urls_to_pluginfile bit.

Browse Source
This commit is contained in:
Tim Hunt
2011-03-18 12:38:14 +00:00
parent 56babbcb76
commit c08643da97
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/filelib.php
View File

@@ -608,7 +608,7 @@ function file_get_submitted_draft_itemid($elname) {
* @return string if $text was passed in, the rewritten $text is returned. Otherwise NULL. * @return string if $text was passed in, the rewritten $text is returned. Otherwise NULL.
*/ */
function file_save_draft_area_files($draftitemid, $contextid, $component, $filearea, $itemid, array $options=null, $text=null, $forcehttps=false) { function file_save_draft_area_files($draftitemid, $contextid, $component, $filearea, $itemid, array $options=null, $text=null, $forcehttps=false) {
global $CFG, $USER; global $USER;
$usercontext = get_context_instance(CONTEXT_USER, $USER->id); $usercontext = get_context_instance(CONTEXT_USER, $USER->id);
$fs = get_file_storage(); $fs = get_file_storage();
@@ -717,7 +717,24 @@ function file_save_draft_area_files($draftitemid, $contextid, $component, $filea
if (is_null($text)) { if (is_null($text)) {
return null; return null;
} else {
return file_rewrite_urls_to_pluginfile($text, $draftitemid, $forcehttps);
} }
}
/**
* Convert the draft file area URLs in some content to @@PLUGINFILE@@ tokens
* ready to be saved in the database. Normally, this is done automatically by
* {@link file_save_draft_area_files()}.
* @param string $text the content to process.
* @param int $draftitemid the draft file area the content was using.
* @param bool $forcehttps whether the content contains https URLs. Default false.
* @return string the processed content.
*/
function file_rewrite_urls_to_pluginfile($text, $draftitemid, $forcehttps = false) {
global $CFG, $USER;
$usercontext = get_context_instance(CONTEXT_USER, $USER->id);
$wwwroot = $CFG->wwwroot; $wwwroot = $CFG->wwwroot;
if ($forcehttps) { if ($forcehttps) {
@@ -739,7 +756,6 @@ function file_save_draft_area_files($draftitemid, $contextid, $component, $filea
$text = str_ireplace("$wwwroot/draftfile.php?file=/$usercontext->id/user/draft/$draftitemid/", '@@PLUGINFILE@@/', $text); $text = str_ireplace("$wwwroot/draftfile.php?file=/$usercontext->id/user/draft/$draftitemid/", '@@PLUGINFILE@@/', $text);
} }
return $text; return $text;
} }