L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-31071 core: replace deprecated file_encode_url

Browse Source 
Signed-off-by: Daniel Ziegenberg <[email protected]>
This commit is contained in:
Daniel Ziegenberg
2025-07-25 12:03:43 +02:00
parent 66fe5efdc3
commit 6e298809e3
14 changed files with 202 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/lib/filebrowser/file_info_context_course.php
+7 -1
View File
@@ -25,6 +25,8 @@
defined('MOODLE_INTERNAL') || die();
use core\url;
/**
* Represents a course context in the tree navigated by {@link file_browser}.
*
@@ -646,7 +648,11 @@ class file_info_area_course_legacy extends file_info_stored {
$path = '/'.$courseid.$filepath.$filename;
return file_encode_url($this->urlbase, $path, $forcedownload, $https);
$url = url::make_file_url($this->urlbase, $path, $forcedownload);
if ($https) {
$url->set_scheme('https');
}
return $url->out();
}
/**
public/lib/filebrowser/file_info_stored.php
+7 -1
View File
@@ -25,6 +25,8 @@
defined('MOODLE_INTERNAL') || die();
use core\url;
/**
* Represents an actual file or folder - a row in the file table in the tree navigated by {@link file_browser}.
*
@@ -182,7 +184,11 @@ class file_info_stored extends file_info {
} else {
$path = '/'.$contextid.'/'.$component.'/'.$filearea.$filepath.$filename;
}
return file_encode_url($this->urlbase, $path, $forcedownload, $https);
$url = url::make_file_url($this->urlbase, $path, $forcedownload);
if ($https) {
$url->set_scheme('https');
}
return $url->out();
}
/**
public/mod/data/field/picture/field.class.php
+12 -3
View File
@@ -14,6 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
use core\output\html_writer;
use core\url;
/**
* Class picture field for database activity
*
@@ -21,7 +24,6 @@
* @copyright 2005 Martin Dougiamas
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class data_field_picture extends data_field_base {
var $type = 'picture';
var $previewwidth = 50;
@@ -98,8 +100,15 @@ class data_field_picture extends data_field_base {
}
$str .= '<noscript>';
if ($file) {
$src = file_encode_url($CFG->wwwroot.'/pluginfile.php/', $this->context->id.'/mod_data/content/'.$content->id.'/'.$file->get_filename());
$str .= '<img width="'.s($this->previewwidth).'" height="'.s($this->previewheight).'" src="'.$src.'" alt="" />';
$src = url::make_pluginfile_url(
contextid: $this->context->id,
component: 'mod_data',
area: 'content',
itemid: $content->id,
pathname: '/',
filename: $file->get_filename()
);
$str .= html_writer::img($src->out(), '', ['width' => $this->previewwidth, 'height' => $this->previewheight]);
}
$str .= '</noscript>';
public/mod/folder/lib.php
+12 -2
View File
@@ -25,6 +25,8 @@
defined('MOODLE_INTERNAL') || die();
use core\url;
/** Display folder contents on a separate page */
define('FOLDER_DISPLAY_PAGE', 0);
/** Display folder contents inline in a course */
@@ -319,12 +321,20 @@ function folder_export_contents($cm, $baseurl) {
$files = $fs->get_area_files($context->id, 'mod_folder', 'content', 0, 'sortorder DESC, id ASC', false);
foreach ($files as $fileinfo) {
$file = array();
$file = [];
$file['type'] = 'file';
$file['filename'] = $fileinfo->get_filename();
$file['filepath'] = $fileinfo->get_filepath();
$file['filesize'] = $fileinfo->get_filesize();
$file['fileurl'] = file_encode_url("$CFG->wwwroot/" . $baseurl, '/'.$context->id.'/mod_folder/content/'.$folder->revision.$fileinfo->get_filepath().$fileinfo->get_filename(), true);
$file['fileurl'] = url::make_webservice_pluginfile_url(
contextid: $context->id,
component: 'mod_folder',
area: 'content',
itemid: $folder->revision,
pathname: $fileinfo->get_filepath(),
filename: $fileinfo->get_filename(),
forcedownload: true
)->out();
$file['timecreated'] = $fileinfo->get_timecreated();
$file['timemodified'] = $fileinfo->get_timemodified();
$file['sortorder'] = $fileinfo->get_sortorder();
public/mod/forum/lib.php
+9 -1
View File
@@ -20,6 +20,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
use core\url;
use mod_forum\local\entities\forum as forum_entity;
defined('MOODLE_INTERNAL') || die();
@@ -2580,7 +2581,14 @@ function forum_print_attachments($post, $cm, $type) {
'style' => 'max-width: 24px; max-height: 24px; vertical-align: middle;',
]
);
$path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$context->id.'/mod_forum/attachment/'.$post->id.'/'.$filename);
$path = url::make_pluginfile_url(
contextid: $context->id,
component: 'mod_forum',
area: 'attachment',
itemid: $post->id,
pathname: '/',
filename: $filename
)->out();
if ($type == 'html') {
$output .= "<a href=\"$path\">$iconimage</a> ";
public/mod/glossary/lib.php
+11 -1
View File
@@ -23,6 +23,9 @@
* @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
use core\url;
require_once($CFG->libdir . '/completionlib.php');
define("GLOSSARY_SHOW_ALL_CATEGORIES", 0);
@@ -1590,7 +1593,14 @@ function glossary_print_attachments($entry, $cm, $type=NULL, $unused = null) {
$filename = $file->get_filename();
$mimetype = $file->get_mimetype();
$iconimage = $OUTPUT->pix_icon(file_file_icon($file), get_mimetype_description($file), 'moodle', array('class' => 'icon'));
$path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$context->id.'/mod_glossary/attachment/'.$entry->id.'/'.$filename);
$path = url::make_pluginfile_url(
contextid: $context->id,
component: 'mod_glossary',
area: 'attachment',
itemid: $entry->id,
pathname: '/',
filename: $filename
)->out();
if ($type == 'html') {
$output .= "<a href=\"$path\">$iconimage</a> ";
public/mod/glossary/tests/behat/glossary_display_formats.feature
+2
View File
@@ -61,6 +61,8 @@ Feature: Glossary can be set to various display formats
# Confirm that glossary format is full without author style.
# In this format, the image link should exist and author's name should not be visible.
Then "gd-logo.png" "link" should exist
And following "gd-logo.png" should download a file that:
| has mimetype | image/png |
And I should not see "by Admin User"
And ".fullwithoutauthor" "css_element" should exist
public/mod/imscp/locallib.php
+10 -3
View File
@@ -24,6 +24,8 @@
defined('MOODLE_INTERNAL') || die();
use core\url;
require_once("$CFG->dirroot/mod/imscp/lib.php");
require_once("$CFG->libdir/filelib.php");
require_once("$CFG->libdir/resourcelib.php");
@@ -68,9 +70,14 @@ function imscp_htmllize_item($item, $imscp, $cm) {
$url = $item['href'];
} else {
$context = context_module::instance($cm->id);
$urlbase = "$CFG->wwwroot/pluginfile.php";
$path = '/'.$context->id.'/mod_imscp/content/'.$imscp->revision.'/'.$item['href'];
$url = file_encode_url($urlbase, $path, false);
$url = url::make_pluginfile_url(
contextid: $context->id,
component: 'mod_imscp',
area: 'content',
itemid: $imscp->revision,
pathname: '/',
filename: $item['href']
)->out();
}
$result = "<li><a href=\"$url\">".$item['title'].'</a>';
} else {
public/mod/page/lib.php
+22 -4
View File
@@ -23,6 +23,8 @@
defined('MOODLE_INTERNAL') || die;
use core\url;
/**
* List of features supported in Page module
* @param string $feature FEATURE_xx constant for requested feature
@@ -409,12 +411,20 @@ function page_export_contents($cm, $baseurl) {
$fs = get_file_storage();
$files = $fs->get_area_files($context->id, 'mod_page', 'content', 0, 'sortorder DESC, id ASC', false);
foreach ($files as $fileinfo) {
$file = array();
$file = [];
$file['type'] = 'file';
$file['filename'] = $fileinfo->get_filename();
$file['filepath'] = $fileinfo->get_filepath();
$file['filesize'] = $fileinfo->get_filesize();
$file['fileurl'] = file_encode_url("$CFG->wwwroot/" . $baseurl, '/'.$context->id.'/mod_page/content/'.$page->revision.$fileinfo->get_filepath().$fileinfo->get_filename(), true);
$file['fileurl'] = url::make_webservice_pluginfile_url(
contextid: $context->id,
component: 'mod_page',
area: 'content',
itemid: $page->revision,
pathname: $fileinfo->get_filepath(),
filename: $fileinfo->get_filename(),
forcedownload: true
)->out();
$file['timecreated'] = $fileinfo->get_timecreated();
$file['timemodified'] = $fileinfo->get_timemodified();
$file['sortorder'] = $fileinfo->get_sortorder();
@@ -431,12 +441,20 @@ function page_export_contents($cm, $baseurl) {
// page html conent
$filename = 'index.html';
$pagefile = array();
$pagefile = [];
$pagefile['type'] = 'file';
$pagefile['filename'] = $filename;
$pagefile['filepath'] = '/';
$pagefile['filesize'] = 0;
$pagefile['fileurl'] = file_encode_url("$CFG->wwwroot/" . $baseurl, '/'.$context->id.'/mod_page/content/' . $filename, true);
$pagefile['fileurl'] = url::make_webservice_pluginfile_url(
contextid: $context->id,
component: 'mod_page',
area: 'content',
itemid: null,
pathname: '/',
filename: $filename,
forcedownload: true
)->out();
$pagefile['timecreated'] = null;
$pagefile['timemodified'] = $page->timemodified;
// make this file as main file
public/mod/resource/lib.php
+12 -2
View File
@@ -23,6 +23,8 @@
defined('MOODLE_INTERNAL') || die;
use core\url;
/**
* List of features supported in Resource module
* @param string $feature FEATURE_xx constant for requested feature
@@ -447,12 +449,20 @@ function resource_export_contents($cm, $baseurl) {
$files = $fs->get_area_files($context->id, 'mod_resource', 'content', 0, 'sortorder DESC, id ASC', false);
foreach ($files as $fileinfo) {
$file = array();
$file = [];
$file['type'] = 'file';
$file['filename'] = $fileinfo->get_filename();
$file['filepath'] = $fileinfo->get_filepath();
$file['filesize'] = $fileinfo->get_filesize();
$file['fileurl'] = file_encode_url("$CFG->wwwroot/" . $baseurl, '/'.$context->id.'/mod_resource/content/'.$resource->revision.$fileinfo->get_filepath().$fileinfo->get_filename(), true);
$file['fileurl'] = url::make_webservice_pluginfile_url(
contextid: $context->id,
component: 'mod_resource',
area: 'content',
itemid: $resource->revision,
pathname: $fileinfo->get_filepath(),
filename: $fileinfo->get_filename(),
forcedownload: true
)->out();
$file['timecreated'] = $fileinfo->get_timecreated();
$file['timemodified'] = $fileinfo->get_timemodified();
$file['sortorder'] = $fileinfo->get_sortorder();
public/mod/resource/locallib.php
+35 -8
View File
@@ -25,6 +25,8 @@
defined('MOODLE_INTERNAL') || die;
use core\url;
require_once("$CFG->libdir/filelib.php");
require_once("$CFG->libdir/resourcelib.php");
require_once("$CFG->dirroot/mod/resource/lib.php");
@@ -133,8 +135,14 @@ function resource_display_frame($resource, $cm, $course, $file) {
} else {
$config = get_config('resource');
$context = context_module::instance($cm->id);
$path = '/'.$context->id.'/mod_resource/content/'.$resource->revision.$file->get_filepath().$file->get_filename();
$fileurl = file_encode_url($CFG->wwwroot.'/pluginfile.php', $path, false);
$fileurl = url::make_pluginfile_url(
contextid: $context->id,
component: 'mod_resource',
area: 'content',
itemid: $resource->revision,
pathname: $file->get_filepath(),
filename: $file->get_filename()
)->out();
$navurl = "$CFG->wwwroot/mod/resource/view.php?id=$cm->id&amp;frameset=top";
$title = strip_tags(format_string($course->shortname.': '.$resource->name));
$framesize = $config->framesize;
@@ -169,8 +177,14 @@ function resource_get_clicktoopen($file, $revision, $extra='') {
global $CFG;
$filename = $file->get_filename();
$path = '/'.$file->get_contextid().'/mod_resource/content/'.$revision.$file->get_filepath().$file->get_filename();
$fullurl = file_encode_url($CFG->wwwroot.'/pluginfile.php', $path, false);
$fullurl = url::make_pluginfile_url(
contextid: $file->get_contextid(),
component: 'mod_resource',
area: 'content',
itemid: $revision,
pathname: $file->get_filepath(),
filename: $filename
)->out();
$string = get_string('clicktoopen2', 'resource', "<a href=\"$fullurl\" $extra>$filename</a>");
@@ -184,8 +198,15 @@ function resource_get_clicktodownload($file, $revision) {
global $CFG;
$filename = $file->get_filename();
$path = '/'.$file->get_contextid().'/mod_resource/content/'.$revision.$file->get_filepath().$file->get_filename();
$fullurl = file_encode_url($CFG->wwwroot.'/pluginfile.php', $path, true);
$fullurl = url::make_pluginfile_url(
$file->get_contextid(),
'mod_resource',
'content',
$revision,
$file->get_filepath(),
$filename,
true
)->out();
$string = get_string('clicktodownload', 'resource', "<a href=\"$fullurl\">$filename</a>");
@@ -212,8 +233,14 @@ function resource_print_workaround($resource, $cm, $course, $file) {
echo '<div class="resourceworkaround">';
switch (resource_get_final_display_type($resource)) {
case RESOURCELIB_DISPLAY_POPUP:
$path = '/'.$file->get_contextid().'/mod_resource/content/'.$resource->revision.$file->get_filepath().$file->get_filename();
$fullurl = file_encode_url($CFG->wwwroot.'/pluginfile.php', $path, false);
$fullurl = url::make_pluginfile_url(
contextid: $file->get_contextid(),
component: 'mod_resource',
area: 'content',
itemid: $resource->revision,
pathname: $file->get_filepath(),
filename: $file->get_filename()
)->out();
$options = empty($resource->displayoptions) ? [] : (array) unserialize_array($resource->displayoptions);
$width = empty($options['popupwidth']) ? 620 : $options['popupwidth'];
$height = empty($options['popupheight']) ? 450 : $options['popupheight'];
public/mod/wiki/editors/wikifiletable.php
+36 -8
View File
@@ -26,6 +26,8 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
use core\url;
require_once('HTML/QuickForm/element.php');
require_once($CFG->dirroot.'/lib/filelib.php');
@@ -117,22 +119,48 @@ class MoodleQuickForm_wikifiletable extends HTML_QuickForm_element {
}
$checkbox .= " />";
//actions
// Get Actions.
$icon = file_file_icon($file);
$file_url = file_encode_url($CFG->wwwroot.'/pluginfile.php', "/{$this->_contextid}/mod_wiki/attachments/{$this->_fileareaitemid}/".$file->get_filename());
$filename = $file->get_filename();
$fileurl = url::make_pluginfile_url(
contextid: $this->_contextid,
component: 'mod_wiki',
area: 'attachments',
itemid: $this->_fileareaitemid,
pathname: '/',
filename: $filename
)->out();
$action_icons = "";
if(!empty($tags['attach'])) {
$action_icons .= "<a href=\"javascript:void(0)\" class=\"wiki-attachment-attach\" ".$this->printInsertTags($tags['attach'], $file->get_filename())." title=\"".get_string('attachmentattach', 'wiki')."\">".$OUTPUT->pix_icon($icon, "Attach")."</a>"; //TODO: localize
$actionicons = "";
if (!empty($tags['attach'])) {
$actionicons .= '<a href="javascript:void(0)" class="wiki-attachment-attach" ';
$actionicons .= $this->printInsertTags($tags['attach'], $filename);
$actionicons .= ' title="';
$actionicons .= get_string('attachmentattach', 'wiki');
$actionicons .= '">';
$actionicons .= $OUTPUT->pix_icon($icon, "Attach");
$actionicons .= '</a>';
}
$action_icons .= "&nbsp;&nbsp;<a href=\"javascript:void(0)\" class=\"wiki-attachment-link\" ".$this->printInsertTags($tags['link'], $file_url)." title=\"".get_string('attachmentlink', 'wiki')."\">".$OUTPUT->pix_icon($icon, "Link")."</a>";
$actionicons .= '&nbsp;&nbsp;<a href="javascript:void(0)" class="wiki-attachment-link" ';
$actionicons .= $this->printInsertTags($tags['link'], $fileurl);
$actionicons .= ' title="';
$actionicons .= get_string('attachmentlink', 'wiki');
$actionicons .= '">';
$actionicons .= $OUTPUT->pix_icon($icon, 'Link');
$actionicons .= '</a>';
if (file_mimetype_in_typegroup($file->get_mimetype(), 'web_image')) {
$action_icons .= "&nbsp;&nbsp;<a href=\"javascript:void(0)\" class=\"wiki-attachment-image\" ".$this->printInsertTags($tags['image'], $file->get_filename())." title=\"".get_string('attachmentimage', 'wiki')."\">".$OUTPUT->pix_icon($icon, "Image")."</a>"; //TODO: localize
$actionicons .= '&nbsp;&nbsp;<a href="javascript:void(0)" class="wiki-attachment-image" ';
$actionicons .= $this->printInsertTags($tags['image'], $filename);
$actionicons .= 'title="';
$actionicons .= get_string('attachmentimage', 'wiki');
$actionicons .= '">';
$actionicons .= $OUTPUT->pix_icon($icon, 'Image');
$actionicons .= '</a>';
}
$htmltable->data[] = array($checkbox, '<a href="'.$file_url.'">'.$file->get_filename().'</a>', $action_icons);
$htmltable->data[] = [$checkbox, '<a href="' . $fileurl . '">' . $filename . '</a>', $actionicons];
}
}
public/mod/wiki/locallib.php
+11 -1
View File
@@ -34,6 +34,8 @@
defined('MOODLE_INTERNAL') || die();
use core\url;
require_once($CFG->dirroot . '/mod/wiki/lib.php');
require_once($CFG->dirroot . '/mod/wiki/parser/parser.php');
require_once($CFG->libdir . '/filelib.php');
@@ -1487,7 +1489,15 @@ function wiki_print_upload_table($context, $filearea, $fileitemid, $deleteupload
$checkbox .= " />";
$htmltable->data[] = array($checkbox, '<a href="' . file_encode_url($CFG->wwwroot . '/pluginfile.php', '/' . $context->id . '/wiki_upload/' . $fileitemid . '/' . $file->get_filename()) . '">' . $file->get_filename() . '</a>', "");
$url = url::make_pluginfile_url(
contextid: $context->id,
component: 'wiki_upload',
area: '',
itemid: $fileitemid,
pathname: '/',
filename: $file->get_filename()
);
$htmltable->data[] = [$checkbox, '<a href="' . $url->out() . '">' . $file->get_filename() . '</a>', ""];
}
}
public/mod/wiki/renderer.php
+16 -2
View File
@@ -23,6 +23,10 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
use core\output\html_writer;
use core\output\plugin_renderer_base;
use core\url;
defined('MOODLE_INTERNAL') || die();
class mod_wiki_renderer extends plugin_renderer_base {
@@ -526,10 +530,20 @@ class mod_wiki_renderer extends plugin_renderer_base {
$result .= '<li yuiConfig=\''.json_encode($yuiconfig).'\'><div>'.$image.' '.s($subdir['dirname']).'</div> '.$this->htmllize_tree($tree, $subdir).'</li>';
}
foreach ($dir['files'] as $file) {
$url = file_encode_url("$CFG->wwwroot/pluginfile.php", '/'.$tree->context->id.'/mod_wiki/attachments/' . $tree->subwiki->id . '/'. $file->get_filepath() . $file->get_filename(), true);
$filename = $file->get_filename();
$url = url::make_pluginfile_url(
contextid: $tree->context->id,
component: 'mod_wiki',
area: 'attachments',
itemid: $tree->subwiki->id,
pathname: $file->get_filepath(),
filename: $filename,
forcedownload: true
);
$image = $this->output->pix_icon(file_file_icon($file), $filename, 'moodle', array('class'=>'icon'));
$result .= '<li yuiConfig=\''.json_encode($yuiconfig).'\'><div>'.$image.' '.html_writer::link($url, $filename).'</div></li>';
$result .= '<li yuiConfig=\'' . json_encode($yuiconfig) . '\'>';
$result .= '<div>' . $image . ' ' . html_writer::link($url->out(), $filename) . '</div>';
$result .= '</li>';
}
$result .= '</ul>';