From 74fdb40bee3d51eebcf4ac55cb82f0310fe0a98e Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 26 Mar 2024 09:03:59 +0800
Subject: [PATCH] MDL-81306 core: Coding style fixes

---
 lib/xsendfilelib.php | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/lib/xsendfilelib.php b/lib/xsendfilelib.php
index 9f1f0ad3a58..0dd6bb052f8 100644
--- a/lib/xsendfilelib.php
+++ b/lib/xsendfilelib.php
@@ -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
@@ -57,18 +56,18 @@ 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;
             }
@@ -76,12 +75,12 @@ function xsendfile($filepath) {
     }
 
     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;
         }