nextcloud / server

lib/private/Template/ResourceNotFoundException.php

Indentation +17 added lines, -17 removed lines

@@ -24,23 +24,23 @@
 namespace OC\Template;
 
 class ResourceNotFoundException extends \LogicException {
-	protected $resource;
-	protected $webPath;
+    protected $resource;
+    protected $webPath;
 
-	/**
-	 * @param string $resource
-	 * @param string $webPath
-	 */
-	public function __construct($resource, $webPath) {
-		parent::__construct('Resource not found');
-		$this->resource = $resource;
-		$this->webPath = $webPath;
-	}
+    /**
+     * @param string $resource
+     * @param string $webPath
+     */
+    public function __construct($resource, $webPath) {
+        parent::__construct('Resource not found');
+        $this->resource = $resource;
+        $this->webPath = $webPath;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getResourcePath() {
-		return $this->webPath . '/' . $this->resource;
-	}
+    /**
+     * @return string
+     */
+    public function getResourcePath() {
+        return $this->webPath . '/' . $this->resource;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -41,6 +41,6 @@
 	 * @return string
 	 */
 	public function getResourcePath() {
-		return $this->webPath . '/' . $this->resource;
+		return $this->webPath.'/'.$this->resource;
 	}
 }

lib/private/Template/TemplateFileLocator.php

Indentation +29 added lines, -29 removed lines

@@ -26,37 +26,37 @@
 namespace OC\Template;
 
 class TemplateFileLocator {
-	protected $dirs;
-	private $path;
+    protected $dirs;
+    private $path;
 
-	/**
-	 * @param string[] $dirs
-	 */
-	public function __construct( $dirs ) {
-		$this->dirs = $dirs;
-	}
+    /**
+     * @param string[] $dirs
+     */
+    public function __construct( $dirs ) {
+        $this->dirs = $dirs;
+    }
 
-	/**
-	 * @param string $template
-	 * @return string
-	 * @throws \Exception
-	 */
-	public function find( $template ) {
-		if ($template === '') {
-			throw new \InvalidArgumentException('Empty template name');
-		}
+    /**
+     * @param string $template
+     * @return string
+     * @throws \Exception
+     */
+    public function find( $template ) {
+        if ($template === '') {
+            throw new \InvalidArgumentException('Empty template name');
+        }
 
-		foreach($this->dirs as $dir) {
-			$file = $dir.$template.'.php';
-			if (is_file($file)) {
-				$this->path = $dir;
-				return $file;
-			}
-		}
-		throw new \Exception('template file not found: template:'.$template);
-	}
+        foreach($this->dirs as $dir) {
+            $file = $dir.$template.'.php';
+            if (is_file($file)) {
+                $this->path = $dir;
+                return $file;
+            }
+        }
+        throw new \Exception('template file not found: template:'.$template);
+    }
 
-	public function getPath() {
-		return $this->path;
-	}
+    public function getPath() {
+        return $this->path;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
 	/**
 	 * @param string[] $dirs
 	 */
-	public function __construct( $dirs ) {
+	public function __construct($dirs) {
 		$this->dirs = $dirs;
 	}
 
@@ -41,12 +41,12 @@ 
 	 * @return string
 	 * @throws \Exception
 	 */
-	public function find( $template ) {
+	public function find($template) {
 		if ($template === '') {
 			throw new \InvalidArgumentException('Empty template name');
 		}
 
-		foreach($this->dirs as $dir) {
+		foreach ($this->dirs as $dir) {
 			$file = $dir.$template.'.php';
 			if (is_file($file)) {
 				$this->path = $dir;

lib/private/Hooks/BasicEmitter.php

Indentation +1 added lines, -1 removed lines

@@ -24,5 +24,5 @@
 namespace OC\Hooks;
 
 abstract class BasicEmitter implements Emitter {
-	use EmitterTrait;
+    use EmitterTrait;
 }

lib/private/Hooks/Emitter.php

Indentation +14 added lines, -14 removed lines

@@ -32,19 +32,19 @@
  * @package OC\Hooks
  */
 interface Emitter {
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param callable $callback
-	 * @return void
-	 */
-	public function listen($scope, $method, callable $callback);
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param callable $callback
+     * @return void
+     */
+    public function listen($scope, $method, callable $callback);
 
-	/**
-	 * @param string $scope optional
-	 * @param string $method optional
-	 * @param callable $callback optional
-	 * @return void
-	 */
-	public function removeListener($scope = null, $method = null, callable $callback = null);
+    /**
+     * @param string $scope optional
+     * @param string $method optional
+     * @param callable $callback optional
+     * @return void
+     */
+    public function removeListener($scope = null, $method = null, callable $callback = null);
 }

lib/private/Hooks/ForwardingEmitter.php

Indentation +28 added lines, -28 removed lines

@@ -31,35 +31,35 @@
  * @package OC\Hooks
  */
 abstract class ForwardingEmitter extends BasicEmitter {
-	/**
-	 * @var \OC\Hooks\Emitter[] array
-	 */
-	private $forwardEmitters = array();
+    /**
+     * @var \OC\Hooks\Emitter[] array
+     */
+    private $forwardEmitters = array();
 
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param callable $callback
-	 */
-	public function listen($scope, $method, callable $callback) {
-		parent::listen($scope, $method, $callback);
-		foreach ($this->forwardEmitters as $emitter) {
-			$emitter->listen($scope, $method, $callback);
-		}
-	}
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param callable $callback
+     */
+    public function listen($scope, $method, callable $callback) {
+        parent::listen($scope, $method, $callback);
+        foreach ($this->forwardEmitters as $emitter) {
+            $emitter->listen($scope, $method, $callback);
+        }
+    }
 
-	/**
-	 * @param \OC\Hooks\Emitter $emitter
-	 */
-	protected function forward(Emitter $emitter) {
-		$this->forwardEmitters[] = $emitter;
+    /**
+     * @param \OC\Hooks\Emitter $emitter
+     */
+    protected function forward(Emitter $emitter) {
+        $this->forwardEmitters[] = $emitter;
 
-		//forward all previously connected hooks
-		foreach ($this->listeners as $key => $listeners) {
-			list($scope, $method) = explode('::', $key, 2);
-			foreach ($listeners as $listener) {
-				$emitter->listen($scope, $method, $listener);
-			}
-		}
-	}
+        //forward all previously connected hooks
+        foreach ($this->listeners as $key => $listeners) {
+            list($scope, $method) = explode('::', $key, 2);
+            foreach ($listeners as $listener) {
+                $emitter->listen($scope, $method, $listener);
+            }
+        }
+    }
 }

lib/private/Hooks/EmitterTrait.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
 	 * @param callable $callback
 	 */
 	public function listen($scope, $method, callable $callback) {
-		$eventName = $scope . '::' . $method;
+		$eventName = $scope.'::'.$method;
 		if (!isset($this->listeners[$eventName])) {
 			$this->listeners[$eventName] = array();
 		}
@@ -53,7 +53,7 @@ 
 		$names = array();
 		$allNames = array_keys($this->listeners);
 		if ($scope and $method) {
-			$name = $scope . '::' . $method;
+			$name = $scope.'::'.$method;
 			if (isset($this->listeners[$name])) {
 				$names[] = $name;
 			}
@@ -93,7 +93,7 @@ 
 	 * @param array $arguments optional
 	 */
 	protected function emit($scope, $method, array $arguments = array()) {
-		$eventName = $scope . '::' . $method;
+		$eventName = $scope.'::'.$method;
 		if (isset($this->listeners[$eventName])) {
 			foreach ($this->listeners[$eventName] as $callback) {
 				call_user_func_array($callback, $arguments);

Indentation +72 added lines, -72 removed lines

@@ -24,80 +24,80 @@
 
 trait EmitterTrait {
 
-	/**
-	 * @var callable[][] $listeners
-	 */
-	protected $listeners = array();
+    /**
+     * @var callable[][] $listeners
+     */
+    protected $listeners = array();
 
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param callable $callback
-	 */
-	public function listen($scope, $method, callable $callback) {
-		$eventName = $scope . '::' . $method;
-		if (!isset($this->listeners[$eventName])) {
-			$this->listeners[$eventName] = array();
-		}
-		if (array_search($callback, $this->listeners[$eventName], true) === false) {
-			$this->listeners[$eventName][] = $callback;
-		}
-	}
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param callable $callback
+     */
+    public function listen($scope, $method, callable $callback) {
+        $eventName = $scope . '::' . $method;
+        if (!isset($this->listeners[$eventName])) {
+            $this->listeners[$eventName] = array();
+        }
+        if (array_search($callback, $this->listeners[$eventName], true) === false) {
+            $this->listeners[$eventName][] = $callback;
+        }
+    }
 
-	/**
-	 * @param string $scope optional
-	 * @param string $method optional
-	 * @param callable $callback optional
-	 */
-	public function removeListener($scope = null, $method = null, callable $callback = null) {
-		$names = array();
-		$allNames = array_keys($this->listeners);
-		if ($scope and $method) {
-			$name = $scope . '::' . $method;
-			if (isset($this->listeners[$name])) {
-				$names[] = $name;
-			}
-		} elseif ($scope) {
-			foreach ($allNames as $name) {
-				$parts = explode('::', $name, 2);
-				if ($parts[0] == $scope) {
-					$names[] = $name;
-				}
-			}
-		} elseif ($method) {
-			foreach ($allNames as $name) {
-				$parts = explode('::', $name, 2);
-				if ($parts[1] == $method) {
-					$names[] = $name;
-				}
-			}
-		} else {
-			$names = $allNames;
-		}
+    /**
+     * @param string $scope optional
+     * @param string $method optional
+     * @param callable $callback optional
+     */
+    public function removeListener($scope = null, $method = null, callable $callback = null) {
+        $names = array();
+        $allNames = array_keys($this->listeners);
+        if ($scope and $method) {
+            $name = $scope . '::' . $method;
+            if (isset($this->listeners[$name])) {
+                $names[] = $name;
+            }
+        } elseif ($scope) {
+            foreach ($allNames as $name) {
+                $parts = explode('::', $name, 2);
+                if ($parts[0] == $scope) {
+                    $names[] = $name;
+                }
+            }
+        } elseif ($method) {
+            foreach ($allNames as $name) {
+                $parts = explode('::', $name, 2);
+                if ($parts[1] == $method) {
+                    $names[] = $name;
+                }
+            }
+        } else {
+            $names = $allNames;
+        }
 
-		foreach ($names as $name) {
-			if ($callback) {
-				$index = array_search($callback, $this->listeners[$name], true);
-				if ($index !== false) {
-					unset($this->listeners[$name][$index]);
-				}
-			} else {
-				$this->listeners[$name] = array();
-			}
-		}
-	}
+        foreach ($names as $name) {
+            if ($callback) {
+                $index = array_search($callback, $this->listeners[$name], true);
+                if ($index !== false) {
+                    unset($this->listeners[$name][$index]);
+                }
+            } else {
+                $this->listeners[$name] = array();
+            }
+        }
+    }
 
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param array $arguments optional
-	 */
-	protected function emit($scope, $method, array $arguments = array()) {
-		$eventName = $scope . '::' . $method;
-		if (isset($this->listeners[$eventName])) {
-			foreach ($this->listeners[$eventName] as $callback) {
-				call_user_func_array($callback, $arguments);
-			}
-		}
-	}
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param array $arguments optional
+     */
+    protected function emit($scope, $method, array $arguments = array()) {
+        $eventName = $scope . '::' . $method;
+        if (isset($this->listeners[$eventName])) {
+            foreach ($this->listeners[$eventName] as $callback) {
+                call_user_func_array($callback, $arguments);
+            }
+        }
+    }
 }

lib/private/legacy/files.php

Braces +6 added lines, -12 removed lines

@@ -83,13 +83,11 @@ 
 			    if (count($rangeArray) > 1) {
 				$type = 'multipart/byteranges; boundary='.self::getBoundary();
 				// no Content-Length header here
-			    }
-			    else {
+			    } else {
 				header(sprintf('Content-Range: bytes %d-%d/%d', $rangeArray[0]['from'], $rangeArray[0]['to'], $fileSize), true);
 				OC_Response::setContentLengthHeader($rangeArray[0]['to'] - $rangeArray[0]['from'] + 1);
 			    }
-			}
-			else {
+			} else {
 			    OC_Response::setContentLengthHeader($fileSize);
 			}
 		}
@@ -223,13 +221,11 @@ 
 				if ($minOffset >= $fileSize) {
 					break;
 				}
-			}
-			elseif (is_numeric($ranges[0]) && $ranges[0] < $fileSize) {
+			} elseif (is_numeric($ranges[0]) && $ranges[0] < $fileSize) {
 				// case: x-
 				$rangeArray[$ind++] = array( 'from' => $ranges[0], 'to' => $fileSize-1, 'size' => $fileSize );
 				break;
-			}
-			elseif (is_numeric($ranges[1])) {
+			} elseif (is_numeric($ranges[1])) {
 				// case: -x
 				if ($ranges[1] > $fileSize) {
 					$ranges[1] = $fileSize;
@@ -277,8 +273,7 @@ 
 			try {
 			    if (count($rangeArray) == 1) {
 				$view->readfilePart($filename, $rangeArray[0]['from'], $rangeArray[0]['to']);
-			    }
-			    else {
+			    } else {
 				// check if file is seekable (if not throw UnseekableException)
 				// we have to check it before body contents
 				$view->readfilePart($filename, $rangeArray[0]['size'], $rangeArray[0]['size']);
@@ -301,8 +296,7 @@ 
 			    self::sendHeaders($filename, $name, array());
 			    $view->readfile($filename);
 			}
-		}
-		else {
+		} else {
 		    $view->readfile($filename);
 		}
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -338,7 +338,7 @@
 	 *
 	 * @param int $size file size in bytes
 	 * @param array $files override '.htaccess' and '.user.ini' locations
-	 * @return bool|int false on failure, size on success
+	 * @return integer false on failure, size on success
 	 */
 	public static function setUploadLimit($size, $files = []) {
 		//don't allow user to break his config

Indentation +390 added lines, -390 removed lines

@@ -48,398 +48,398 @@
  *
  */
 class OC_Files {
-	const FILE = 1;
-	const ZIP_FILES = 2;
-	const ZIP_DIR = 3;
-
-	const UPLOAD_MIN_LIMIT_BYTES = 1048576; // 1 MiB
-
-
-	private static $multipartBoundary = '';
-
-	/**
-	 * @return string
-	 */
-	private static function getBoundary() {
-		if (empty(self::$multipartBoundary)) {
-			self::$multipartBoundary = md5(mt_rand());
-		}
-		return self::$multipartBoundary;
-	}
-
-	/**
-	 * @param string $filename
-	 * @param string $name
-	 * @param array $rangeArray ('from'=>int,'to'=>int), ...
-	 */
-	private static function sendHeaders($filename, $name, array $rangeArray) {
-		OC_Response::setContentDispositionHeader($name, 'attachment');
-		header('Content-Transfer-Encoding: binary', true);
-		header('Pragma: public');// enable caching in IE
-		header('Expires: 0');
-		header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-		$fileSize = \OC\Files\Filesystem::filesize($filename);
-		$type = \OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename));
-		if ($fileSize > -1) {
-			if (!empty($rangeArray)) {
-			    header('HTTP/1.1 206 Partial Content', true);
-			    header('Accept-Ranges: bytes', true);
-			    if (count($rangeArray) > 1) {
-				$type = 'multipart/byteranges; boundary='.self::getBoundary();
-				// no Content-Length header here
-			    }
-			    else {
-				header(sprintf('Content-Range: bytes %d-%d/%d', $rangeArray[0]['from'], $rangeArray[0]['to'], $fileSize), true);
-				OC_Response::setContentLengthHeader($rangeArray[0]['to'] - $rangeArray[0]['from'] + 1);
-			    }
-			}
-			else {
-			    OC_Response::setContentLengthHeader($fileSize);
-			}
-		}
-		header('Content-Type: '.$type, true);
-	}
-
-	/**
-	 * return the content of a file or return a zip file containing multiple files
-	 *
-	 * @param string $dir
-	 * @param string $files ; separated list of files to download
-	 * @param array $params ; 'head' boolean to only send header of the request ; 'range' http range header
-	 */
-	public static function get($dir, $files, $params = null) {
-
-		$view = \OC\Files\Filesystem::getView();
-		$getType = self::FILE;
-		$filename = $dir;
-		try {
-
-			if (is_array($files) && count($files) === 1) {
-				$files = $files[0];
-			}
-
-			if (!is_array($files)) {
-				$filename = $dir . '/' . $files;
-				if (!$view->is_dir($filename)) {
-					self::getSingleFile($view, $dir, $files, is_null($params) ? array() : $params);
-					return;
-				}
-			}
-
-			$name = 'download';
-			if (is_array($files)) {
-				$getType = self::ZIP_FILES;
-				$basename = basename($dir);
-				if ($basename) {
-					$name = $basename;
-				}
-
-				$filename = $dir . '/' . $name;
-			} else {
-				$filename = $dir . '/' . $files;
-				$getType = self::ZIP_DIR;
-				// downloading root ?
-				if ($files !== '') {
-					$name = $files;
-				}
-			}
-
-			$streamer = new Streamer();
-			OC_Util::obEnd();
-
-			self::lockFiles($view, $dir, $files);
-
-			$streamer->sendHeaders($name);
-			$executionTime = (int)OC::$server->getIniWrapper()->getNumeric('max_execution_time');
-			if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-				@set_time_limit(0);
-			}
-			ignore_user_abort(true);
-			if ($getType === self::ZIP_FILES) {
-				foreach ($files as $file) {
-					$file = $dir . '/' . $file;
-					if (\OC\Files\Filesystem::is_file($file)) {
-						$fileSize = \OC\Files\Filesystem::filesize($file);
-						$fileTime = \OC\Files\Filesystem::filemtime($file);
-						$fh = \OC\Files\Filesystem::fopen($file, 'r');
-						$streamer->addFileFromStream($fh, basename($file), $fileSize, $fileTime);
-						fclose($fh);
-					} elseif (\OC\Files\Filesystem::is_dir($file)) {
-						$streamer->addDirRecursive($file);
-					}
-				}
-			} elseif ($getType === self::ZIP_DIR) {
-				$file = $dir . '/' . $files;
-				$streamer->addDirRecursive($file);
-			}
-			$streamer->finalize();
-			set_time_limit($executionTime);
-			self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
-		} catch (\OCP\Lock\LockedException $ex) {
-			self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
-			OC::$server->getLogger()->logException($ex);
-			$l = \OC::$server->getL10N('core');
-			$hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
-			\OC_Template::printErrorPage($l->t('File is currently busy, please try again later'), $hint);
-		} catch (\OCP\Files\ForbiddenException $ex) {
-			self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
-			OC::$server->getLogger()->logException($ex);
-			$l = \OC::$server->getL10N('core');
-			\OC_Template::printErrorPage($l->t('Can\'t read file'), $ex->getMessage());
-		} catch (\Exception $ex) {
-			self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
-			OC::$server->getLogger()->logException($ex);
-			$l = \OC::$server->getL10N('core');
-			$hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
-			\OC_Template::printErrorPage($l->t('Can\'t read file'), $hint);
-		}
-	}
-
-	/**
-	 * @param string $rangeHeaderPos
-	 * @param int $fileSize
-	 * @return array $rangeArray ('from'=>int,'to'=>int), ...
-	 */
-	private static function parseHttpRangeHeader($rangeHeaderPos, $fileSize) {
-		$rArray=explode(',', $rangeHeaderPos);
-		$minOffset = 0;
-		$ind = 0;
-
-		$rangeArray = array();
-
-		foreach ($rArray as $value) {
-			$ranges = explode('-', $value);
-			if (is_numeric($ranges[0])) {
-				if ($ranges[0] < $minOffset) { // case: bytes=500-700,601-999
-					$ranges[0] = $minOffset;
-				}
-				if ($ind > 0 && $rangeArray[$ind-1]['to']+1 == $ranges[0]) { // case: bytes=500-600,601-999
-					$ind--;
-					$ranges[0] = $rangeArray[$ind]['from'];
-				}
-			}
-
-			if (is_numeric($ranges[0]) && is_numeric($ranges[1]) && $ranges[0] < $fileSize && $ranges[0] <= $ranges[1]) {
-				// case: x-x
-				if ($ranges[1] >= $fileSize) {
-					$ranges[1] = $fileSize-1;
-				}
-				$rangeArray[$ind++] = array( 'from' => $ranges[0], 'to' => $ranges[1], 'size' => $fileSize );
-				$minOffset = $ranges[1] + 1;
-				if ($minOffset >= $fileSize) {
-					break;
-				}
-			}
-			elseif (is_numeric($ranges[0]) && $ranges[0] < $fileSize) {
-				// case: x-
-				$rangeArray[$ind++] = array( 'from' => $ranges[0], 'to' => $fileSize-1, 'size' => $fileSize );
-				break;
-			}
-			elseif (is_numeric($ranges[1])) {
-				// case: -x
-				if ($ranges[1] > $fileSize) {
-					$ranges[1] = $fileSize;
-				}
-				$rangeArray[$ind++] = array( 'from' => $fileSize-$ranges[1], 'to' => $fileSize-1, 'size' => $fileSize );
-				break;
-			}
-		}
-		return $rangeArray;
-	}
-
-	/**
-	 * @param View $view
-	 * @param string $name
-	 * @param string $dir
-	 * @param array $params ; 'head' boolean to only send header of the request ; 'range' http range header
-	 */
-	private static function getSingleFile($view, $dir, $name, $params) {
-		$filename = $dir . '/' . $name;
-		OC_Util::obEnd();
-		$view->lockFile($filename, ILockingProvider::LOCK_SHARED);
+    const FILE = 1;
+    const ZIP_FILES = 2;
+    const ZIP_DIR = 3;
+
+    const UPLOAD_MIN_LIMIT_BYTES = 1048576; // 1 MiB
+
+
+    private static $multipartBoundary = '';
+
+    /**
+     * @return string
+     */
+    private static function getBoundary() {
+        if (empty(self::$multipartBoundary)) {
+            self::$multipartBoundary = md5(mt_rand());
+        }
+        return self::$multipartBoundary;
+    }
+
+    /**
+     * @param string $filename
+     * @param string $name
+     * @param array $rangeArray ('from'=>int,'to'=>int), ...
+     */
+    private static function sendHeaders($filename, $name, array $rangeArray) {
+        OC_Response::setContentDispositionHeader($name, 'attachment');
+        header('Content-Transfer-Encoding: binary', true);
+        header('Pragma: public');// enable caching in IE
+        header('Expires: 0');
+        header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+        $fileSize = \OC\Files\Filesystem::filesize($filename);
+        $type = \OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename));
+        if ($fileSize > -1) {
+            if (!empty($rangeArray)) {
+                header('HTTP/1.1 206 Partial Content', true);
+                header('Accept-Ranges: bytes', true);
+                if (count($rangeArray) > 1) {
+                $type = 'multipart/byteranges; boundary='.self::getBoundary();
+                // no Content-Length header here
+                }
+                else {
+                header(sprintf('Content-Range: bytes %d-%d/%d', $rangeArray[0]['from'], $rangeArray[0]['to'], $fileSize), true);
+                OC_Response::setContentLengthHeader($rangeArray[0]['to'] - $rangeArray[0]['from'] + 1);
+                }
+            }
+            else {
+                OC_Response::setContentLengthHeader($fileSize);
+            }
+        }
+        header('Content-Type: '.$type, true);
+    }
+
+    /**
+     * return the content of a file or return a zip file containing multiple files
+     *
+     * @param string $dir
+     * @param string $files ; separated list of files to download
+     * @param array $params ; 'head' boolean to only send header of the request ; 'range' http range header
+     */
+    public static function get($dir, $files, $params = null) {
+
+        $view = \OC\Files\Filesystem::getView();
+        $getType = self::FILE;
+        $filename = $dir;
+        try {
+
+            if (is_array($files) && count($files) === 1) {
+                $files = $files[0];
+            }
+
+            if (!is_array($files)) {
+                $filename = $dir . '/' . $files;
+                if (!$view->is_dir($filename)) {
+                    self::getSingleFile($view, $dir, $files, is_null($params) ? array() : $params);
+                    return;
+                }
+            }
+
+            $name = 'download';
+            if (is_array($files)) {
+                $getType = self::ZIP_FILES;
+                $basename = basename($dir);
+                if ($basename) {
+                    $name = $basename;
+                }
+
+                $filename = $dir . '/' . $name;
+            } else {
+                $filename = $dir . '/' . $files;
+                $getType = self::ZIP_DIR;
+                // downloading root ?
+                if ($files !== '') {
+                    $name = $files;
+                }
+            }
+
+            $streamer = new Streamer();
+            OC_Util::obEnd();
+
+            self::lockFiles($view, $dir, $files);
+
+            $streamer->sendHeaders($name);
+            $executionTime = (int)OC::$server->getIniWrapper()->getNumeric('max_execution_time');
+            if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+                @set_time_limit(0);
+            }
+            ignore_user_abort(true);
+            if ($getType === self::ZIP_FILES) {
+                foreach ($files as $file) {
+                    $file = $dir . '/' . $file;
+                    if (\OC\Files\Filesystem::is_file($file)) {
+                        $fileSize = \OC\Files\Filesystem::filesize($file);
+                        $fileTime = \OC\Files\Filesystem::filemtime($file);
+                        $fh = \OC\Files\Filesystem::fopen($file, 'r');
+                        $streamer->addFileFromStream($fh, basename($file), $fileSize, $fileTime);
+                        fclose($fh);
+                    } elseif (\OC\Files\Filesystem::is_dir($file)) {
+                        $streamer->addDirRecursive($file);
+                    }
+                }
+            } elseif ($getType === self::ZIP_DIR) {
+                $file = $dir . '/' . $files;
+                $streamer->addDirRecursive($file);
+            }
+            $streamer->finalize();
+            set_time_limit($executionTime);
+            self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
+        } catch (\OCP\Lock\LockedException $ex) {
+            self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
+            OC::$server->getLogger()->logException($ex);
+            $l = \OC::$server->getL10N('core');
+            $hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
+            \OC_Template::printErrorPage($l->t('File is currently busy, please try again later'), $hint);
+        } catch (\OCP\Files\ForbiddenException $ex) {
+            self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
+            OC::$server->getLogger()->logException($ex);
+            $l = \OC::$server->getL10N('core');
+            \OC_Template::printErrorPage($l->t('Can\'t read file'), $ex->getMessage());
+        } catch (\Exception $ex) {
+            self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
+            OC::$server->getLogger()->logException($ex);
+            $l = \OC::$server->getL10N('core');
+            $hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
+            \OC_Template::printErrorPage($l->t('Can\'t read file'), $hint);
+        }
+    }
+
+    /**
+     * @param string $rangeHeaderPos
+     * @param int $fileSize
+     * @return array $rangeArray ('from'=>int,'to'=>int), ...
+     */
+    private static function parseHttpRangeHeader($rangeHeaderPos, $fileSize) {
+        $rArray=explode(',', $rangeHeaderPos);
+        $minOffset = 0;
+        $ind = 0;
+
+        $rangeArray = array();
+
+        foreach ($rArray as $value) {
+            $ranges = explode('-', $value);
+            if (is_numeric($ranges[0])) {
+                if ($ranges[0] < $minOffset) { // case: bytes=500-700,601-999
+                    $ranges[0] = $minOffset;
+                }
+                if ($ind > 0 && $rangeArray[$ind-1]['to']+1 == $ranges[0]) { // case: bytes=500-600,601-999
+                    $ind--;
+                    $ranges[0] = $rangeArray[$ind]['from'];
+                }
+            }
+
+            if (is_numeric($ranges[0]) && is_numeric($ranges[1]) && $ranges[0] < $fileSize && $ranges[0] <= $ranges[1]) {
+                // case: x-x
+                if ($ranges[1] >= $fileSize) {
+                    $ranges[1] = $fileSize-1;
+                }
+                $rangeArray[$ind++] = array( 'from' => $ranges[0], 'to' => $ranges[1], 'size' => $fileSize );
+                $minOffset = $ranges[1] + 1;
+                if ($minOffset >= $fileSize) {
+                    break;
+                }
+            }
+            elseif (is_numeric($ranges[0]) && $ranges[0] < $fileSize) {
+                // case: x-
+                $rangeArray[$ind++] = array( 'from' => $ranges[0], 'to' => $fileSize-1, 'size' => $fileSize );
+                break;
+            }
+            elseif (is_numeric($ranges[1])) {
+                // case: -x
+                if ($ranges[1] > $fileSize) {
+                    $ranges[1] = $fileSize;
+                }
+                $rangeArray[$ind++] = array( 'from' => $fileSize-$ranges[1], 'to' => $fileSize-1, 'size' => $fileSize );
+                break;
+            }
+        }
+        return $rangeArray;
+    }
+
+    /**
+     * @param View $view
+     * @param string $name
+     * @param string $dir
+     * @param array $params ; 'head' boolean to only send header of the request ; 'range' http range header
+     */
+    private static function getSingleFile($view, $dir, $name, $params) {
+        $filename = $dir . '/' . $name;
+        OC_Util::obEnd();
+        $view->lockFile($filename, ILockingProvider::LOCK_SHARED);
 		
-		$rangeArray = array();
+        $rangeArray = array();
 
-		if (isset($params['range']) && substr($params['range'], 0, 6) === 'bytes=') {
-			$rangeArray = self::parseHttpRangeHeader(substr($params['range'], 6), 
-								 \OC\Files\Filesystem::filesize($filename));
-		}
+        if (isset($params['range']) && substr($params['range'], 0, 6) === 'bytes=') {
+            $rangeArray = self::parseHttpRangeHeader(substr($params['range'], 6), 
+                                    \OC\Files\Filesystem::filesize($filename));
+        }
 		
-		if (\OC\Files\Filesystem::isReadable($filename)) {
-			self::sendHeaders($filename, $name, $rangeArray);
-		} elseif (!\OC\Files\Filesystem::file_exists($filename)) {
-			header("HTTP/1.1 404 Not Found");
-			$tmpl = new OC_Template('', '404', 'guest');
-			$tmpl->printPage();
-			exit();
-		} else {
-			header("HTTP/1.1 403 Forbidden");
-			die('403 Forbidden');
-		}
-		if (isset($params['head']) && $params['head']) {
-			return;
-		}
-		if (!empty($rangeArray)) {
-			try {
-			    if (count($rangeArray) == 1) {
-				$view->readfilePart($filename, $rangeArray[0]['from'], $rangeArray[0]['to']);
-			    }
-			    else {
-				// check if file is seekable (if not throw UnseekableException)
-				// we have to check it before body contents
-				$view->readfilePart($filename, $rangeArray[0]['size'], $rangeArray[0]['size']);
-
-				$type = \OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename));
-
-				foreach ($rangeArray as $range) {
-				    echo "\r\n--".self::getBoundary()."\r\n".
-				         "Content-type: ".$type."\r\n".
-				         "Content-range: bytes ".$range['from']."-".$range['to']."/".$range['size']."\r\n\r\n";
-				    $view->readfilePart($filename, $range['from'], $range['to']);
-				}
-				echo "\r\n--".self::getBoundary()."--\r\n";
-			    }
-			} catch (\OCP\Files\UnseekableException $ex) {
-			    // file is unseekable
-			    header_remove('Accept-Ranges');
-			    header_remove('Content-Range');
-			    header("HTTP/1.1 200 OK");
-			    self::sendHeaders($filename, $name, array());
-			    $view->readfile($filename);
-			}
-		}
-		else {
-		    $view->readfile($filename);
-		}
-	}
-
-	/**
-	 * @param View $view
-	 * @param string $dir
-	 * @param string[]|string $files
-	 */
-	public static function lockFiles($view, $dir, $files) {
-		if (!is_array($files)) {
-			$file = $dir . '/' . $files;
-			$files = [$file];
-		}
-		foreach ($files as $file) {
-			$file = $dir . '/' . $file;
-			$view->lockFile($file, ILockingProvider::LOCK_SHARED);
-			if ($view->is_dir($file)) {
-				$contents = $view->getDirectoryContent($file);
-				$contents = array_map(function($fileInfo) use ($file) {
-					/** @var \OCP\Files\FileInfo $fileInfo */
-					return $file . '/' . $fileInfo->getName();
-				}, $contents);
-				self::lockFiles($view, $dir, $contents);
-			}
-		}
-	}
-
-	/**
-	 * set the maximum upload size limit for apache hosts using .htaccess
-	 *
-	 * @param int $size file size in bytes
-	 * @param array $files override '.htaccess' and '.user.ini' locations
-	 * @return bool|int false on failure, size on success
-	 */
-	public static function setUploadLimit($size, $files = []) {
-		//don't allow user to break his config
-		$size = (int)$size;
-		if ($size < self::UPLOAD_MIN_LIMIT_BYTES) {
-			return false;
-		}
-		$size = OC_Helper::phpFileSize($size);
-
-		$phpValueKeys = array(
-			'upload_max_filesize',
-			'post_max_size'
-		);
-
-		// default locations if not overridden by $files
-		$files = array_merge([
-			'.htaccess' => OC::$SERVERROOT . '/.htaccess',
-			'.user.ini' => OC::$SERVERROOT . '/.user.ini'
-		], $files);
-
-		$updateFiles = [
-			$files['.htaccess'] => [
-				'pattern' => '/php_value %1$s (\S)*/',
-				'setting' => 'php_value %1$s %2$s'
-			],
-			$files['.user.ini'] => [
-				'pattern' => '/%1$s=(\S)*/',
-				'setting' => '%1$s=%2$s'
-			]
-		];
-
-		$success = true;
-
-		foreach ($updateFiles as $filename => $patternMap) {
-			// suppress warnings from fopen()
-			$handle = @fopen($filename, 'r+');
-			if (!$handle) {
-				\OCP\Util::writeLog('files',
-					'Can\'t write upload limit to ' . $filename . '. Please check the file permissions',
-					\OCP\Util::WARN);
-				$success = false;
-				continue; // try to update as many files as possible
-			}
-
-			$content = '';
-			while (!feof($handle)) {
-				$content .= fread($handle, 1000);
-			}
-
-			foreach ($phpValueKeys as $key) {
-				$pattern = vsprintf($patternMap['pattern'], [$key]);
-				$setting = vsprintf($patternMap['setting'], [$key, $size]);
-				$hasReplaced = 0;
-				$newContent = preg_replace($pattern, $setting, $content, 2, $hasReplaced);
-				if ($newContent !== null) {
-					$content = $newContent;
-				}
-				if ($hasReplaced === 0) {
-					$content .= "\n" . $setting;
-				}
-			}
-
-			// write file back
-			ftruncate($handle, 0);
-			rewind($handle);
-			fwrite($handle, $content);
-
-			fclose($handle);
-		}
-
-		if ($success) {
-			return OC_Helper::computerFileSize($size);
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $dir
-	 * @param $files
-	 * @param integer $getType
-	 * @param View $view
-	 * @param string $filename
-	 */
-	private static function unlockAllTheFiles($dir, $files, $getType, $view, $filename) {
-		if ($getType === self::FILE) {
-			$view->unlockFile($filename, ILockingProvider::LOCK_SHARED);
-		}
-		if ($getType === self::ZIP_FILES) {
-			foreach ($files as $file) {
-				$file = $dir . '/' . $file;
-				$view->unlockFile($file, ILockingProvider::LOCK_SHARED);
-			}
-		}
-		if ($getType === self::ZIP_DIR) {
-			$file = $dir . '/' . $files;
-			$view->unlockFile($file, ILockingProvider::LOCK_SHARED);
-		}
-	}
+        if (\OC\Files\Filesystem::isReadable($filename)) {
+            self::sendHeaders($filename, $name, $rangeArray);
+        } elseif (!\OC\Files\Filesystem::file_exists($filename)) {
+            header("HTTP/1.1 404 Not Found");
+            $tmpl = new OC_Template('', '404', 'guest');
+            $tmpl->printPage();
+            exit();
+        } else {
+            header("HTTP/1.1 403 Forbidden");
+            die('403 Forbidden');
+        }
+        if (isset($params['head']) && $params['head']) {
+            return;
+        }
+        if (!empty($rangeArray)) {
+            try {
+                if (count($rangeArray) == 1) {
+                $view->readfilePart($filename, $rangeArray[0]['from'], $rangeArray[0]['to']);
+                }
+                else {
+                // check if file is seekable (if not throw UnseekableException)
+                // we have to check it before body contents
+                $view->readfilePart($filename, $rangeArray[0]['size'], $rangeArray[0]['size']);
+
+                $type = \OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename));
+
+                foreach ($rangeArray as $range) {
+                    echo "\r\n--".self::getBoundary()."\r\n".
+                            "Content-type: ".$type."\r\n".
+                            "Content-range: bytes ".$range['from']."-".$range['to']."/".$range['size']."\r\n\r\n";
+                    $view->readfilePart($filename, $range['from'], $range['to']);
+                }
+                echo "\r\n--".self::getBoundary()."--\r\n";
+                }
+            } catch (\OCP\Files\UnseekableException $ex) {
+                // file is unseekable
+                header_remove('Accept-Ranges');
+                header_remove('Content-Range');
+                header("HTTP/1.1 200 OK");
+                self::sendHeaders($filename, $name, array());
+                $view->readfile($filename);
+            }
+        }
+        else {
+            $view->readfile($filename);
+        }
+    }
+
+    /**
+     * @param View $view
+     * @param string $dir
+     * @param string[]|string $files
+     */
+    public static function lockFiles($view, $dir, $files) {
+        if (!is_array($files)) {
+            $file = $dir . '/' . $files;
+            $files = [$file];
+        }
+        foreach ($files as $file) {
+            $file = $dir . '/' . $file;
+            $view->lockFile($file, ILockingProvider::LOCK_SHARED);
+            if ($view->is_dir($file)) {
+                $contents = $view->getDirectoryContent($file);
+                $contents = array_map(function($fileInfo) use ($file) {
+                    /** @var \OCP\Files\FileInfo $fileInfo */
+                    return $file . '/' . $fileInfo->getName();
+                }, $contents);
+                self::lockFiles($view, $dir, $contents);
+            }
+        }
+    }
+
+    /**
+     * set the maximum upload size limit for apache hosts using .htaccess
+     *
+     * @param int $size file size in bytes
+     * @param array $files override '.htaccess' and '.user.ini' locations
+     * @return bool|int false on failure, size on success
+     */
+    public static function setUploadLimit($size, $files = []) {
+        //don't allow user to break his config
+        $size = (int)$size;
+        if ($size < self::UPLOAD_MIN_LIMIT_BYTES) {
+            return false;
+        }
+        $size = OC_Helper::phpFileSize($size);
+
+        $phpValueKeys = array(
+            'upload_max_filesize',
+            'post_max_size'
+        );
+
+        // default locations if not overridden by $files
+        $files = array_merge([
+            '.htaccess' => OC::$SERVERROOT . '/.htaccess',
+            '.user.ini' => OC::$SERVERROOT . '/.user.ini'
+        ], $files);
+
+        $updateFiles = [
+            $files['.htaccess'] => [
+                'pattern' => '/php_value %1$s (\S)*/',
+                'setting' => 'php_value %1$s %2$s'
+            ],
+            $files['.user.ini'] => [
+                'pattern' => '/%1$s=(\S)*/',
+                'setting' => '%1$s=%2$s'
+            ]
+        ];
+
+        $success = true;
+
+        foreach ($updateFiles as $filename => $patternMap) {
+            // suppress warnings from fopen()
+            $handle = @fopen($filename, 'r+');
+            if (!$handle) {
+                \OCP\Util::writeLog('files',
+                    'Can\'t write upload limit to ' . $filename . '. Please check the file permissions',
+                    \OCP\Util::WARN);
+                $success = false;
+                continue; // try to update as many files as possible
+            }
+
+            $content = '';
+            while (!feof($handle)) {
+                $content .= fread($handle, 1000);
+            }
+
+            foreach ($phpValueKeys as $key) {
+                $pattern = vsprintf($patternMap['pattern'], [$key]);
+                $setting = vsprintf($patternMap['setting'], [$key, $size]);
+                $hasReplaced = 0;
+                $newContent = preg_replace($pattern, $setting, $content, 2, $hasReplaced);
+                if ($newContent !== null) {
+                    $content = $newContent;
+                }
+                if ($hasReplaced === 0) {
+                    $content .= "\n" . $setting;
+                }
+            }
+
+            // write file back
+            ftruncate($handle, 0);
+            rewind($handle);
+            fwrite($handle, $content);
+
+            fclose($handle);
+        }
+
+        if ($success) {
+            return OC_Helper::computerFileSize($size);
+        }
+        return false;
+    }
+
+    /**
+     * @param string $dir
+     * @param $files
+     * @param integer $getType
+     * @param View $view
+     * @param string $filename
+     */
+    private static function unlockAllTheFiles($dir, $files, $getType, $view, $filename) {
+        if ($getType === self::FILE) {
+            $view->unlockFile($filename, ILockingProvider::LOCK_SHARED);
+        }
+        if ($getType === self::ZIP_FILES) {
+            foreach ($files as $file) {
+                $file = $dir . '/' . $file;
+                $view->unlockFile($file, ILockingProvider::LOCK_SHARED);
+            }
+        }
+        if ($getType === self::ZIP_DIR) {
+            $file = $dir . '/' . $files;
+            $view->unlockFile($file, ILockingProvider::LOCK_SHARED);
+        }
+    }
 
 }

Spacing +24 added lines, -24 removed lines

@@ -75,7 +75,7 @@ 
 	private static function sendHeaders($filename, $name, array $rangeArray) {
 		OC_Response::setContentDispositionHeader($name, 'attachment');
 		header('Content-Transfer-Encoding: binary', true);
-		header('Pragma: public');// enable caching in IE
+		header('Pragma: public'); // enable caching in IE
 		header('Expires: 0');
 		header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
 		$fileSize = \OC\Files\Filesystem::filesize($filename);
@@ -119,7 +119,7 @@ 
 			}
 
 			if (!is_array($files)) {
-				$filename = $dir . '/' . $files;
+				$filename = $dir.'/'.$files;
 				if (!$view->is_dir($filename)) {
 					self::getSingleFile($view, $dir, $files, is_null($params) ? array() : $params);
 					return;
@@ -134,9 +134,9 @@ 
 					$name = $basename;
 				}
 
-				$filename = $dir . '/' . $name;
+				$filename = $dir.'/'.$name;
 			} else {
-				$filename = $dir . '/' . $files;
+				$filename = $dir.'/'.$files;
 				$getType = self::ZIP_DIR;
 				// downloading root ?
 				if ($files !== '') {
@@ -150,14 +150,14 @@ 
 			self::lockFiles($view, $dir, $files);
 
 			$streamer->sendHeaders($name);
-			$executionTime = (int)OC::$server->getIniWrapper()->getNumeric('max_execution_time');
+			$executionTime = (int) OC::$server->getIniWrapper()->getNumeric('max_execution_time');
 			if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
 				@set_time_limit(0);
 			}
 			ignore_user_abort(true);
 			if ($getType === self::ZIP_FILES) {
 				foreach ($files as $file) {
-					$file = $dir . '/' . $file;
+					$file = $dir.'/'.$file;
 					if (\OC\Files\Filesystem::is_file($file)) {
 						$fileSize = \OC\Files\Filesystem::filesize($file);
 						$fileTime = \OC\Files\Filesystem::filemtime($file);
@@ -169,7 +169,7 @@ 
 					}
 				}
 			} elseif ($getType === self::ZIP_DIR) {
-				$file = $dir . '/' . $files;
+				$file = $dir.'/'.$files;
 				$streamer->addDirRecursive($file);
 			}
 			$streamer->finalize();
@@ -201,7 +201,7 @@ 
 	 * @return array $rangeArray ('from'=>int,'to'=>int), ...
 	 */
 	private static function parseHttpRangeHeader($rangeHeaderPos, $fileSize) {
-		$rArray=explode(',', $rangeHeaderPos);
+		$rArray = explode(',', $rangeHeaderPos);
 		$minOffset = 0;
 		$ind = 0;
 
@@ -213,7 +213,7 @@ 
 				if ($ranges[0] < $minOffset) { // case: bytes=500-700,601-999
 					$ranges[0] = $minOffset;
 				}
-				if ($ind > 0 && $rangeArray[$ind-1]['to']+1 == $ranges[0]) { // case: bytes=500-600,601-999
+				if ($ind > 0 && $rangeArray[$ind - 1]['to'] + 1 == $ranges[0]) { // case: bytes=500-600,601-999
 					$ind--;
 					$ranges[0] = $rangeArray[$ind]['from'];
 				}
@@ -222,9 +222,9 @@ 
 			if (is_numeric($ranges[0]) && is_numeric($ranges[1]) && $ranges[0] < $fileSize && $ranges[0] <= $ranges[1]) {
 				// case: x-x
 				if ($ranges[1] >= $fileSize) {
-					$ranges[1] = $fileSize-1;
+					$ranges[1] = $fileSize - 1;
 				}
-				$rangeArray[$ind++] = array( 'from' => $ranges[0], 'to' => $ranges[1], 'size' => $fileSize );
+				$rangeArray[$ind++] = array('from' => $ranges[0], 'to' => $ranges[1], 'size' => $fileSize);
 				$minOffset = $ranges[1] + 1;
 				if ($minOffset >= $fileSize) {
 					break;
@@ -232,7 +232,7 @@ 
 			}
 			elseif (is_numeric($ranges[0]) && $ranges[0] < $fileSize) {
 				// case: x-
-				$rangeArray[$ind++] = array( 'from' => $ranges[0], 'to' => $fileSize-1, 'size' => $fileSize );
+				$rangeArray[$ind++] = array('from' => $ranges[0], 'to' => $fileSize - 1, 'size' => $fileSize);
 				break;
 			}
 			elseif (is_numeric($ranges[1])) {
@@ -240,7 +240,7 @@ 
 				if ($ranges[1] > $fileSize) {
 					$ranges[1] = $fileSize;
 				}
-				$rangeArray[$ind++] = array( 'from' => $fileSize-$ranges[1], 'to' => $fileSize-1, 'size' => $fileSize );
+				$rangeArray[$ind++] = array('from' => $fileSize - $ranges[1], 'to' => $fileSize - 1, 'size' => $fileSize);
 				break;
 			}
 		}
@@ -254,7 +254,7 @@ 
 	 * @param array $params ; 'head' boolean to only send header of the request ; 'range' http range header
 	 */
 	private static function getSingleFile($view, $dir, $name, $params) {
-		$filename = $dir . '/' . $name;
+		$filename = $dir.'/'.$name;
 		OC_Util::obEnd();
 		$view->lockFile($filename, ILockingProvider::LOCK_SHARED);
 		
@@ -320,17 +320,17 @@ 
 	 */
 	public static function lockFiles($view, $dir, $files) {
 		if (!is_array($files)) {
-			$file = $dir . '/' . $files;
+			$file = $dir.'/'.$files;
 			$files = [$file];
 		}
 		foreach ($files as $file) {
-			$file = $dir . '/' . $file;
+			$file = $dir.'/'.$file;
 			$view->lockFile($file, ILockingProvider::LOCK_SHARED);
 			if ($view->is_dir($file)) {
 				$contents = $view->getDirectoryContent($file);
 				$contents = array_map(function($fileInfo) use ($file) {
 					/** @var \OCP\Files\FileInfo $fileInfo */
-					return $file . '/' . $fileInfo->getName();
+					return $file.'/'.$fileInfo->getName();
 				}, $contents);
 				self::lockFiles($view, $dir, $contents);
 			}
@@ -346,7 +346,7 @@ 
 	 */
 	public static function setUploadLimit($size, $files = []) {
 		//don't allow user to break his config
-		$size = (int)$size;
+		$size = (int) $size;
 		if ($size < self::UPLOAD_MIN_LIMIT_BYTES) {
 			return false;
 		}
@@ -359,8 +359,8 @@ 
 
 		// default locations if not overridden by $files
 		$files = array_merge([
-			'.htaccess' => OC::$SERVERROOT . '/.htaccess',
-			'.user.ini' => OC::$SERVERROOT . '/.user.ini'
+			'.htaccess' => OC::$SERVERROOT.'/.htaccess',
+			'.user.ini' => OC::$SERVERROOT.'/.user.ini'
 		], $files);
 
 		$updateFiles = [
@@ -381,7 +381,7 @@ 
 			$handle = @fopen($filename, 'r+');
 			if (!$handle) {
 				\OCP\Util::writeLog('files',
-					'Can\'t write upload limit to ' . $filename . '. Please check the file permissions',
+					'Can\'t write upload limit to '.$filename.'. Please check the file permissions',
 					\OCP\Util::WARN);
 				$success = false;
 				continue; // try to update as many files as possible
@@ -401,7 +401,7 @@ 
 					$content = $newContent;
 				}
 				if ($hasReplaced === 0) {
-					$content .= "\n" . $setting;
+					$content .= "\n".$setting;
 				}
 			}
 
@@ -432,12 +432,12 @@ 
 		}
 		if ($getType === self::ZIP_FILES) {
 			foreach ($files as $file) {
-				$file = $dir . '/' . $file;
+				$file = $dir.'/'.$file;
 				$view->unlockFile($file, ILockingProvider::LOCK_SHARED);
 			}
 		}
 		if ($getType === self::ZIP_DIR) {
-			$file = $dir . '/' . $files;
+			$file = $dir.'/'.$files;
 			$view->unlockFile($file, ILockingProvider::LOCK_SHARED);
 		}
 	}

lib/private/legacy/filechunking.php

Indentation +152 added lines, -152 removed lines

@@ -30,156 +30,156 @@
 
 
 class OC_FileChunking {
-	protected $info;
-	protected $cache;
-
-	/**
-	 * TTL of chunks
-	 *
-	 * @var int
-	 */
-	protected $ttl;
-
-	static public function decodeName($name) {
-		preg_match('/(?P<name>.*)-chunking-(?P<transferid>\d+)-(?P<chunkcount>\d+)-(?P<index>\d+)/', $name, $matches);
-		return $matches;
-	}
-
-	/**
-	 * @param string[] $info
-	 */
-	public function __construct($info) {
-		$this->info = $info;
-		$this->ttl = \OC::$server->getConfig()->getSystemValue('cache_chunk_gc_ttl', 86400);
-	}
-
-	public function getPrefix() {
-		$name = $this->info['name'];
-		$transferid = $this->info['transferid'];
-
-		return $name.'-chunking-'.$transferid.'-';
-	}
-
-	protected function getCache() {
-		if (!isset($this->cache)) {
-			$this->cache = new \OC\Cache\File();
-		}
-		return $this->cache;
-	}
-
-	/**
-	 * Stores the given $data under the given $key - the number of stored bytes is returned
-	 *
-	 * @param string $index
-	 * @param resource $data
-	 * @return int
-	 */
-	public function store($index, $data) {
-		$cache = $this->getCache();
-		$name = $this->getPrefix().$index;
-		$cache->set($name, $data, $this->ttl);
-
-		return $cache->size($name);
-	}
-
-	public function isComplete() {
-		$prefix = $this->getPrefix();
-		$cache = $this->getCache();
-		$chunkcount = (int)$this->info['chunkcount'];
-
-		for($i=($chunkcount-1); $i >= 0; $i--) {
-			if (!$cache->hasKey($prefix.$i)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Assembles the chunks into the file specified by the path.
-	 * Chunks are deleted afterwards.
-	 *
-	 * @param resource $f target path
-	 *
-	 * @return integer assembled file size
-	 *
-	 * @throws \OC\InsufficientStorageException when file could not be fully
-	 * assembled due to lack of free space
-	 */
-	public function assemble($f) {
-		$cache = $this->getCache();
-		$prefix = $this->getPrefix();
-		$count = 0;
-		for ($i = 0; $i < $this->info['chunkcount']; $i++) {
-			$chunk = $cache->get($prefix.$i);
-			// remove after reading to directly save space
-			$cache->remove($prefix.$i);
-			$count += fwrite($f, $chunk);
-			// let php release the memory to work around memory exhausted error with php 5.6
-			$chunk = null;
-		}
-
-		return $count;
-	}
-
-	/**
-	 * Returns the size of the chunks already present
-	 * @return integer size in bytes
-	 */
-	public function getCurrentSize() {
-		$cache = $this->getCache();
-		$prefix = $this->getPrefix();
-		$total = 0;
-		for ($i = 0; $i < $this->info['chunkcount']; $i++) {
-			$total += $cache->size($prefix.$i);
-		}
-		return $total;
-	}
-
-	/**
-	 * Removes all chunks which belong to this transmission
-	 */
-	public function cleanup() {
-		$cache = $this->getCache();
-		$prefix = $this->getPrefix();
-		for($i=0; $i < $this->info['chunkcount']; $i++) {
-			$cache->remove($prefix.$i);
-		}
-	}
-
-	/**
-	 * Removes one specific chunk
-	 * @param string $index
-	 */
-	public function remove($index) {
-		$cache = $this->getCache();
-		$prefix = $this->getPrefix();
-		$cache->remove($prefix.$index);
-	}
-
-	/**
-	 * Assembles the chunks into the file specified by the path.
-	 * Also triggers the relevant hooks and proxies.
-	 *
-	 * @param \OC\Files\Storage\Storage $storage storage
-	 * @param string $path target path relative to the storage
-	 * @return bool true on success or false if file could not be created
-	 *
-	 * @throws \OC\ServerNotAvailableException
-	 */
-	public function file_assemble($storage, $path) {
-		// use file_put_contents as method because that best matches what this function does
-		if (\OC\Files\Filesystem::isValidPath($path)) {
-			$target = $storage->fopen($path, 'w');
-			if ($target) {
-				$count = $this->assemble($target);
-				fclose($target);
-				return $count > 0;
-			} else {
-				return false;
-			}
-		}
-		return false;
-	}
+    protected $info;
+    protected $cache;
+
+    /**
+     * TTL of chunks
+     *
+     * @var int
+     */
+    protected $ttl;
+
+    static public function decodeName($name) {
+        preg_match('/(?P<name>.*)-chunking-(?P<transferid>\d+)-(?P<chunkcount>\d+)-(?P<index>\d+)/', $name, $matches);
+        return $matches;
+    }
+
+    /**
+     * @param string[] $info
+     */
+    public function __construct($info) {
+        $this->info = $info;
+        $this->ttl = \OC::$server->getConfig()->getSystemValue('cache_chunk_gc_ttl', 86400);
+    }
+
+    public function getPrefix() {
+        $name = $this->info['name'];
+        $transferid = $this->info['transferid'];
+
+        return $name.'-chunking-'.$transferid.'-';
+    }
+
+    protected function getCache() {
+        if (!isset($this->cache)) {
+            $this->cache = new \OC\Cache\File();
+        }
+        return $this->cache;
+    }
+
+    /**
+     * Stores the given $data under the given $key - the number of stored bytes is returned
+     *
+     * @param string $index
+     * @param resource $data
+     * @return int
+     */
+    public function store($index, $data) {
+        $cache = $this->getCache();
+        $name = $this->getPrefix().$index;
+        $cache->set($name, $data, $this->ttl);
+
+        return $cache->size($name);
+    }
+
+    public function isComplete() {
+        $prefix = $this->getPrefix();
+        $cache = $this->getCache();
+        $chunkcount = (int)$this->info['chunkcount'];
+
+        for($i=($chunkcount-1); $i >= 0; $i--) {
+            if (!$cache->hasKey($prefix.$i)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Assembles the chunks into the file specified by the path.
+     * Chunks are deleted afterwards.
+     *
+     * @param resource $f target path
+     *
+     * @return integer assembled file size
+     *
+     * @throws \OC\InsufficientStorageException when file could not be fully
+     * assembled due to lack of free space
+     */
+    public function assemble($f) {
+        $cache = $this->getCache();
+        $prefix = $this->getPrefix();
+        $count = 0;
+        for ($i = 0; $i < $this->info['chunkcount']; $i++) {
+            $chunk = $cache->get($prefix.$i);
+            // remove after reading to directly save space
+            $cache->remove($prefix.$i);
+            $count += fwrite($f, $chunk);
+            // let php release the memory to work around memory exhausted error with php 5.6
+            $chunk = null;
+        }
+
+        return $count;
+    }
+
+    /**
+     * Returns the size of the chunks already present
+     * @return integer size in bytes
+     */
+    public function getCurrentSize() {
+        $cache = $this->getCache();
+        $prefix = $this->getPrefix();
+        $total = 0;
+        for ($i = 0; $i < $this->info['chunkcount']; $i++) {
+            $total += $cache->size($prefix.$i);
+        }
+        return $total;
+    }
+
+    /**
+     * Removes all chunks which belong to this transmission
+     */
+    public function cleanup() {
+        $cache = $this->getCache();
+        $prefix = $this->getPrefix();
+        for($i=0; $i < $this->info['chunkcount']; $i++) {
+            $cache->remove($prefix.$i);
+        }
+    }
+
+    /**
+     * Removes one specific chunk
+     * @param string $index
+     */
+    public function remove($index) {
+        $cache = $this->getCache();
+        $prefix = $this->getPrefix();
+        $cache->remove($prefix.$index);
+    }
+
+    /**
+     * Assembles the chunks into the file specified by the path.
+     * Also triggers the relevant hooks and proxies.
+     *
+     * @param \OC\Files\Storage\Storage $storage storage
+     * @param string $path target path relative to the storage
+     * @return bool true on success or false if file could not be created
+     *
+     * @throws \OC\ServerNotAvailableException
+     */
+    public function file_assemble($storage, $path) {
+        // use file_put_contents as method because that best matches what this function does
+        if (\OC\Files\Filesystem::isValidPath($path)) {
+            $target = $storage->fopen($path, 'w');
+            if ($target) {
+                $count = $this->assemble($target);
+                fclose($target);
+                return $count > 0;
+            } else {
+                return false;
+            }
+        }
+        return false;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -85,9 +85,9 @@ 
 	public function isComplete() {
 		$prefix = $this->getPrefix();
 		$cache = $this->getCache();
-		$chunkcount = (int)$this->info['chunkcount'];
+		$chunkcount = (int) $this->info['chunkcount'];
 
-		for($i=($chunkcount-1); $i >= 0; $i--) {
+		for ($i = ($chunkcount - 1); $i >= 0; $i--) {
 			if (!$cache->hasKey($prefix.$i)) {
 				return false;
 			}
@@ -143,7 +143,7 @@ 
 	public function cleanup() {
 		$cache = $this->getCache();
 		$prefix = $this->getPrefix();
-		for($i=0; $i < $this->info['chunkcount']; $i++) {
+		for ($i = 0; $i < $this->info['chunkcount']; $i++) {
 			$cache->remove($prefix.$i);
 		}
 	}

lib/private/legacy/hook.php

Indentation +103 added lines, -103 removed lines

@@ -29,118 +29,118 @@
  *
  */
 class OC_Hook{
-	public static $thrownExceptions = [];
+    public static $thrownExceptions = [];
 
-	static private $registered = array();
+    static private $registered = array();
 
-	/**
-	 * connects a function to a hook
-	 *
-	 * @param string $signalClass class name of emitter
-	 * @param string $signalName name of signal
-	 * @param string|object $slotClass class name of slot
-	 * @param string $slotName name of slot
-	 * @return bool
-	 *
-	 * This function makes it very easy to connect to use hooks.
-	 *
-	 * TODO: write example
-	 */
-	static public function connect($signalClass, $signalName, $slotClass, $slotName ) {
-		// If we're trying to connect to an emitting class that isn't
-		// yet registered, register it
-		if( !array_key_exists($signalClass, self::$registered )) {
-			self::$registered[$signalClass] = array();
-		}
-		// If we're trying to connect to an emitting method that isn't
-		// yet registered, register it with the emitting class
-		if( !array_key_exists( $signalName, self::$registered[$signalClass] )) {
-			self::$registered[$signalClass][$signalName] = array();
-		}
+    /**
+     * connects a function to a hook
+     *
+     * @param string $signalClass class name of emitter
+     * @param string $signalName name of signal
+     * @param string|object $slotClass class name of slot
+     * @param string $slotName name of slot
+     * @return bool
+     *
+     * This function makes it very easy to connect to use hooks.
+     *
+     * TODO: write example
+     */
+    static public function connect($signalClass, $signalName, $slotClass, $slotName ) {
+        // If we're trying to connect to an emitting class that isn't
+        // yet registered, register it
+        if( !array_key_exists($signalClass, self::$registered )) {
+            self::$registered[$signalClass] = array();
+        }
+        // If we're trying to connect to an emitting method that isn't
+        // yet registered, register it with the emitting class
+        if( !array_key_exists( $signalName, self::$registered[$signalClass] )) {
+            self::$registered[$signalClass][$signalName] = array();
+        }
 
-		// don't connect hooks twice
-		foreach (self::$registered[$signalClass][$signalName] as $hook) {
-			if ($hook['class'] === $slotClass and $hook['name'] === $slotName) {
-				return false;
-			}
-		}
-		// Connect the hook handler to the requested emitter
-		self::$registered[$signalClass][$signalName][] = array(
-				"class" => $slotClass,
-				"name" => $slotName
-		);
+        // don't connect hooks twice
+        foreach (self::$registered[$signalClass][$signalName] as $hook) {
+            if ($hook['class'] === $slotClass and $hook['name'] === $slotName) {
+                return false;
+            }
+        }
+        // Connect the hook handler to the requested emitter
+        self::$registered[$signalClass][$signalName][] = array(
+                "class" => $slotClass,
+                "name" => $slotName
+        );
 
-		// No chance for failure ;-)
-		return true;
-	}
+        // No chance for failure ;-)
+        return true;
+    }
 
-	/**
-	 * emits a signal
-	 *
-	 * @param string $signalClass class name of emitter
-	 * @param string $signalName name of signal
-	 * @param mixed $params default: array() array with additional data
-	 * @return bool true if slots exists or false if not
-	 * @throws \OC\HintException
-	 * @throws \OC\ServerNotAvailableException Emits a signal. To get data from the slot use references!
-	 *
-	 * TODO: write example
-	 */
-	static public function emit($signalClass, $signalName, $params = []) {
+    /**
+     * emits a signal
+     *
+     * @param string $signalClass class name of emitter
+     * @param string $signalName name of signal
+     * @param mixed $params default: array() array with additional data
+     * @return bool true if slots exists or false if not
+     * @throws \OC\HintException
+     * @throws \OC\ServerNotAvailableException Emits a signal. To get data from the slot use references!
+     *
+     * TODO: write example
+     */
+    static public function emit($signalClass, $signalName, $params = []) {
 
-		// Return false if no hook handlers are listening to this
-		// emitting class
-		if( !array_key_exists($signalClass, self::$registered )) {
-			return false;
-		}
+        // Return false if no hook handlers are listening to this
+        // emitting class
+        if( !array_key_exists($signalClass, self::$registered )) {
+            return false;
+        }
 
-		// Return false if no hook handlers are listening to this
-		// emitting method
-		if( !array_key_exists( $signalName, self::$registered[$signalClass] )) {
-			return false;
-		}
+        // Return false if no hook handlers are listening to this
+        // emitting method
+        if( !array_key_exists( $signalName, self::$registered[$signalClass] )) {
+            return false;
+        }
 
-		// Call all slots
-		foreach( self::$registered[$signalClass][$signalName] as $i ) {
-			try {
-				call_user_func( array( $i["class"], $i["name"] ), $params );
-			} catch (Exception $e){
-				self::$thrownExceptions[] = $e;
-				\OC::$server->getLogger()->logException($e);
-				if($e instanceof \OC\HintException) {
-					throw $e;
-				}
-				if($e instanceof \OC\ServerNotAvailableException) {
-					throw $e;
-				}
-			}
-		}
+        // Call all slots
+        foreach( self::$registered[$signalClass][$signalName] as $i ) {
+            try {
+                call_user_func( array( $i["class"], $i["name"] ), $params );
+            } catch (Exception $e){
+                self::$thrownExceptions[] = $e;
+                \OC::$server->getLogger()->logException($e);
+                if($e instanceof \OC\HintException) {
+                    throw $e;
+                }
+                if($e instanceof \OC\ServerNotAvailableException) {
+                    throw $e;
+                }
+            }
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * clear hooks
-	 * @param string $signalClass
-	 * @param string $signalName
-	 */
-	static public function clear($signalClass='', $signalName='') {
-		if ($signalClass) {
-			if ($signalName) {
-				self::$registered[$signalClass][$signalName]=array();
-			}else{
-				self::$registered[$signalClass]=array();
-			}
-		}else{
-			self::$registered=array();
-		}
-	}
+    /**
+     * clear hooks
+     * @param string $signalClass
+     * @param string $signalName
+     */
+    static public function clear($signalClass='', $signalName='') {
+        if ($signalClass) {
+            if ($signalName) {
+                self::$registered[$signalClass][$signalName]=array();
+            }else{
+                self::$registered[$signalClass]=array();
+            }
+        }else{
+            self::$registered=array();
+        }
+    }
 
-	/**
-	 * DO NOT USE!
-	 * For unit tests ONLY!
-	 */
-	static public function getHooks() {
-		return self::$registered;
-	}
+    /**
+     * DO NOT USE!
+     * For unit tests ONLY!
+     */
+    static public function getHooks() {
+        return self::$registered;
+    }
 }

Spacing +17 added lines, -17 removed lines

@@ -28,7 +28,7 @@ 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-class OC_Hook{
+class OC_Hook {
 	public static $thrownExceptions = [];
 
 	static private $registered = array();
@@ -46,15 +46,15 @@ 
 	 *
 	 * TODO: write example
 	 */
-	static public function connect($signalClass, $signalName, $slotClass, $slotName ) {
+	static public function connect($signalClass, $signalName, $slotClass, $slotName) {
 		// If we're trying to connect to an emitting class that isn't
 		// yet registered, register it
-		if( !array_key_exists($signalClass, self::$registered )) {
+		if (!array_key_exists($signalClass, self::$registered)) {
 			self::$registered[$signalClass] = array();
 		}
 		// If we're trying to connect to an emitting method that isn't
 		// yet registered, register it with the emitting class
-		if( !array_key_exists( $signalName, self::$registered[$signalClass] )) {
+		if (!array_key_exists($signalName, self::$registered[$signalClass])) {
 			self::$registered[$signalClass][$signalName] = array();
 		}
 
@@ -90,27 +90,27 @@ 
 
 		// Return false if no hook handlers are listening to this
 		// emitting class
-		if( !array_key_exists($signalClass, self::$registered )) {
+		if (!array_key_exists($signalClass, self::$registered)) {
 			return false;
 		}
 
 		// Return false if no hook handlers are listening to this
 		// emitting method
-		if( !array_key_exists( $signalName, self::$registered[$signalClass] )) {
+		if (!array_key_exists($signalName, self::$registered[$signalClass])) {
 			return false;
 		}
 
 		// Call all slots
-		foreach( self::$registered[$signalClass][$signalName] as $i ) {
+		foreach (self::$registered[$signalClass][$signalName] as $i) {
 			try {
-				call_user_func( array( $i["class"], $i["name"] ), $params );
-			} catch (Exception $e){
+				call_user_func(array($i["class"], $i["name"]), $params);
+			} catch (Exception $e) {
 				self::$thrownExceptions[] = $e;
 				\OC::$server->getLogger()->logException($e);
-				if($e instanceof \OC\HintException) {
+				if ($e instanceof \OC\HintException) {
 					throw $e;
 				}
-				if($e instanceof \OC\ServerNotAvailableException) {
+				if ($e instanceof \OC\ServerNotAvailableException) {
 					throw $e;
 				}
 			}
@@ -124,15 +124,15 @@ 
 	 * @param string $signalClass
 	 * @param string $signalName
 	 */
-	static public function clear($signalClass='', $signalName='') {
+	static public function clear($signalClass = '', $signalName = '') {
 		if ($signalClass) {
 			if ($signalName) {
-				self::$registered[$signalClass][$signalName]=array();
-			}else{
-				self::$registered[$signalClass]=array();
+				self::$registered[$signalClass][$signalName] = array();
+			} else {
+				self::$registered[$signalClass] = array();
 			}
-		}else{
-			self::$registered=array();
+		} else {
+			self::$registered = array();
 		}
 	}
 

Braces +2 added lines, -2 removed lines

@@ -128,10 +128,10 @@
 		if ($signalClass) {
 			if ($signalName) {
 				self::$registered[$signalClass][$signalName]=array();
-			}else{
+			} else{
 				self::$registered[$signalClass]=array();
 			}
-		}else{
+		} else{
 			self::$registered=array();
 		}
 	}