mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
scyrma 2008-07-10 09:55:11 +00:00
parent 83e6cf2f82
commit 5a254a2938
30 changed files with 104 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backup/restorelib.php
View File

@ -3636,6 +3636,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
//finished to know all the oldid, newid equivaleces
function restore_decode_absolute_links($content) {
global $CFG, $restore;
require_once($CFG->libdir.'/filelib.php');
/// MDL-14072: Prevent NULLs, empties and numbers to be processed by the
/// heavy interlinking. Just a few cpu cycles saved.
@ -3649,17 +3650,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
//Now decode wwwroot and file.php calls
$search = array ("$@FILEPHP@$");
//Check for the status of the slasharguments config variable
$slash = $CFG->slasharguments;
//Build the replace string as needed
if ($slash == 1) {
$replace = array ($CFG->wwwroot."/file.php/".$restore->course_id);
} else {
$replace = array ($CFG->wwwroot."/file.php?file=/".$restore->course_id);
}
$replace = array(get_file_url($restore->course_id));
$result = str_replace($search,$replace,$content);
if ($result != $content && debugging()) { //Debug

6
blog/lib.php
View File

@ -309,11 +309,7 @@
include_once($CFG->libdir.'/filelib.php');
$icon = mimeinfo("icon", $file);
$type = mimeinfo("type", $file);
if ($CFG->slasharguments) {
$ffurl = "$CFG->wwwroot/file.php/$filearea/$file";
} else {
$ffurl = "$CFG->wwwroot/file.php?file=/$filearea/$file";
}
$ffurl = get_file_url("$filearea/$file");
$image = "<img src=\"$CFG->pixpath/f/$icon\" class=\"icon\" alt=\"\" />";
if ($return == "html") {

7
blog/rsslib.php
View File

@ -38,11 +38,8 @@
$path .= '/rss.xml';
$rsspix = $CFG->pixpath .'/i/rss.gif';
if ($CFG->slasharguments) {
$path = $CFG->wwwroot.'/rss/file.php/'.$path;
} else {
$path = $CFG->wwwroot.'/rss/file.php?file='.$path;
}
require_once($CFG->libdir.'/filelib.php');
$path = get_file_url($path, null, 'rssfile');
print '<div align="right"><a href="'. $path .'"><img src="'. $rsspix .'" title="'. strip_tags($tooltiptext) .'" alt="'.get_string('rss').'" /></a></div>';
}

4
file.php
View File

@ -1,5 +1,9 @@
<?php // $Id$
// This script fetches files from the dataroot directory
//
// You should use the get_file_url() function, available in lib/filelib.php, to link to file.php.
// This ensures proper formatting and offers useful options.
//
// Syntax: file.php/courseid/dir/dir/dir/filename.ext
// file.php/courseid/dir/dir/dir/filename.ext?forcedownload=1 (download instead of inline)
// file.php/courseid/dir (returns index.html from dir)

7
files/index.php
View File

@ -812,11 +812,8 @@ function displaydir ($wdir) {
print_cell("center", "<input type=\"checkbox\" name=\"file$count\" value=\"$fileurl\" />", 'checkbox');
echo "<td align=\"left\" style=\"white-space:nowrap\" class=\"name\">";
if ($CFG->slasharguments) {
$ffurl = str_replace('//', '/', "/file.php/$id/$fileurl");
} else {
$ffurl = str_replace('//', '/', "/file.php?file=/$id/$fileurl");
}
$ffurl = str_replace('//', '/', get_file_url("$id/$fileurl"));
link_to_popup_window ($ffurl, "display",
"<img src=\"$CFG->pixpath/f/$icon\" class=\"icon\" alt=\"$strfile\" />&nbsp;".htmlspecialchars($file),
480, 640);

8
lib/editor/htmlarea/coursefiles.php
View File

@ -755,17 +755,13 @@ function displaydir ($wdir) {
print_cell("center", "<input type=\"checkbox\" name=\"file$count\" value=\"$fileurl\" onclick=\";return set_rename('$file');\" />");
}
echo "<td align=\"left\" nowrap=\"nowrap\">";
if ($CFG->slasharguments) {
$ffurl = "/file.php/$id$fileurl";
} else {
$ffurl = "/file.php?file=/$id$fileurl";
}
$ffurl = get_file_url($id$fileurl);
link_to_popup_window ($ffurl, "display",
"<img src=\"$CFG->pixpath/f/$icon\" class=\"icon\" alt=\"$strfile\" />",
480, 640);
$file_size = filesize($filename);
echo "<a onclick=\"return set_value(info = {url: '".$CFG->wwwroot.$ffurl."',";
echo "<a onclick=\"return set_value(info = {url: '".$ffurl."',";
echo " isize: '".$file_size."', itype: '".$imgtype."', iwidth: '".$imgwidth."',";
echo " iheight: '".$imgheight."', imodified: '".$filedate."' })\" href=\"#\">$file</a>";
echo "</td>\n";

25
lib/filelib.php
View File

@ -9,20 +9,35 @@ function get_file_url($path, $options=null, $type='coursefile') {
// type of file
switch ($type) {
case 'coursefile':
case 'questionfile':
$url = $CFG->wwwroot."/question/exportfile.php";
break;
case 'rssfile':
$url = $CFG->wwwroot."/rss/file.php";
break;
case 'user':
$url = $CFG->wwwroot."/user/pix.php";
break;
case 'usergroup':
$url = $CFG->wwwroot."/user/pixgroup.php";
break;
case 'httpscoursefile':
$url = $CFG->httpswwwroot."/file.php";
break;
case 'coursefile':
default:
$url = "$CFG->wwwroot/file.php";
$url = $CFG->wwwroot."/file.php";
}
if ($CFG->slasharguments) {
$parts = explode('/', $path);
$parts = array_map('rawurlencode', $parts);
$path = implode('/', $parts);
$ffurl = "$CFG->wwwroot/file.php/$path";
$ffurl = $url.'/'.$path;
$separator = '?';
} else {
$path = rawurlencode("/$path");
$ffurl = "$CFG->wwwroot/file.php?file=$path";
$path = rawurlencode('/'.$path);
$ffurl = $url.'?file='.$path;
$separator = '&amp;';
}

16
lib/questionlib.php
View File

@ -1558,12 +1558,10 @@ function get_question_image($question) {
if (substr(strtolower($question->image), 0, 7) == 'http://') {
$img .= $question->image;
} else if ($CFG->slasharguments) { // Use this method if possible for better caching
$img .= "$CFG->wwwroot/file.php/$coursefilesdir/$question->image";
} else {
$img .= "$CFG->wwwroot/file.php?file=/$coursefilesdir/$question->image";
}
require_once($CFG->libdir .'/filelib.php');
$img = get_file_url("$courseid/{$question->image}");
}
}
return $img;
}
@ -2363,12 +2361,8 @@ function question_url_check($url){
*/
function question_replace_file_links_in_html($html, $fromcourseid, $tocourseid, $url, $destination, &$changed){
global $CFG;
if ($CFG->slasharguments) { // Use this method if possible for better caching
$tourl = "$CFG->wwwroot/file.php/$tocourseid/$destination";
} else {
$tourl = "$CFG->wwwroot/file.php?file=/$tocourseid/$destination";
}
require_once($CFG->libdir .'/filelib.php');
$tourl = get_file_url("$tocourseid/$destination");
$fromurl = question_file_links_base_url($fromcourseid).preg_quote($url, '!');
$searchfor = array('!(<\s*(a|img)\s[^>]*(href|src)\s*=\s*")'.$fromurl.'(")!i',
'!(<\s*(a|img)\s[^>]*(href|src)\s*=\s*\')'.$fromurl.'(\')!i');

8
lib/rsslib.php
View File

@ -29,12 +29,8 @@ function rss_get_link($courseid, $userid, $modulename, $id, $tooltiptext='') {
*/
function rss_get_url($courseid, $userid, $modulename, $id) {
global $CFG;
if ($CFG->slasharguments) {
$rsspath = "$CFG->wwwroot/rss/file.php/$courseid/$userid/$modulename/$id/rss.xml";
} else {
$rsspath = "$CFG->wwwroot/rss/file.php?file=/$courseid/$userid/$modulename/$id/rss.xml";
}
return $rsspath;
require_once($CFG->libdir.'/filelib.php');
return get_file_url($courseid.'/'.$userid.'/'.$modulename.'/'.$id.'/rss.xml', null, 'rssfile');
}
/**

25
lib/weblib.php
View File

@ -4226,11 +4226,8 @@ function print_file_picture($path, $courseid=0, $height='', $width='', $link='',
} else if ($courseid) {
$output .= '<img style="height:'.$height.'px;width:'.$width.'px;" src="';
if ($CFG->slasharguments) { // Use this method if possible for better caching
$output .= $CFG->wwwroot .'/file.php/'. $courseid .'/'. $path;
} else {
$output .= $CFG->wwwroot .'/file.php?file=/'. $courseid .'/'. $path;
}
require_once($CFG->libdir.'/filelib.php');
$output .= get_file_url("$courseid/$path");
$output .= '" />';
} else {
$output .= 'Error: must pass URL or course';
@ -4330,11 +4327,8 @@ function print_user_picture($user, $courseid, $picture=NULL, $size=0, $return=fa
}
if ($picture) { // Print custom user picture
if ($CFG->slasharguments) { // Use this method if possible for better caching
$src = $wwwroot .'/user/pix.php/'. $user->id .'/'. $file .'.jpg';
} else {
$src = $wwwroot .'/user/pix.php?file=/'. $user->id .'/'. $file .'.jpg';
}
require_once($CFG->libdir.'/filelib.php');
$src = get_file_url($user->id.'/'.$file.'.jpg', null, 'user');
} else { // Print default user pictures (use theme version if available)
$class .= " defaultuserpic";
$src = "$CFG->pixpath/u/$file.png";
@ -4536,13 +4530,10 @@ function print_group_picture($group, $courseid, $large=false, $return=false, $li
$size = 35;
}
if ($group->picture) { // Print custom group picture
if ($CFG->slasharguments) { // Use this method if possible for better caching
$output .= '<img class="grouppicture" src="'.$CFG->wwwroot.'/user/pixgroup.php/'.$group->id.'/'.$file.'.jpg"'.
' style="width:'.$size.'px;height:'.$size.'px;" alt="'.s(get_string('group').' '.$group->name).'" title="'.s($group->name).'"/>';
} else {
$output .= '<img class="grouppicture" src="'.$CFG->wwwroot.'/user/pixgroup.php?file=/'.$group->id.'/'.$file.'.jpg"'.
' style="width:'.$size.'px;height:'.$size.'px;" alt="'.s(get_string('group').' '.$group->name).'" title="'.s($group->name).'"/>';
}
require_once($CFG->libdir.'/filelib.php');
$grouppictureurl = get_file_url($group->id.'/'.$file.'.jpg', null, 'usergroup');
$output .= '<img class="grouppicture" src="'.$grouppictureurl.'"'.
' style="width:'.$size.'px;height:'.$size.'px;" alt="'.s(get_string('group').' '.$group->name).'" title="'.s($group->name).'"/>';
}
if ($link or has_capability('moodle/site:accessallgroups', $context)) {
$output .= '</a>';

22
lib/wiki_to_markdown.php
View File

@ -264,24 +264,16 @@ class WikiToMarkdown {
$line = eregi_replace( " ([a-zA-Z]+):([0-9]+)\(([^)]+)\)",
" [\\3](".$CFG->wwwroot."/mod/\\1/view.php?id=\\2) ", $line );
require_once($CFG->libdir.'/filelib.php');
$coursefileurl = get_file_url($this->courseid);
// Replace picture resource link
if ($CFG->slasharguments) {
$line = eregi_replace( "/([a-zA-Z0-9./_-]+)(png|gif|jpg)\(([^)]+)\)",
"![\\3]($CFG->wwwroot/file.php/$this->courseid/\\1\\2)", $line );
} else {
$line = eregi_replace( "/([a-zA-Z0-9./_-]+)(png|gif|jpg)\(([^)]+)\)",
"![\\3]($CFG->wwwroot/file.php?file=/$this->courseid/\\1\\2)", $line );
}
$line = eregi_replace( "/([a-zA-Z0-9./_-]+)(png|gif|jpg)\(([^)]+)\)",
"![\\3](".$coursefileurl."/\\1\\2)", $line );
// Replace file resource link
if ($CFG->slasharguments) {
$line = eregi_replace( "file:/([[:alnum:]/._-]+)\(([^)]+)\)",
"[\\2]($CFG->wwwroot/file.php/$this->courseid/\\1)", $line );
} else {
$line = eregi_replace( "file:/([[:alnum:]/._-]+)\(([^)]+)\)",
"[\\2]($CFG->wwwroot/file.php?file=/$this->courseid/\\1)", $line );
}
$line = eregi_replace( "file:/([[:alnum:]/._-]+)\(([^)]+)\)",
"[\\2](".$coursefileurl."/\\1)", $line );
return $line;
}

8
mod/data/field/file/field.class.php
View File

@ -42,12 +42,8 @@ class data_field_file extends data_field_base {
$src = empty($contents[0]) ? '' : $contents[0];
$name = empty($contents[1]) ? $src : $contents[1];
$displayname = empty($contents[1]) ? '' : $contents[1];
$path = $this->data->course.'/'.$CFG->moddata.'/data/'.$this->data->id.'/'.$this->field->id.'/'.$recordid;
if ($CFG->slasharguments) {
$source = $CFG->wwwroot.'/file.php/'.$path;
} else {
$source = $CFG->wwwroot.'/file.php?file=/'.$path;
}
require_once($CFG->libdir.'/filelib.php');
$source = get_file_url($this->data->course.'/'.$CFG->moddata.'/data/'.$this->data->id.'/'.$this->field->id.'/'.$recordid);
} else {
$src = '';
$name = '';

20
mod/data/field/picture/field.class.php
View File

@ -46,11 +46,8 @@ class data_field_picture extends data_field_file {
$description = $content->content1;
}
$path = $this->data->course.'/'.$CFG->moddata.'/data/'.$this->data->id.'/'.$this->field->id.'/'.$recordid;
if ($CFG->slasharguments) {
$filepath = $CFG->wwwroot.'/file.php/'.$path.'/'.$filename;
} else {
$filepath = $CFG->wwwroot.'/file.php?file=/'.$path.'/'.$filename;
}
require_once($CFG->libdir.'/filelib.php');
$filepath = get_file_url("$path/$filename");
}
$str = '<div title="'.s($this->field->description).'">';
$str .= '<fieldset><legend><span class="accesshide">'.$this->field->name.'</span></legend>';
@ -102,14 +99,11 @@ class data_field_picture extends data_field_file {
$title = empty($contents[1])? '':$contents[1];
$src = $contents[0];
$path = $this->data->course.'/'.$CFG->moddata.'/data/'.$this->data->id.'/'.$this->field->id.'/'.$recordid;
$thumbnaillocation = $CFG->dataroot .'/'.$this->data->course.'/'.$CFG->moddata.'/data/'.$this->data->id.'/'.$this->field->id.'/'.$recordid.'/thumb/'.$src;
if ($CFG->slasharguments) {
$source = $CFG->wwwroot.'/file.php/'.$path.'/'.$src;
$thumbnailsource = file_exists($thumbnaillocation) ? $CFG->wwwroot.'/file.php/'.$path.'/thumb/'.$src : $source;
} else {
$source = $CFG->wwwroot.'/file.php?file=/'.$path.'/'.$src;
$thumbnailsource = file_exists($thumbnaillocation) ? $CFG->wwwroot.'/file.php?file=/'.$path.'/thumb/'.$src : $source;
}
$thumbnaillocation = $CFG->dataroot .'/'. $path .'/thumb/'.$src;
require_once($CFG->libdir.'/filelib.php');
$source = get_file_url("$path/$src");
$thumbnailsource = file_exists($thumbnaillocation) ? get_file_url("$path/thumb/$src") : $source;
if ($template == 'listtemplate') {
$width = $this->field->param4 ? ' width="'.s($this->field->param4).'" ' : ' ';

3
mod/data/preset_class.php
View File

@ -711,7 +711,8 @@ class Data_Preset
print_error('movezipfailed', 'data');
}
$html .= '<a href="' . $CFG->wwwroot . '/file.php/' . $course->id . '/moddata/data/' . $this->data->id . '/preset.zip">'.get_string('download', 'data')."</a>";
require_once($CFG->libdir.'/filelib.php');
$html .= '<a href="'. get_file_url($course->id .'/moddata/data/'. $this->data->id .'/preset.zip') .'">'. get_string('download', 'data') .'</a>';
$html .= '</div>';
return $html;
}

6
mod/forum/lib.php
View File

@ -3716,11 +3716,7 @@ function forum_print_attachments($post, $return=NULL) {
foreach ($files as $file) {
$icon = mimeinfo("icon", $file);
$type = mimeinfo("type", $file);
if ($CFG->slasharguments) {
$ffurl = "$CFG->wwwroot/file.php/$filearea/$file";
} else {
$ffurl = "$CFG->wwwroot/file.php?file=/$filearea/$file";
}
$ffurl = get_file_url("$filearea/$file");
$image = "<img src=\"$CFG->pixpath/f/$icon\" class=\"icon\" alt=\"\" />";
if ($return == "html") {

8
mod/forum/rsslib.php
View File

@ -237,6 +237,8 @@
$formatoptions = new object;
$formatoptions->trusttext = true;
require_once($CFG->libdir.'/filelib.php');
foreach ($recs as $rec) {
unset($item);
unset($user);
@ -257,11 +259,7 @@
$item->attachments = array();
foreach ($post_files as $file) {
$attachment = new stdClass;
if ($CFG->slasharguments) {
$attachment->url = "{$CFG->wwwroot}/file.php/$post_file_area_name/$file";
} else {
$attachment->url = "{$CFG->wwwroot}/file.php?file=/$post_file_area_name/$file";
}
$attachment->url = get_file_url($post_file_area_name.'/'.$file);
$attachment->length = filesize("$CFG->dataroot/$post_file_area_name/$file");
$item->attachments[] = $attachment;
}

6
mod/glossary/lib.php
View File

@ -1222,11 +1222,7 @@ function glossary_print_attachments($entry, $return=NULL, $align="left") {
$strattachment = get_string("attachment", "glossary");
foreach ($files as $file) {
$icon = mimeinfo("icon", $file);
if ($CFG->slasharguments) {
$ffurl = "$CFG->wwwroot/file.php/$filearea/$file";
} else {
$ffurl = "$CFG->wwwroot/file.php?file=/$filearea/$file";
}
$ffurl = get_file_url("$filearea/$file");
$image = "<img src=\"$CFG->pixpath/f/$icon\" class=\"icon\" alt=\"\" />";
if ($return == "html") {

7
mod/hotpot/lib.php
View File

@ -1803,11 +1803,8 @@ class hotpot_xml_quiz extends hotpot_xml_tree {
// set the url base (first time only)
if (!isset($this->baseurl)) {
global $CFG;
if ($CFG->slasharguments) {
$this->baseurl = "$CFG->wwwroot/file.php/$this->filedir/";
} else {
$this->baseurl = "$CFG->wwwroot/file.php?file=/$this->filedir/";
}
require_once($CFG->libdir.'/filelib.php');
$this->baseurl = get_file_url($this->filedir .'/');
}
return $this->baseurl;
}

7
mod/lesson/importppt.php
View File

@ -195,11 +195,8 @@ function extract_data($pages, $courseid, $lessonname, $modname) {
$imagedir = $CFG->dataroot.'/'.$courseid.'/moddata/'.$modname;
if ($CFG->slasharguments) {
$imagelink = $CFG->wwwroot.'/file.php/'.$courseid.'/moddata/'.$modname;
} else {
$imagelink = $CFG->wwwroot.'/file.php?file=/'.$courseid.'/moddata/'.$modname;
}
require_once($CFG->libdir .'/filelib.php');
$imagelink = get_file_url($courseid.'/moddata/'.$modname);
// try to make a unique subfolder to store the images
$lessonname = str_replace(' ', '_', $lessonname); // get rid of spaces

8
mod/lesson/mediafile.php
View File

@ -57,13 +57,7 @@
if (is_url($lesson->mediafile)) {
$fullurl = $lesson->mediafile;
} else {
// get the full url to the file while taking into consideration $CFG->slasharguments
if ($CFG->slasharguments) {
$relativeurl = "/file.php/{$course->id}/{$lesson->mediafile}";
} else {
$relativeurl = "/file.php?file=/{$course->id}/{$lesson->mediafile}";
}
$fullurl = "$CFG->wwwroot$relativeurl";
$fullurl = get_file_url($course->id .'/'. $lesson->mediafile);
}
// find the correct type and print it out

18
mod/resource/type/file/resource.class.php
View File

@ -262,8 +262,8 @@ class resource_file extends resource_base {
$isteamspeak = (stripos($resource->reference, 'teamspeak://') === 0);
/// Form the parse string
$querys = array();
if (!empty($resource->alltext)) {
$querys = array();
$parray = explode(',', $resource->alltext);
foreach ($parray as $fieldstring) {
$field = explode('=', $fieldstring);
@ -307,22 +307,10 @@ class resource_file extends resource_base {
} else { // Normal uploaded file
$forcedownloadsep = '?';
if ($CFG->slasharguments) {
$relativeurl = "/file.php/{$course->id}/{$resource->reference}";
if ($querystring) {
$relativeurl .= '?'.$querystring;
$forcedownloadsep = '&amp';
}
} else {
$relativeurl = "/file.php?file=/{$course->id}/{$resource->reference}";
if ($querystring) {
$relativeurl .= '&amp;'.$querystring;
}
}
$fullurl = "$CFG->wwwroot$relativeurl";
if ($resource->options == 'forcedownload') {
$fullurl .= $forcedownloadsep . 'forcedownload=1';
$querys[] = 'forcedownload=1';
}
$fullurl = get_file_url($course->id.'/'.$resource->reference, $querys);
}
/// Print a notice and redirect if we are trying to access a file on a local file system

7
mod/resource/type/ims/resource.class.php
View File

@ -508,11 +508,8 @@ class resource_ims extends resource_base {
/// Calculate the file.php correct url
if (!$this->isrepository) {
if ($CFG->slasharguments) {
$fileurl = "{$CFG->wwwroot}/file.php/{$course->id}/{$CFG->moddata}/resource/{$resource->id}";
} else {
$fileurl = "{$CFG->wwwroot}/file.php?file=/{$course->id}/{$CFG->moddata}/resource/{$resource->id}";
}
require_once($CFG->libdir.'/filelib.php');
$fileurl = get_file_url($course->id.'/'.$CFG->moddata.'/resource/'.$resource->id);
}
else {
$fileurl = $CFG->repositorywebroot . $resource->reference;

7
mod/scorm/loadSCO.php
View File

@ -108,11 +108,8 @@
} else {
$basedir = $CFG->moddata.'/scorm/'.$scorm->id;
}
if ($CFG->slasharguments) {
$result = $CFG->wwwroot.'/file.php/'.$scorm->course.'/'.$basedir.'/'.$launcher;
} else {
$result = $CFG->wwwroot.'/file.php?file=/'.$scorm->course.'/'.$basedir.'/'.$launcher;
}
require_once($CFG->libdir.'/filelib.php');
$result = get_file_url($scorm->course .'/'. $basedir .'/'. $launcher);
}
}
?>

7
question/export.php
View File

@ -116,12 +116,7 @@
echo '<p><div class="boxaligncenter"><font size="-1">' .
get_string('downloadextra', 'quiz') . '</font></div></p>';
} else {
if ($CFG->slasharguments) {
$efile = $CFG->wwwroot . '/question/exportfile.php/' . rawurlencode($filename);
} else {
$efile = $CFG->wwwroot . '/question/exportfile.php/?file=' . rawurlencode($filename);
}
$efile = get_file_url($filename, null, 'questionfile');
echo '<p><div class="boxaligncenter">' .
get_string('yourfileshoulddownload', 'question', $efile) . '</a></div></p>';
echo '

7
question/format/hotpot/format.php
View File

@ -43,11 +43,8 @@ class qformat_hotpot extends qformat_default {
// shouldn't happen !!
$courseid = 0;
}
if ($CFG->slasharguments) {
$baseurl = "$CFG->wwwroot/file.php/$courseid/";
} else {
$baseurl = "$CFG->wwwroot/file.php?file=/$courseid/";
}
require_once($CFG->libdir.'/filelib.php');
$baseurl = get_file_url($courseid).'/';
// get import file name
global $params;

12
question/format/qti2/format.php
View File

@ -405,6 +405,7 @@ function handle_questions_media(&$questions, $path, $courseid) {
function quiz_export_prepare_questions($questions, $quizid, $courseid, $shuffleanswers = null) {
global $CFG;
// add the answers to the questions and format the image property
require_once($CFG->libdir.'/filelib.php');
foreach ($questions as $key=>$question) {
$questions[$key] = get_question_data($question);
$questions[$key]->courseid = $courseid;
@ -420,11 +421,7 @@ function handle_questions_media(&$questions, $path, $courseid) {
if ($localfile) {
// create the http url that the player will need to access the file
if ($CFG->slasharguments) { // Use this method if possible for better caching
$questions[$key]->mediaurl = "$CFG->wwwroot/file.php/$question->image";
} else {
$questions[$key]->mediaurl = "$CFG->wwwroot/file.php?file=$question->image";
}
$questions[$key]->mediaurl = get_file_url($question->image);
} else {
$questions[$key]->mediaurl = $question->image;
}
@ -908,10 +905,9 @@ function xml_entitize(&$collection) {
global $CFG;
if (substr(strtolower($file), 0, 7) == 'http://') {
$url = $file;
} else if ($CFG->slasharguments) { // Use this method if possible for better caching
$url = "{$CFG->wwwroot}/file.php/$courseid/{$file}";
} else {
$url = "{$CFG->wwwroot}/file.php?file=/$courseid/{$file}";
require_once($CFG->libdir.'/filelib.php');
$url = get_file_url("$courseid/$file");
}
return $url;
}

5
question/format/qti2/qt_common.php
View File

@ -102,10 +102,9 @@ function get_media_tag($file, $courseid = 0, $alt = 'media file', $width = 0, $h
// if it's a moodle library file, it will be served through file.php
if (substr(strtolower($file), 0, 7) == 'http://') {
$media = $file;
} else if ($CFG->slasharguments) { // Use this method if possible for better caching
$media = "{$CFG->wwwroot}/file.php/$courseid/$file";
} else {
$media = "{$CFG->wwwroot}/file.php?file=/$courseid/$file";
require_once($CFG->libdir.'/filelib.php');
$media = get_file_url("$courseid/$file");
}
$ismultimedia = false;

14
theme/standardlogo/header.html
View File

@ -23,17 +23,11 @@
} else if (file_exists($CFG->dirroot.'/logo.gif')) {
$standardlogo = $CFG->httpswwwroot.'/logo.gif';
} else if (file_exists($CFG->dataroot.'/1/logo.jpg')) {
if (empty($CFG->slasharguments)) {
$standardlogo = $CFG->httpswwwroot.'/file.php?file=/1/logo.jpg';
} else {
$standardlogo = $CFG->httpswwwroot.'/file.php/1/logo.jpg';
}
require_once($CFG->libdir.'/filelib.php');
$standardlogo = get_file_url('1/logo.jpg', null, 'httpscoursefile');
} else if (file_exists($CFG->dataroot.'/1/logo.gif')) {
if (empty($CFG->slasharguments)) {
$standardlogo = $CFG->httpswwwroot.'/file.php?file=/1/logo.gif';
} else {
$standardlogo = $CFG->httpswwwroot.'/file.php/1/logo.gif';
}
require_once($CFG->libdir.'/filelib.php');
$standardlogo = get_file_url('1/logo.gif', null, 'httpscoursefile');
} else {
$standardlogo = $CFG->httpsthemewww .'/'. current_theme().'/logo.gif';
}

11
userpix/index.php
View File

@ -25,13 +25,10 @@
$fullname = fullname($user);
echo "<a href=\"$CFG->wwwroot/user/view.php?id=$user->id&amp;course=1\" ".
"title=\"$fullname\">";
if ($CFG->slasharguments) { // Use this method if possible for better caching
echo '<img src="'. $CFG->wwwroot .'/user/pix.php/'.$user->id.'/f1.jpg"'.
' style="border:0px; width:100px; height:100px" alt="'.$fullname.'" />';
} else {
echo '<img src="'. $CFG->wwwroot .'/user/pix.php?file=/'. $user->id .'/f1.jpg"'.
' style="border:0px; width:100px; height:100px" alt="'.$fullname.'" />';
}
require_once($CFG->libdir.'/filelib.php');
$userpictureurl = get_file_url($user->id.'/f1.jpg', null, 'user');
echo '<img src="'. $userpictureurl .'"'.
' style="border:0px; width:100px; height:100px" alt="'.$fullname.'" />';
echo "</a> \n";
}

11
userpix/upgrade.php
View File

@ -22,13 +22,10 @@
$fullname = fullname($user);
echo "<a href=\"$CFG->wwwroot/user/view.php?id=$user->id&amp;course=1\"".
"title=\"$fullname\">";
if ($CFG->slasharguments) { // Use this method if possible for better caching
echo '<img src="'. $CFG->wwwroot .'/user/pix.php/'.$user->id.'/f1.jpg"'.
' style="border:0px; width:100px; height:100px" alt="'.$fullname.'" />';
} else {
echo '<img src="'. $CFG->wwwroot .'/user/pix.php?file=/'. $user->id .'/f1.jpg"'.
' style="border:0px; width:100px; height:100px" alt="'.$fullname.'" />';
}
require_once($CFG->libdir.'/filelib.php');
$userpictureurl = get_file_url($user->id.'/f1.jpg', null, 'user');
echo '<img src="'. $userpictureurl .'"'.
' style="border:0px; width:100px; height:100px" alt="'.$fullname.'" />';
echo "</a> \n";
}