Internal: Fix support for X-Sendfile headers - refs #5673

Author: ywarnier

documentation/installation_guide.html

@@ -674,7 +674,23 @@ <h2><a id="14._Improving_files_download"></a>12. Improving files download effici
 <pre>
 $_configuration['enable_x_sendfile_headers'] = true;
 </pre>
-If you have issues with files taking a long time to download, make sure you reconfigure your webserver and add this line. You should see a notable difference in download time.
+If you have issues with files taking a long time to download, make sure you reconfigure your webserver and add this line. You should see a notable difference in download time.<br>
+
+Your webserver must be configured to support X-Sendfile, both by enabling the module and setting options in your web server's configuration.<br>
+If you are running Apache 2.4 on Ubuntu, for example, this would mean installing and enabling the module:
+<pre>
+    sudo apt install libapache2-mod-xsendfile
+    sudo a2enmod xsendfile
+</pre>
+Then in your active vhost for Chamilo, you would have to add the following lines, where the path is the same as your DocumentRoot (we use /var/www/chamilo in this example):
+<pre>
+    XSendFile On
+    XSendFilePath /var/www/chamilo
+</pre>
+Then restart Apache:
+<pre>
+    sudo systemctl restart apache2
+</pre>
 <hr style="width: 100%; height: 2px;" />
 <h2><a id="15._Videoconference"></a>13. Videoconference</h2>
 <p>

documentation/installation_guide_es_ES.html

@@ -796,6 +796,23 @@ <h2><a id="14._Improving_files_download"></a>12. Mejora de la eficacia de descar
 <pre>$_configuration['enable_x_sendfile_headers'] = true;</pre>
 Si tiene problemas con los archivos que tardan mucho tiempo en descargarse, asegúrese de reconfigurar su
 servidor web y agregar esta línea. Debería ver una diferencia notable en el tiempo de descarga.
+
+El servidor web tiene que ser configurado para soportar X-Sendfile, por activar el módulo y por configurar opciones en su configuración.<br>
+Si tiene Apache 2.4 en Ubuntu, por ejemplo, tendría que ser algo así:
+  <pre>
+    sudo apt install libapache2-mod-xsendfile
+    sudo a2enmod xsendfile
+</pre>
+De ahí, en su vhost para Chamilo, tendría que añadir las líneas siguientes, donde el path es el mismo que su DocumentRoot (usamos /var/www/chamilo en este ejemplo):
+<pre>
+    XSendFile On
+    XSendFilePath /var/www/chamilo
+</pre>
+Luego reiniciar Apache:
+<pre>
+    sudo systemctl restart apache2
+</pre>
+
 <hr style="width: 100%; height: 2px;" />
 
 <h2><a id="15._Videoconference"></a>13. Videoconferencia</h2>

documentation/installation_guide_fr_FR.html

@@ -720,14 +720,30 @@ <h2><a id="13._Changing_language_names_order"></a>11. Changer l'ordre nom/préno
 <hr style="width: 100%; height: 2px;" />
 <h2><a id="14._Improving_files_download"></a>12. Améliorer la performance des téléchargements de fichiers</h2>
 <div>
-    File download can be very slow when passing through a PHP script to control permissions. One solution to this
-    is to use the X-Sendfile header, which depends on a module on the webserver. <a href="https://stackoverflow.com/a/3731639/1406662">Check https://stackoverflow.com/a/3731639/1406662 for more details on implementing Sendfile</a>.
-    Chamilo LMS 1.9.8 (and following versions) supports the X-Sendfile headers, but requires a specific line of configuration to be
-    added to configuration.php:
+Le téléchargement de fichiers peut &ecirc;tre très lent quand il passe au travers d'un script PHP qui contr&ocirc;le les permissions. One solution to this
+Une solution pour cela est d'utiliser les en-t&ecirc;tes X-Sendfile, qui dépendent d'un module du serveur web. <a href="https://stackoverflow.com/a/3731639/1406662">Lisez https://stackoverflow.com/a/3731639/1406662 pour plus de d&eacute;tails concernant son impl&eacut;mentation</a>.
+Chamilo LMS 1.9.8 (et les versions suivantes) supporte les en-t&ecirc;tes X-Sendfile, mais exige une ligne de configuration spéciale à ajouter à configuration.php :
 <pre>
 $_configuration['enable_x_sendfile_headers'] = true;
 </pre>
-If you have issues with files taking a long time to download, make sure you reconfigure your webserver and add this line. You should see a notable difference in download time.
+Si vous avez des soucis avec le téléchargement trop lent de fichiers, essayez cette option. Vous devriez observer une différence sensible dans les temps de téléchargement.
+
+Votre serveur web doit &ecirc;tre configuré pour supporter X-Sendfile, en activant le moédule correspondant ainsi qu'une configuration de votre vhost.<br>
+
+Si vous utilisez Apache 2.4 sur Ubuntu, par exemple, ça voudrait dire installer et activer le module X-Sendfile :
+<pre>
+    sudo apt install libapache2-mod-xsendfile
+    sudo a2enmod xsendfile
+</pre>
+Ensuite il faut configurer le vhost actif de Chamilo en ajoutant les lignes suivantes, où le path est le m&ecirc;me que votre DocumentRoot (nous utilisons /var/www/chamilo dans cet exemple) :
+<pre>
+    XSendFile On
+    XSendFilePath /var/www/chamilo
+</pre>
+Puis red&eacute;marrer Apache :
+<pre>
+    sudo systemctl restart apache2
+</pre>
 </div>
 <hr style="width: 100%; height: 2px;" />
 <h2><a id="15._Videoconference"></a>13. Vidéo-conférence</h2>

main/inc/lib/document.lib.php

@@ -360,7 +360,7 @@ public static function file_send_for_download(
         $fixLinksHttpToHttps = false,
         $extraHeaders = []
     ) {
-        session_write_close(); //we do not need write access to session anymore
+        session_write_close(); //we do not need to write access to session anymore
         if (!is_file($full_file_name)) {
             return false;
         }
@@ -383,7 +383,7 @@ public static function file_send_for_download(
             // Force the browser to save the file instead of opening it
             if (isset($sendFileHeaders) &&
                 !empty($sendFileHeaders)) {
-                header("X-Sendfile: $filename");
+                header("X-Sendfile: $full_file_name");
             }
 
             header('Content-type: application/octet-stream');