spip / SPIP

ecrire/inc/livrer_fichier.php

Indentation +132 added lines, -132 removed lines

@@ -16,7 +16,7 @@ 
  * @package SPIP\Core\Fichier
  **/
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -36,28 +36,28 @@ 
  */
 function spip_livrer_fichier($fichier, $content_type = 'application/octet-stream', $options = []) {
 
-	$defaut = [
-		'attachment' => false,
-		'expires' => 3600,
-		'range' => null
-	];
-	$options = array_merge($defaut, $options);
-	if (is_numeric($options['expires']) and $options['expires'] > 0) {
-		$options['expires'] = gmdate('D, d M Y H:i:s', time() + $options['expires']) . ' GMT';
-	}
-
-	if (is_null($options) and isset($_SERVER['HTTP_RANGE'])) {
-		$options['range'] = $_SERVER['HTTP_RANGE'];
-	}
-
-	spip_livrer_fichier_entetes($fichier, $content_type, $options['attachment'] && !$options['range'], $options['expires']);
-
-	if (!is_null($options['range'])) {
-		spip_livrer_fichier_partie($fichier, $options['range']);
-	}
-	else {
-		spip_livrer_fichier_entier($fichier);
-	}
+    $defaut = [
+        'attachment' => false,
+        'expires' => 3600,
+        'range' => null
+    ];
+    $options = array_merge($defaut, $options);
+    if (is_numeric($options['expires']) and $options['expires'] > 0) {
+        $options['expires'] = gmdate('D, d M Y H:i:s', time() + $options['expires']) . ' GMT';
+    }
+
+    if (is_null($options) and isset($_SERVER['HTTP_RANGE'])) {
+        $options['range'] = $_SERVER['HTTP_RANGE'];
+    }
+
+    spip_livrer_fichier_entetes($fichier, $content_type, $options['attachment'] && !$options['range'], $options['expires']);
+
+    if (!is_null($options['range'])) {
+        spip_livrer_fichier_partie($fichier, $options['range']);
+    }
+    else {
+        spip_livrer_fichier_entier($fichier);
+    }
 }
 
 /**
@@ -70,35 +70,35 @@ 
  * @param int|string $expires
  */
 function spip_livrer_fichier_entetes($fichier, $content_type = 'application/octet-stream', $attachment = false, $expires = 0) {
-	// toujours envoyer un content type, meme vide !
-	header('Accept-Ranges: bytes');
-	header('Content-Type: ' . $content_type);
-
-	if ($fs = stat($fichier)
-	  and !empty($fs['size'])
-	  and !empty($fs['mtime'])) {
-		header("Last-Modified: " . gmdate("D, d M Y H:i:s", $fs['mtime']) . " GMT");
-		header(sprintf('Etag: "%x-%x"', $fs['size'], str_pad($fs['mtime'], 16, "0")));
-	}
-
-	if ($attachment) {
-		$f = basename($fichier);
-		// ce content-type est necessaire pour eviter des corruptions de zip dans ie6
-		header('Content-Type: application/octet-stream');
-
-		header("Content-Disposition: attachment; filename=\"$f\";");
-		header('Content-Transfer-Encoding: binary');
-
-		// fix for IE caching or PHP bug issue
-		header('Expires: 0'); // set expiration time
-		header('Pragma: public');
-		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-	}
-	else {
-		$f = basename($fichier);
-		header("Content-Disposition: inline; filename=\"$f\";");
-		header('Expires: ' . $expires); // set expiration time
-	}
+    // toujours envoyer un content type, meme vide !
+    header('Accept-Ranges: bytes');
+    header('Content-Type: ' . $content_type);
+
+    if ($fs = stat($fichier)
+      and !empty($fs['size'])
+      and !empty($fs['mtime'])) {
+        header("Last-Modified: " . gmdate("D, d M Y H:i:s", $fs['mtime']) . " GMT");
+        header(sprintf('Etag: "%x-%x"', $fs['size'], str_pad($fs['mtime'], 16, "0")));
+    }
+
+    if ($attachment) {
+        $f = basename($fichier);
+        // ce content-type est necessaire pour eviter des corruptions de zip dans ie6
+        header('Content-Type: application/octet-stream');
+
+        header("Content-Disposition: attachment; filename=\"$f\";");
+        header('Content-Transfer-Encoding: binary');
+
+        // fix for IE caching or PHP bug issue
+        header('Expires: 0'); // set expiration time
+        header('Pragma: public');
+        header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+    }
+    else {
+        $f = basename($fichier);
+        header("Content-Disposition: inline; filename=\"$f\";");
+        header('Expires: ' . $expires); // set expiration time
+    }
 }
 
 /**
@@ -106,20 +106,20 @@ 
  * @param string $fichier
  */
 function spip_livrer_fichier_entier($fichier) {
-	if (!file_exists($fichier)) {
-		throw new \Exception(sprintf('File not found: %s', $fichier));
-	}
+    if (!file_exists($fichier)) {
+        throw new \Exception(sprintf('File not found: %s', $fichier));
+    }
 
-	if (!is_readable($fichier)) {
-		throw new \Exception(sprintf('File not readable: %s', $fichier));
-	}
+    if (!is_readable($fichier)) {
+        throw new \Exception(sprintf('File not readable: %s', $fichier));
+    }
 
-	if ($size = filesize($fichier)) {
-		header(sprintf('Content-Length: %d', $size));
-	}
+    if ($size = filesize($fichier)) {
+        header(sprintf('Content-Length: %d', $size));
+    }
 
-	readfile($fichier);
-	exit();
+    readfile($fichier);
+    exit();
 }
 
 /**
@@ -132,98 +132,98 @@ 
  * @throws Exception
  */
 function spip_livrer_fichier_partie($fichier, $range = null) {
-	if (!file_exists($fichier)) {
-		throw new \Exception(sprintf('File not found: %s', $fichier));
-	}
+    if (!file_exists($fichier)) {
+        throw new \Exception(sprintf('File not found: %s', $fichier));
+    }
 
-	if (!is_readable($fichier)) {
-		throw new \Exception(sprintf('File not readable: %s', $fichier));
-	}
+    if (!is_readable($fichier)) {
+        throw new \Exception(sprintf('File not readable: %s', $fichier));
+    }
 
 
-	// Par defaut on envoie tout
-	$byteOffset = 0;
-	$byteLength = $fileSize = filesize($fichier);
+    // Par defaut on envoie tout
+    $byteOffset = 0;
+    $byteLength = $fileSize = filesize($fichier);
 
 
-	// Parse Content-Range header for byte offsets, looks like "bytes=11525-" OR "bytes=11525-12451"
-	if ($range and preg_match('%bytes=(\d+)-(\d+)?%i', $range, $match)) {
-		### Offset signifies where we should begin to read the file
-		$byteOffset = (int)$match[1];
+    // Parse Content-Range header for byte offsets, looks like "bytes=11525-" OR "bytes=11525-12451"
+    if ($range and preg_match('%bytes=(\d+)-(\d+)?%i', $range, $match)) {
+        ### Offset signifies where we should begin to read the file
+        $byteOffset = (int)$match[1];
 
 
-		### Length is for how long we should read the file according to the browser, and can never go beyond the file size
-		if (isset($match[2])) {
-			$finishBytes = (int)$match[2];
-			$byteLength = $finishBytes + 1;
-		} else {
-			$finishBytes = $fileSize - 1;
-		}
+        ### Length is for how long we should read the file according to the browser, and can never go beyond the file size
+        if (isset($match[2])) {
+            $finishBytes = (int)$match[2];
+            $byteLength = $finishBytes + 1;
+        } else {
+            $finishBytes = $fileSize - 1;
+        }
 
-		$cr_header = sprintf('Content-Range: bytes %d-%d/%d', $byteOffset, $finishBytes, $fileSize);
-	}
-	else {
-		// si pas de range valide, on delegue a la methode d'envoi complet
-		spip_livrer_fichier_entier($fichier);
-		// redondant, mais facilite la comprehension du code
-		exit();
-	}
+        $cr_header = sprintf('Content-Range: bytes %d-%d/%d', $byteOffset, $finishBytes, $fileSize);
+    }
+    else {
+        // si pas de range valide, on delegue a la methode d'envoi complet
+        spip_livrer_fichier_entier($fichier);
+        // redondant, mais facilite la comprehension du code
+        exit();
+    }
 
-	// Remove headers that might unnecessarily clutter up the output
-	header_remove('Cache-Control');
-	header_remove('Pragma');
+    // Remove headers that might unnecessarily clutter up the output
+    header_remove('Cache-Control');
+    header_remove('Pragma');
 
-	// partial content
-	header('HTTP/1.1 206 Partial content');
-	header($cr_header);  ### Decrease by 1 on byte-length since this definition is zero-based index of bytes being sent
+    // partial content
+    header('HTTP/1.1 206 Partial content');
+    header($cr_header);  ### Decrease by 1 on byte-length since this definition is zero-based index of bytes being sent
 
 
-	$byteRange = $byteLength - $byteOffset;
+    $byteRange = $byteLength - $byteOffset;
 
-	header(sprintf('Content-Length: %d', $byteRange));
+    header(sprintf('Content-Length: %d', $byteRange));
 
-	// Variable containing the buffer
-	$buffer = '';
-	// Just a reasonable buffer size
-	$bufferSize = 512 * 16;
-	// Contains how much is left to read of the byteRange
-	$bytePool = $byteRange;
+    // Variable containing the buffer
+    $buffer = '';
+    // Just a reasonable buffer size
+    $bufferSize = 512 * 16;
+    // Contains how much is left to read of the byteRange
+    $bytePool = $byteRange;
 
-	if (!$handle = fopen($fichier, 'r')) {
-		throw new \Exception(sprintf('Could not get handle for file %s', $fichier));
-	}
+    if (!$handle = fopen($fichier, 'r')) {
+        throw new \Exception(sprintf('Could not get handle for file %s', $fichier));
+    }
 
-	if (fseek($handle, $byteOffset, SEEK_SET) == -1) {
-		throw new \Exception(sprintf('Could not seek to byte offset %d', $byteOffset));
-	}
+    if (fseek($handle, $byteOffset, SEEK_SET) == -1) {
+        throw new \Exception(sprintf('Could not seek to byte offset %d', $byteOffset));
+    }
 
 
-	while ($bytePool > 0) {
-		// How many bytes we request on this iteration
-		$chunkSizeRequested = min($bufferSize, $bytePool);
+    while ($bytePool > 0) {
+        // How many bytes we request on this iteration
+        $chunkSizeRequested = min($bufferSize, $bytePool);
 
-		// Try readin $chunkSizeRequested bytes from $handle and put data in $buffer
-		$buffer = fread($handle, $chunkSizeRequested);
+        // Try readin $chunkSizeRequested bytes from $handle and put data in $buffer
+        $buffer = fread($handle, $chunkSizeRequested);
 
-		// Store how many bytes were actually read
-		$chunkSizeActual = strlen($buffer);
+        // Store how many bytes were actually read
+        $chunkSizeActual = strlen($buffer);
 
-		// If we didn't get any bytes that means something unexpected has happened since $bytePool should be zero already
-		if ($chunkSizeActual == 0) {
-			// For production servers this should go in your php error log, since it will break the output
-			trigger_error('Chunksize became 0', E_USER_WARNING);
-			break;
-		}
+        // If we didn't get any bytes that means something unexpected has happened since $bytePool should be zero already
+        if ($chunkSizeActual == 0) {
+            // For production servers this should go in your php error log, since it will break the output
+            trigger_error('Chunksize became 0', E_USER_WARNING);
+            break;
+        }
 
-		// Decrease byte pool with amount of bytes that were read during this iteration
-		$bytePool -= $chunkSizeActual;
+        // Decrease byte pool with amount of bytes that were read during this iteration
+        $bytePool -= $chunkSizeActual;
 
-		// Write the buffer to output
-		print $buffer;
+        // Write the buffer to output
+        print $buffer;
 
-		// Try to output the data to the client immediately
-		flush();
-	}
+        // Try to output the data to the client immediately
+        flush();
+    }
 
-	exit();
+    exit();
 }

