@@ -89,13 +89,11 @@ discard block |
||
89 | 89 | if (count($rangeArray) > 1) { |
90 | 90 | $type = 'multipart/byteranges; boundary='.self::getBoundary(); |
91 | 91 | // no Content-Length header here |
92 | - } |
|
93 | - else { |
|
92 | + } else { |
|
94 | 93 | header(sprintf('Content-Range: bytes %d-%d/%d', $rangeArray[0]['from'], $rangeArray[0]['to'], $fileSize), true); |
95 | 94 | OC_Response::setContentLengthHeader($rangeArray[0]['to'] - $rangeArray[0]['from'] + 1); |
96 | 95 | } |
97 | - } |
|
98 | - else { |
|
96 | + } else { |
|
99 | 97 | OC_Response::setContentLengthHeader($fileSize); |
100 | 98 | } |
101 | 99 | } |
@@ -263,13 +261,11 @@ discard block |
||
263 | 261 | if ($minOffset >= $fileSize) { |
264 | 262 | break; |
265 | 263 | } |
266 | - } |
|
267 | - elseif (is_numeric($ranges[0]) && $ranges[0] < $fileSize) { |
|
264 | + } elseif (is_numeric($ranges[0]) && $ranges[0] < $fileSize) { |
|
268 | 265 | // case: x- |
269 | 266 | $rangeArray[$ind++] = [ 'from' => $ranges[0], 'to' => $fileSize-1, 'size' => $fileSize ]; |
270 | 267 | break; |
271 | - } |
|
272 | - elseif (is_numeric($ranges[1])) { |
|
268 | + } elseif (is_numeric($ranges[1])) { |
|
273 | 269 | // case: -x |
274 | 270 | if ($ranges[1] > $fileSize) { |
275 | 271 | $ranges[1] = $fileSize; |
@@ -331,8 +327,7 @@ discard block |
||
331 | 327 | try { |
332 | 328 | if (count($rangeArray) == 1) { |
333 | 329 | $view->readfilePart($filename, $rangeArray[0]['from'], $rangeArray[0]['to']); |
334 | - } |
|
335 | - else { |
|
330 | + } else { |
|
336 | 331 | // check if file is seekable (if not throw UnseekableException) |
337 | 332 | // we have to check it before body contents |
338 | 333 | $view->readfilePart($filename, $rangeArray[0]['size'], $rangeArray[0]['size']); |
@@ -355,8 +350,7 @@ discard block |
||
355 | 350 | self::sendHeaders($filename, $name, []); |
356 | 351 | $view->readfile($filename); |
357 | 352 | } |
358 | - } |
|
359 | - else { |
|
353 | + } else { |
|
360 | 354 | $view->readfile($filename); |
361 | 355 | } |
362 | 356 | } |