Skip to content

Commit

Permalink
MDL-81306 core: Coding style fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewnicols committed Mar 28, 2024
1 parent cbfa810 commit 74fdb40
Showing 1 changed file with 13 additions and 14 deletions.
27 changes: 13 additions & 14 deletions lib/xsendfilelib.php
Expand Up @@ -17,17 +17,16 @@
/**
* X-Sendfile support
*
* @package core_files
* @package core
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

//NOTE: do not verify MOODLE_INTERNAL here, this is used from themes too

/**
* Serve file using X-Sendfile header, this needs special server module
* or configuration. Please make sure that all headers are already sent
* and the all access control checks passed.
* Serve files using the X-Sendfile header.
*
* This needs special server module or configuration.
* Please make sure that all headers are already sent and the all access control checks passed.
*
* @param string $filepath
* @return bool success
Expand Down Expand Up @@ -57,31 +56,31 @@ function xsendfile($filepath) {
}

$aliased = false;
if (!empty($CFG->xsendfilealiases) and is_array($CFG->xsendfilealiases)) {
foreach ($CFG->xsendfilealiases as $alias=>$dir) {
if (!empty($CFG->xsendfilealiases) && is_array($CFG->xsendfilealiases)) {
foreach ($CFG->xsendfilealiases as $alias => $dir) {
$dir = realpath($dir);
if ($dir === false) {
continue;
}
if (substr($dir, -1) !== DIRECTORY_SEPARATOR) {
// add trailing dir separator
// Add trailing dir separator.
$dir .= DIRECTORY_SEPARATOR;
}
if (strpos($filepath, $dir) === 0) {
$filepath = $alias.substr($filepath, strlen($dir));
if (str_starts_with($filepath, $dir)) {
$filepath = $alias . substr($filepath, strlen($dir));
$aliased = true;
break;
}
}
}

if ($CFG->xsendfile === 'X-LIGHTTPD-send-file') {
// http://redmine.lighttpd.net/projects/lighttpd/wiki/X-LIGHTTPD-send-file says 1.4 it does not support byteserving
// Version 1.4.40 and earlier do not support byte serving.
// See http://redmine.lighttpd.net/projects/lighttpd/wiki/X-LIGHTTPD-send-file for more information.
header('Accept-Ranges: none');

} else if ($CFG->xsendfile === 'X-Accel-Redirect') {
// http://wiki.nginx.org/XSendfile
// Nginx requires paths relative to aliases, you need to specify them in config.php
// See http://wiki.nginx.org/XSendfile for more information.
if (!$aliased) {
return false;
}
Expand Down

0 comments on commit 74fdb40

Please sign in to comment.