Spacing +7 added lines, -7 removed lines

@@ -43,7 +43,7 @@ 
 	];
 	$options = array_merge($defaut, $options);
 	if (is_numeric($options['expires']) and $options['expires'] > 0) {
-		$options['expires'] = gmdate('D, d M Y H:i:s', time() + $options['expires']) . ' GMT';
+		$options['expires'] = gmdate('D, d M Y H:i:s', time() + $options['expires']).' GMT';
 	}
 
 	if (is_null($options) and isset($_SERVER['HTTP_RANGE'])) {
@@ -72,12 +72,12 @@ 
 function spip_livrer_fichier_entetes($fichier, $content_type = 'application/octet-stream', $attachment = false, $expires = 0) {
 	// toujours envoyer un content type, meme vide !
 	header('Accept-Ranges: bytes');
-	header('Content-Type: ' . $content_type);
+	header('Content-Type: '.$content_type);
 
 	if ($fs = stat($fichier)
 	  and !empty($fs['size'])
 	  and !empty($fs['mtime'])) {
-		header("Last-Modified: " . gmdate("D, d M Y H:i:s", $fs['mtime']) . " GMT");
+		header("Last-Modified: ".gmdate("D, d M Y H:i:s", $fs['mtime'])." GMT");
 		header(sprintf('Etag: "%x-%x"', $fs['size'], str_pad($fs['mtime'], 16, "0")));
 	}
 
@@ -97,7 +97,7 @@ 
 	else {
 		$f = basename($fichier);
 		header("Content-Disposition: inline; filename=\"$f\";");
-		header('Expires: ' . $expires); // set expiration time
+		header('Expires: '.$expires); // set expiration time
 	}
 }
 
@@ -149,12 +149,12 @@ 
 	// Parse Content-Range header for byte offsets, looks like "bytes=11525-" OR "bytes=11525-12451"
 	if ($range and preg_match('%bytes=(\d+)-(\d+)?%i', $range, $match)) {
 		### Offset signifies where we should begin to read the file
-		$byteOffset = (int)$match[1];
+		$byteOffset = (int) $match[1];
 
 
 		### Length is for how long we should read the file according to the browser, and can never go beyond the file size
 		if (isset($match[2])) {
-			$finishBytes = (int)$match[2];
+			$finishBytes = (int) $match[2];
 			$byteLength = $finishBytes + 1;
 		} else {
 			$finishBytes = $fileSize - 1;
@@ -175,7 +175,7 @@ 
 
 	// partial content
 	header('HTTP/1.1 206 Partial content');
-	header($cr_header);  ### Decrease by 1 on byte-length since this definition is zero-based index of bytes being sent
+	header($cr_header); ### Decrease by 1 on byte-length since this definition is zero-based index of bytes being sent
 
 
 	$byteRange = $byteLength - $byteOffset;