nextcloud / server

lib/public/AppFramework/OCS/OCSBadRequestException.php

Indentation +10 added lines, -10 removed lines

@@ -32,14 +32,14 @@
  * @since 9.1.0
  */
 class OCSBadRequestException extends OCSException {
-	/**
-	 * OCSBadRequestException constructor.
-	 *
-	 * @param string $message
-	 * @param Exception|null $previous
-	 * @since 9.1.0
-	 */
-	public function __construct($message = '', Exception $previous = null) {
-		parent::__construct($message, Http::STATUS_BAD_REQUEST, $previous);
-	}
+    /**
+     * OCSBadRequestException constructor.
+     *
+     * @param string $message
+     * @param Exception|null $previous
+     * @since 9.1.0
+     */
+    public function __construct($message = '', Exception $previous = null) {
+        parent::__construct($message, Http::STATUS_BAD_REQUEST, $previous);
+    }
 }

lib/public/AppFramework/Http/FileDisplayResponse.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
 		$this->file = $file;
 		$this->setStatus($statusCode);
 		$this->setHeaders(array_merge($this->getHeaders(), $headers));
-		$this->addHeader('Content-Disposition', 'inline; filename="' . rawurldecode($file->getName()) . '"');
+		$this->addHeader('Content-Disposition', 'inline; filename="'.rawurldecode($file->getName()).'"');
 
 		$this->setETag($file->getEtag());
 		$lastModified = new \DateTime();
@@ -65,7 +65,7 @@ 
 	 */
 	public function callback(IOutput $output) {
 		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
-			$output->setHeader('Content-Length: ' . $this->file->getSize());
+			$output->setHeader('Content-Length: '.$this->file->getSize());
 			$output->setOutput($this->file->getContent());
 		}
 	}

Indentation +32 added lines, -32 removed lines

@@ -32,40 +32,40 @@
  */
 class FileDisplayResponse extends Response implements ICallbackResponse {
 
-	/** @var \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile */
-	private $file;
+    /** @var \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile */
+    private $file;
 
-	/**
-	 * FileDisplayResponse constructor.
-	 *
-	 * @param \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile $file
-	 * @param int $statusCode
-	 * @param array $headers
-	 * @since 11.0.0
-	 */
-	public function __construct($file, $statusCode = Http::STATUS_OK,
-								$headers = []) {
-		parent::__construct();
+    /**
+     * FileDisplayResponse constructor.
+     *
+     * @param \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile $file
+     * @param int $statusCode
+     * @param array $headers
+     * @since 11.0.0
+     */
+    public function __construct($file, $statusCode = Http::STATUS_OK,
+                                $headers = []) {
+        parent::__construct();
 
-		$this->file = $file;
-		$this->setStatus($statusCode);
-		$this->setHeaders(array_merge($this->getHeaders(), $headers));
-		$this->addHeader('Content-Disposition', 'inline; filename="' . rawurldecode($file->getName()) . '"');
+        $this->file = $file;
+        $this->setStatus($statusCode);
+        $this->setHeaders(array_merge($this->getHeaders(), $headers));
+        $this->addHeader('Content-Disposition', 'inline; filename="' . rawurldecode($file->getName()) . '"');
 
-		$this->setETag($file->getEtag());
-		$lastModified = new \DateTime();
-		$lastModified->setTimestamp($file->getMTime());
-		$this->setLastModified($lastModified);
-	}
+        $this->setETag($file->getEtag());
+        $lastModified = new \DateTime();
+        $lastModified->setTimestamp($file->getMTime());
+        $this->setLastModified($lastModified);
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @since 11.0.0
-	 */
-	public function callback(IOutput $output) {
-		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
-			$output->setHeader('Content-Length: ' . $this->file->getSize());
-			$output->setOutput($this->file->getContent());
-		}
-	}
+    /**
+     * @param IOutput $output
+     * @since 11.0.0
+     */
+    public function callback(IOutput $output) {
+        if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
+            $output->setHeader('Content-Length: ' . $this->file->getSize());
+            $output->setOutput($this->file->getContent());
+        }
+    }
 }

lib/public/AppFramework/Http/DownloadResponse.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 		$this->filename = $filename;
 		$this->contentType = $contentType;
 
-		$this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
+		$this->addHeader('Content-Disposition', 'attachment; filename="'.$filename.'"');
 		$this->addHeader('Content-Type', $contentType);
 	}
 }

Indentation +15 added lines, -15 removed lines

@@ -30,22 +30,22 @@
  * @since 7.0.0
  */
 class DownloadResponse extends Response {
-	private $filename;
-	private $contentType;
+    private $filename;
+    private $contentType;
 
-	/**
-	 * Creates a response that prompts the user to download the file
-	 * @param string $filename the name that the downloaded file should have
-	 * @param string $contentType the mimetype that the downloaded file should have
-	 * @since 7.0.0
-	 */
-	public function __construct($filename, $contentType) {
-		parent::__construct();
+    /**
+     * Creates a response that prompts the user to download the file
+     * @param string $filename the name that the downloaded file should have
+     * @param string $contentType the mimetype that the downloaded file should have
+     * @since 7.0.0
+     */
+    public function __construct($filename, $contentType) {
+        parent::__construct();
 
-		$this->filename = $filename;
-		$this->contentType = $contentType;
+        $this->filename = $filename;
+        $this->contentType = $contentType;
 
-		$this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
-		$this->addHeader('Content-Type', $contentType);
-	}
+        $this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
+        $this->addHeader('Content-Type', $contentType);
+    }
 }

lib/public/AppFramework/Http/JSONResponse.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 	public function render() {
 		$response = json_encode($this->data, JSON_HEX_TAG);
 		if ($response === false) {
-			throw new \Exception(sprintf('Could not json_encode due to invalid ' .
+			throw new \Exception(sprintf('Could not json_encode due to invalid '.
 				'non UTF-8 characters in the array: %s', var_export($this->data, true)));
 		}
 

Indentation +50 added lines, -50 removed lines

@@ -41,64 +41,64 @@
  */
 class JSONResponse extends Response {
 
-	/**
-	 * response data
-	 * @var array|object
-	 */
-	protected $data;
+    /**
+     * response data
+     * @var array|object
+     */
+    protected $data;
 
 
-	/**
-	 * constructor of JSONResponse
-	 * @param array|object $data the object or array that should be transformed
-	 * @param int $statusCode the Http status code, defaults to 200
-	 * @since 6.0.0
-	 */
-	public function __construct($data = [], $statusCode = Http::STATUS_OK) {
-		parent::__construct();
+    /**
+     * constructor of JSONResponse
+     * @param array|object $data the object or array that should be transformed
+     * @param int $statusCode the Http status code, defaults to 200
+     * @since 6.0.0
+     */
+    public function __construct($data = [], $statusCode = Http::STATUS_OK) {
+        parent::__construct();
 
-		$this->data = $data;
-		$this->setStatus($statusCode);
-		$this->addHeader('Content-Type', 'application/json; charset=utf-8');
-	}
+        $this->data = $data;
+        $this->setStatus($statusCode);
+        $this->addHeader('Content-Type', 'application/json; charset=utf-8');
+    }
 
 
-	/**
-	 * Returns the rendered json
-	 * @return string the rendered json
-	 * @since 6.0.0
-	 * @throws \Exception If data could not get encoded
-	 */
-	public function render() {
-		$response = json_encode($this->data, JSON_HEX_TAG);
-		if ($response === false) {
-			throw new \Exception(sprintf('Could not json_encode due to invalid ' .
-				'non UTF-8 characters in the array: %s', var_export($this->data, true)));
-		}
+    /**
+     * Returns the rendered json
+     * @return string the rendered json
+     * @since 6.0.0
+     * @throws \Exception If data could not get encoded
+     */
+    public function render() {
+        $response = json_encode($this->data, JSON_HEX_TAG);
+        if ($response === false) {
+            throw new \Exception(sprintf('Could not json_encode due to invalid ' .
+                'non UTF-8 characters in the array: %s', var_export($this->data, true)));
+        }
 
-		return $response;
-	}
+        return $response;
+    }
 
-	/**
-	 * Sets values in the data json array
-	 * @param array|object $data an array or object which will be transformed
-	 *                             to JSON
-	 * @return JSONResponse Reference to this object
-	 * @since 6.0.0 - return value was added in 7.0.0
-	 */
-	public function setData($data) {
-		$this->data = $data;
+    /**
+     * Sets values in the data json array
+     * @param array|object $data an array or object which will be transformed
+     *                             to JSON
+     * @return JSONResponse Reference to this object
+     * @since 6.0.0 - return value was added in 7.0.0
+     */
+    public function setData($data) {
+        $this->data = $data;
 
-		return $this;
-	}
+        return $this;
+    }
 
 
-	/**
-	 * Used to get the set parameters
-	 * @return array the data
-	 * @since 6.0.0
-	 */
-	public function getData() {
-		return $this->data;
-	}
+    /**
+     * Used to get the set parameters
+     * @return array the data
+     * @since 6.0.0
+     */
+    public function getData() {
+        return $this->data;
+    }
 }

lib/private/Archive/ZIP.php

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
 			$result = $this->zip->addFromString($path, $source);
 		}
 		if ($result) {
-			$this->zip->close();//close and reopen to save the zip
+			$this->zip->close(); //close and reopen to save the zip
 			$this->zip->open($this->path);
 		}
 		return $result;
@@ -130,7 +130,7 @@ 
 	public function getFiles() {
 		$fileCount = $this->zip->numFiles;
 		$files = [];
-		for ($i = 0;$i < $fileCount;$i++) {
+		for ($i = 0; $i < $fileCount; $i++) {
 			$files[] = $this->zip->getNameIndex($i);
 		}
 		return $files;
@@ -204,7 +204,7 @@ 
 				$this->extractFile($path, $tmpFile);
 			}
 			$handle = fopen($tmpFile, $mode);
-			return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+			return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
 				$this->writeBack($tmpFile, $path);
 			});
 		}

Indentation +192 added lines, -192 removed lines

@@ -36,199 +36,199 @@
 use OCP\ILogger;
 
 class ZIP extends Archive {
-	/**
-	 * @var \ZipArchive zip
-	 */
-	private $zip = null;
-	private $path;
+    /**
+     * @var \ZipArchive zip
+     */
+    private $zip = null;
+    private $path;
 
-	/**
-	 * @param string $source
-	 */
-	public function __construct($source) {
-		$this->path = $source;
-		$this->zip = new \ZipArchive();
-		if ($this->zip->open($source, \ZipArchive::CREATE)) {
-		} else {
-			\OCP\Util::writeLog('files_archive', 'Error while opening archive '.$source, ILogger::WARN);
-		}
-	}
-	/**
-	 * add an empty folder to the archive
-	 * @param string $path
-	 * @return bool
-	 */
-	public function addFolder($path) {
-		return $this->zip->addEmptyDir($path);
-	}
-	/**
-	 * add a file to the archive
-	 * @param string $path
-	 * @param string $source either a local file or string data
-	 * @return bool
-	 */
-	public function addFile($path, $source = '') {
-		if ($source and $source[0] == '/' and file_exists($source)) {
-			$result = $this->zip->addFile($source, $path);
-		} else {
-			$result = $this->zip->addFromString($path, $source);
-		}
-		if ($result) {
-			$this->zip->close();//close and reopen to save the zip
-			$this->zip->open($this->path);
-		}
-		return $result;
-	}
-	/**
-	 * rename a file or folder in the archive
-	 * @param string $source
-	 * @param string $dest
-	 * @return boolean|null
-	 */
-	public function rename($source, $dest) {
-		$source = $this->stripPath($source);
-		$dest = $this->stripPath($dest);
-		$this->zip->renameName($source, $dest);
-	}
-	/**
-	 * get the uncompressed size of a file in the archive
-	 * @param string $path
-	 * @return int
-	 */
-	public function filesize($path) {
-		$stat = $this->zip->statName($path);
-		return $stat['size'];
-	}
-	/**
-	 * get the last modified time of a file in the archive
-	 * @param string $path
-	 * @return int
-	 */
-	public function mtime($path) {
-		return filemtime($this->path);
-	}
-	/**
-	 * get the files in a folder
-	 * @param string $path
-	 * @return array
-	 */
-	public function getFolder($path) {
-		$files = $this->getFiles();
-		$folderContent = [];
-		$pathLength = strlen($path);
-		foreach ($files as $file) {
-			if (substr($file, 0, $pathLength) == $path and $file != $path) {
-				if (strrpos(substr($file, 0, -1), '/') <= $pathLength) {
-					$folderContent[] = substr($file, $pathLength);
-				}
-			}
-		}
-		return $folderContent;
-	}
-	/**
-	 * get all files in the archive
-	 * @return array
-	 */
-	public function getFiles() {
-		$fileCount = $this->zip->numFiles;
-		$files = [];
-		for ($i = 0;$i < $fileCount;$i++) {
-			$files[] = $this->zip->getNameIndex($i);
-		}
-		return $files;
-	}
-	/**
-	 * get the content of a file
-	 * @param string $path
-	 * @return string
-	 */
-	public function getFile($path) {
-		return $this->zip->getFromName($path);
-	}
-	/**
-	 * extract a single file from the archive
-	 * @param string $path
-	 * @param string $dest
-	 * @return boolean|null
-	 */
-	public function extractFile($path, $dest) {
-		$fp = $this->zip->getStream($path);
-		file_put_contents($dest, $fp);
-	}
-	/**
-	 * extract the archive
-	 * @param string $dest
-	 * @return bool
-	 */
-	public function extract($dest) {
-		return $this->zip->extractTo($dest);
-	}
-	/**
-	 * check if a file or folder exists in the archive
-	 * @param string $path
-	 * @return bool
-	 */
-	public function fileExists($path) {
-		return ($this->zip->locateName($path) !== false) or ($this->zip->locateName($path.'/') !== false);
-	}
-	/**
-	 * remove a file or folder from the archive
-	 * @param string $path
-	 * @return bool
-	 */
-	public function remove($path) {
-		if ($this->fileExists($path.'/')) {
-			return $this->zip->deleteName($path.'/');
-		} else {
-			return $this->zip->deleteName($path);
-		}
-	}
-	/**
-	 * get a file handler
-	 * @param string $path
-	 * @param string $mode
-	 * @return bool|resource
-	 */
-	public function getStream($path, $mode) {
-		if ($mode == 'r' or $mode == 'rb') {
-			return $this->zip->getStream($path);
-		} else {
-			//since we can't directly get a writable stream,
-			//make a temp copy of the file and put it back
-			//in the archive when the stream is closed
-			if (strrpos($path, '.') !== false) {
-				$ext = substr($path, strrpos($path, '.'));
-			} else {
-				$ext = '';
-			}
-			$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
-			if ($this->fileExists($path)) {
-				$this->extractFile($path, $tmpFile);
-			}
-			$handle = fopen($tmpFile, $mode);
-			return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
-				$this->writeBack($tmpFile, $path);
-			});
-		}
-	}
+    /**
+     * @param string $source
+     */
+    public function __construct($source) {
+        $this->path = $source;
+        $this->zip = new \ZipArchive();
+        if ($this->zip->open($source, \ZipArchive::CREATE)) {
+        } else {
+            \OCP\Util::writeLog('files_archive', 'Error while opening archive '.$source, ILogger::WARN);
+        }
+    }
+    /**
+     * add an empty folder to the archive
+     * @param string $path
+     * @return bool
+     */
+    public function addFolder($path) {
+        return $this->zip->addEmptyDir($path);
+    }
+    /**
+     * add a file to the archive
+     * @param string $path
+     * @param string $source either a local file or string data
+     * @return bool
+     */
+    public function addFile($path, $source = '') {
+        if ($source and $source[0] == '/' and file_exists($source)) {
+            $result = $this->zip->addFile($source, $path);
+        } else {
+            $result = $this->zip->addFromString($path, $source);
+        }
+        if ($result) {
+            $this->zip->close();//close and reopen to save the zip
+            $this->zip->open($this->path);
+        }
+        return $result;
+    }
+    /**
+     * rename a file or folder in the archive
+     * @param string $source
+     * @param string $dest
+     * @return boolean|null
+     */
+    public function rename($source, $dest) {
+        $source = $this->stripPath($source);
+        $dest = $this->stripPath($dest);
+        $this->zip->renameName($source, $dest);
+    }
+    /**
+     * get the uncompressed size of a file in the archive
+     * @param string $path
+     * @return int
+     */
+    public function filesize($path) {
+        $stat = $this->zip->statName($path);
+        return $stat['size'];
+    }
+    /**
+     * get the last modified time of a file in the archive
+     * @param string $path
+     * @return int
+     */
+    public function mtime($path) {
+        return filemtime($this->path);
+    }
+    /**
+     * get the files in a folder
+     * @param string $path
+     * @return array
+     */
+    public function getFolder($path) {
+        $files = $this->getFiles();
+        $folderContent = [];
+        $pathLength = strlen($path);
+        foreach ($files as $file) {
+            if (substr($file, 0, $pathLength) == $path and $file != $path) {
+                if (strrpos(substr($file, 0, -1), '/') <= $pathLength) {
+                    $folderContent[] = substr($file, $pathLength);
+                }
+            }
+        }
+        return $folderContent;
+    }
+    /**
+     * get all files in the archive
+     * @return array
+     */
+    public function getFiles() {
+        $fileCount = $this->zip->numFiles;
+        $files = [];
+        for ($i = 0;$i < $fileCount;$i++) {
+            $files[] = $this->zip->getNameIndex($i);
+        }
+        return $files;
+    }
+    /**
+     * get the content of a file
+     * @param string $path
+     * @return string
+     */
+    public function getFile($path) {
+        return $this->zip->getFromName($path);
+    }
+    /**
+     * extract a single file from the archive
+     * @param string $path
+     * @param string $dest
+     * @return boolean|null
+     */
+    public function extractFile($path, $dest) {
+        $fp = $this->zip->getStream($path);
+        file_put_contents($dest, $fp);
+    }
+    /**
+     * extract the archive
+     * @param string $dest
+     * @return bool
+     */
+    public function extract($dest) {
+        return $this->zip->extractTo($dest);
+    }
+    /**
+     * check if a file or folder exists in the archive
+     * @param string $path
+     * @return bool
+     */
+    public function fileExists($path) {
+        return ($this->zip->locateName($path) !== false) or ($this->zip->locateName($path.'/') !== false);
+    }
+    /**
+     * remove a file or folder from the archive
+     * @param string $path
+     * @return bool
+     */
+    public function remove($path) {
+        if ($this->fileExists($path.'/')) {
+            return $this->zip->deleteName($path.'/');
+        } else {
+            return $this->zip->deleteName($path);
+        }
+    }
+    /**
+     * get a file handler
+     * @param string $path
+     * @param string $mode
+     * @return bool|resource
+     */
+    public function getStream($path, $mode) {
+        if ($mode == 'r' or $mode == 'rb') {
+            return $this->zip->getStream($path);
+        } else {
+            //since we can't directly get a writable stream,
+            //make a temp copy of the file and put it back
+            //in the archive when the stream is closed
+            if (strrpos($path, '.') !== false) {
+                $ext = substr($path, strrpos($path, '.'));
+            } else {
+                $ext = '';
+            }
+            $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
+            if ($this->fileExists($path)) {
+                $this->extractFile($path, $tmpFile);
+            }
+            $handle = fopen($tmpFile, $mode);
+            return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+                $this->writeBack($tmpFile, $path);
+            });
+        }
+    }
 
-	/**
-	 * write back temporary files
-	 */
-	public function writeBack($tmpFile, $path) {
-		$this->addFile($path, $tmpFile);
-		unlink($tmpFile);
-	}
+    /**
+     * write back temporary files
+     */
+    public function writeBack($tmpFile, $path) {
+        $this->addFile($path, $tmpFile);
+        unlink($tmpFile);
+    }
 
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	private function stripPath($path) {
-		if (!$path || $path[0] == '/') {
-			return substr($path, 1);
-		} else {
-			return $path;
-		}
-	}
+    /**
+     * @param string $path
+     * @return string
+     */
+    private function stripPath($path) {
+        if (!$path || $path[0] == '/') {
+            return substr($path, 1);
+        } else {
+            return $path;
+        }
+    }
 }

lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php

Spacing +8 added lines, -8 removed lines

@@ -35,17 +35,17 @@
 		}
 
 		$excludedFolders = [
-			rtrim($root . '/data', '/'),
-			rtrim($root . '/themes', '/'),
-			rtrim($root . '/config', '/'),
-			rtrim($root . '/apps', '/'),
-			rtrim($root . '/assets', '/'),
-			rtrim($root . '/lost+found', '/'),
+			rtrim($root.'/data', '/'),
+			rtrim($root.'/themes', '/'),
+			rtrim($root.'/config', '/'),
+			rtrim($root.'/apps', '/'),
+			rtrim($root.'/assets', '/'),
+			rtrim($root.'/lost+found', '/'),
 			// Ignore folders generated by updater since the updater is replaced
 			// after the integrity check is run.
 			// See https://github.com/owncloud/updater/issues/318#issuecomment-212497846
-			rtrim($root . '/updater', '/'),
-			rtrim($root . '/_oc_upgrade', '/'),
+			rtrim($root.'/updater', '/'),
+			rtrim($root.'/_oc_upgrade', '/'),
 		];
 		$customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', '');
 		if ($customDataDir !== '') {

Indentation +36 added lines, -36 removed lines

@@ -28,45 +28,45 @@
 namespace OC\IntegrityCheck\Iterator;
 
 class ExcludeFoldersByPathFilterIterator extends \RecursiveFilterIterator {
-	private $excludedFolders;
+    private $excludedFolders;
 
-	public function __construct(\RecursiveIterator $iterator, $root = '') {
-		parent::__construct($iterator);
+    public function __construct(\RecursiveIterator $iterator, $root = '') {
+        parent::__construct($iterator);
 
-		$appFolders = \OC::$APPSROOTS;
-		foreach ($appFolders as $key => $appFolder) {
-			$appFolders[$key] = rtrim($appFolder['path'], '/');
-		}
+        $appFolders = \OC::$APPSROOTS;
+        foreach ($appFolders as $key => $appFolder) {
+            $appFolders[$key] = rtrim($appFolder['path'], '/');
+        }
 
-		$excludedFolders = [
-			rtrim($root . '/data', '/'),
-			rtrim($root . '/themes', '/'),
-			rtrim($root . '/config', '/'),
-			rtrim($root . '/apps', '/'),
-			rtrim($root . '/assets', '/'),
-			rtrim($root . '/lost+found', '/'),
-			// Ignore folders generated by updater since the updater is replaced
-			// after the integrity check is run.
-			// See https://github.com/owncloud/updater/issues/318#issuecomment-212497846
-			rtrim($root . '/updater', '/'),
-			rtrim($root . '/_oc_upgrade', '/'),
-		];
-		$customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', '');
-		if ($customDataDir !== '') {
-			$excludedFolders[] = rtrim($customDataDir, '/');
-		}
+        $excludedFolders = [
+            rtrim($root . '/data', '/'),
+            rtrim($root . '/themes', '/'),
+            rtrim($root . '/config', '/'),
+            rtrim($root . '/apps', '/'),
+            rtrim($root . '/assets', '/'),
+            rtrim($root . '/lost+found', '/'),
+            // Ignore folders generated by updater since the updater is replaced
+            // after the integrity check is run.
+            // See https://github.com/owncloud/updater/issues/318#issuecomment-212497846
+            rtrim($root . '/updater', '/'),
+            rtrim($root . '/_oc_upgrade', '/'),
+        ];
+        $customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', '');
+        if ($customDataDir !== '') {
+            $excludedFolders[] = rtrim($customDataDir, '/');
+        }
 
-		$this->excludedFolders = array_merge($excludedFolders, $appFolders);
-	}
+        $this->excludedFolders = array_merge($excludedFolders, $appFolders);
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function accept() {
-		return !\in_array(
-			$this->current()->getPathName(),
-			$this->excludedFolders,
-			true
-		);
-	}
+    /**
+     * @return bool
+     */
+    public function accept() {
+        return !\in_array(
+            $this->current()->getPathName(),
+            $this->excludedFolders,
+            true
+        );
+    }
 }

lib/private/App/AppStore/Version/VersionParser.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	 * @return bool
 	 */
 	private function isValidVersionString($versionString) {
-		return (bool)preg_match('/^[0-9.]+$/', $versionString);
+		return (bool) preg_match('/^[0-9.]+$/', $versionString);
 	}
 
 	/**

Indentation +48 added lines, -48 removed lines

@@ -30,56 +30,56 @@
  * @package OC\App\AppStore
  */
 class VersionParser {
-	/**
-	 * @param string $versionString
-	 * @return bool
-	 */
-	private function isValidVersionString($versionString) {
-		return (bool)preg_match('/^[0-9.]+$/', $versionString);
-	}
+    /**
+     * @param string $versionString
+     * @return bool
+     */
+    private function isValidVersionString($versionString) {
+        return (bool)preg_match('/^[0-9.]+$/', $versionString);
+    }
 
-	/**
-	 * Returns the version for a version string
-	 *
-	 * @param string $versionSpec
-	 * @return Version
-	 * @throws \Exception If the version cannot be parsed
-	 */
-	public function getVersion($versionSpec) {
-		// * indicates that the version is compatible with all versions
-		if ($versionSpec === '*') {
-			return new Version('', '');
-		}
+    /**
+     * Returns the version for a version string
+     *
+     * @param string $versionSpec
+     * @return Version
+     * @throws \Exception If the version cannot be parsed
+     */
+    public function getVersion($versionSpec) {
+        // * indicates that the version is compatible with all versions
+        if ($versionSpec === '*') {
+            return new Version('', '');
+        }
 
-		// Count the amount of =, if it is one then it's either maximum or minimum
-		// version. If it is two then it is maximum and minimum.
-		$versionElements = explode(' ', $versionSpec);
-		$firstVersion = isset($versionElements[0]) ? $versionElements[0] : '';
-		$firstVersionNumber = substr($firstVersion, 2);
-		$secondVersion = isset($versionElements[1]) ? $versionElements[1] : '';
-		$secondVersionNumber = substr($secondVersion, 2);
+        // Count the amount of =, if it is one then it's either maximum or minimum
+        // version. If it is two then it is maximum and minimum.
+        $versionElements = explode(' ', $versionSpec);
+        $firstVersion = isset($versionElements[0]) ? $versionElements[0] : '';
+        $firstVersionNumber = substr($firstVersion, 2);
+        $secondVersion = isset($versionElements[1]) ? $versionElements[1] : '';
+        $secondVersionNumber = substr($secondVersion, 2);
 
-		switch (count($versionElements)) {
-			case 1:
-				if (!$this->isValidVersionString($firstVersionNumber)) {
-					break;
-				}
-				if (strpos($firstVersion, '>') === 0) {
-					return new Version($firstVersionNumber, '');
-				}
-				return new Version('', $firstVersionNumber);
-			case 2:
-				if (!$this->isValidVersionString($firstVersionNumber) || !$this->isValidVersionString($secondVersionNumber)) {
-					break;
-				}
-				return new Version($firstVersionNumber, $secondVersionNumber);
-		}
+        switch (count($versionElements)) {
+            case 1:
+                if (!$this->isValidVersionString($firstVersionNumber)) {
+                    break;
+                }
+                if (strpos($firstVersion, '>') === 0) {
+                    return new Version($firstVersionNumber, '');
+                }
+                return new Version('', $firstVersionNumber);
+            case 2:
+                if (!$this->isValidVersionString($firstVersionNumber) || !$this->isValidVersionString($secondVersionNumber)) {
+                    break;
+                }
+                return new Version($firstVersionNumber, $secondVersionNumber);
+        }
 
-		throw new \Exception(
-			sprintf(
-				'Version cannot be parsed: %s',
-				$versionSpec
-			)
-		);
-	}
+        throw new \Exception(
+            sprintf(
+                'Version cannot be parsed: %s',
+                $versionSpec
+            )
+        );
+    }
 }

lib/private/App/AppStore/Bundles/Bundle.php

Indentation +28 added lines, -28 removed lines

@@ -24,36 +24,36 @@
 use OCP\IL10N;
 
 abstract class Bundle {
-	/** @var IL10N */
-	protected $l10n;
+    /** @var IL10N */
+    protected $l10n;
 
-	/**
-	 * @param IL10N $l10n
-	 */
-	public function __construct(IL10N $l10n) {
-		$this->l10n = $l10n;
-	}
+    /**
+     * @param IL10N $l10n
+     */
+    public function __construct(IL10N $l10n) {
+        $this->l10n = $l10n;
+    }
 
-	/**
-	 * Get the identifier of the bundle
-	 *
-	 * @return string
-	 */
-	final public function getIdentifier() {
-		return substr(strrchr(get_class($this), '\\'), 1);
-	}
+    /**
+     * Get the identifier of the bundle
+     *
+     * @return string
+     */
+    final public function getIdentifier() {
+        return substr(strrchr(get_class($this), '\\'), 1);
+    }
 
-	/**
-	 * Get the name of the bundle
-	 *
-	 * @return string
-	 */
-	abstract public function getName();
+    /**
+     * Get the name of the bundle
+     *
+     * @return string
+     */
+    abstract public function getName();
 
-	/**
-	 * Get the list of app identifiers in the bundle
-	 *
-	 * @return array
-	 */
-	abstract public function getAppIdentifiers();
+    /**
+     * Get the list of app identifiers in the bundle
+     *
+     * @return array
+     */
+    abstract public function getAppIdentifiers();
 }

lib/private/Share20/LegacyHooks.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 		/** @var IShare[] $deletedShares */
 		$deletedShares = $e->getArgument('deletedShares');
 
-		$formattedDeletedShares = array_map(function ($share) {
+		$formattedDeletedShares = array_map(function($share) {
 			return $this->formatHookParams($share);
 		}, $deletedShares);
 

Indentation +140 added lines, -140 removed lines

@@ -34,144 +34,144 @@
 
 class LegacyHooks {
 
-	/** @var EventDispatcherInterface */
-	private $eventDispatcher;
-
-	/**
-	 * LegacyHooks constructor.
-	 *
-	 * @param EventDispatcherInterface $eventDispatcher
-	 */
-	public function __construct(EventDispatcherInterface $eventDispatcher) {
-		$this->eventDispatcher = $eventDispatcher;
-
-		$this->eventDispatcher->addListener('OCP\Share::preUnshare', [$this, 'preUnshare']);
-		$this->eventDispatcher->addListener('OCP\Share::postUnshare', [$this, 'postUnshare']);
-		$this->eventDispatcher->addListener('OCP\Share::postUnshareFromSelf', [$this, 'postUnshareFromSelf']);
-		$this->eventDispatcher->addListener('OCP\Share::preShare', [$this, 'preShare']);
-		$this->eventDispatcher->addListener('OCP\Share::postShare', [$this, 'postShare']);
-	}
-
-	/**
-	 * @param GenericEvent $e
-	 */
-	public function preUnshare(GenericEvent $e) {
-		/** @var IShare $share */
-		$share = $e->getSubject();
-
-		$formatted = $this->formatHookParams($share);
-		\OC_Hook::emit(Share::class, 'pre_unshare', $formatted);
-	}
-
-	/**
-	 * @param GenericEvent $e
-	 */
-	public function postUnshare(GenericEvent $e) {
-		/** @var IShare $share */
-		$share = $e->getSubject();
-
-		$formatted = $this->formatHookParams($share);
-
-		/** @var IShare[] $deletedShares */
-		$deletedShares = $e->getArgument('deletedShares');
-
-		$formattedDeletedShares = array_map(function ($share) {
-			return $this->formatHookParams($share);
-		}, $deletedShares);
-
-		$formatted['deletedShares'] = $formattedDeletedShares;
-
-		\OC_Hook::emit(Share::class, 'post_unshare', $formatted);
-	}
-
-	/**
-	 * @param GenericEvent $e
-	 */
-	public function postUnshareFromSelf(GenericEvent $e) {
-		/** @var IShare $share */
-		$share = $e->getSubject();
-
-		$formatted = $this->formatHookParams($share);
-		$formatted['itemTarget'] = $formatted['fileTarget'];
-		$formatted['unsharedItems'] = [$formatted];
-
-		\OC_Hook::emit(Share::class, 'post_unshareFromSelf', $formatted);
-	}
-
-	private function formatHookParams(IShare $share) {
-		// Prepare hook
-		$shareType = $share->getShareType();
-		$sharedWith = '';
-		if ($shareType === IShare::TYPE_USER ||
-			$shareType === IShare::TYPE_GROUP ||
-			$shareType === IShare::TYPE_REMOTE) {
-			$sharedWith = $share->getSharedWith();
-		}
-
-		$hookParams = [
-			'id' => $share->getId(),
-			'itemType' => $share->getNodeType(),
-			'itemSource' => $share->getNodeId(),
-			'shareType' => $shareType,
-			'shareWith' => $sharedWith,
-			'itemparent' => method_exists($share, 'getParent') ? $share->getParent() : '',
-			'uidOwner' => $share->getSharedBy(),
-			'fileSource' => $share->getNodeId(),
-			'fileTarget' => $share->getTarget()
-		];
-		return $hookParams;
-	}
-
-	public function preShare(GenericEvent $e) {
-		/** @var IShare $share */
-		$share = $e->getSubject();
-
-		// Pre share hook
-		$run = true;
-		$error = '';
-		$preHookData = [
-			'itemType' => $share->getNode() instanceof File ? 'file' : 'folder',
-			'itemSource' => $share->getNode()->getId(),
-			'shareType' => $share->getShareType(),
-			'uidOwner' => $share->getSharedBy(),
-			'permissions' => $share->getPermissions(),
-			'fileSource' => $share->getNode()->getId(),
-			'expiration' => $share->getExpirationDate(),
-			'token' => $share->getToken(),
-			'itemTarget' => $share->getTarget(),
-			'shareWith' => $share->getSharedWith(),
-			'run' => &$run,
-			'error' => &$error,
-		];
-		\OC_Hook::emit(Share::class, 'pre_shared', $preHookData);
-
-		if ($run === false) {
-			$e->setArgument('error', $error);
-			$e->stopPropagation();
-		}
-
-		return $e;
-	}
-
-	public function postShare(GenericEvent $e) {
-		/** @var IShare $share */
-		$share = $e->getSubject();
-
-		$postHookData = [
-			'itemType' => $share->getNode() instanceof File ? 'file' : 'folder',
-			'itemSource' => $share->getNode()->getId(),
-			'shareType' => $share->getShareType(),
-			'uidOwner' => $share->getSharedBy(),
-			'permissions' => $share->getPermissions(),
-			'fileSource' => $share->getNode()->getId(),
-			'expiration' => $share->getExpirationDate(),
-			'token' => $share->getToken(),
-			'id' => $share->getId(),
-			'shareWith' => $share->getSharedWith(),
-			'itemTarget' => $share->getTarget(),
-			'fileTarget' => $share->getTarget(),
-		];
-
-		\OC_Hook::emit(Share::class, 'post_shared', $postHookData);
-	}
+    /** @var EventDispatcherInterface */
+    private $eventDispatcher;
+
+    /**
+     * LegacyHooks constructor.
+     *
+     * @param EventDispatcherInterface $eventDispatcher
+     */
+    public function __construct(EventDispatcherInterface $eventDispatcher) {
+        $this->eventDispatcher = $eventDispatcher;
+
+        $this->eventDispatcher->addListener('OCP\Share::preUnshare', [$this, 'preUnshare']);
+        $this->eventDispatcher->addListener('OCP\Share::postUnshare', [$this, 'postUnshare']);
+        $this->eventDispatcher->addListener('OCP\Share::postUnshareFromSelf', [$this, 'postUnshareFromSelf']);
+        $this->eventDispatcher->addListener('OCP\Share::preShare', [$this, 'preShare']);
+        $this->eventDispatcher->addListener('OCP\Share::postShare', [$this, 'postShare']);
+    }
+
+    /**
+     * @param GenericEvent $e
+     */
+    public function preUnshare(GenericEvent $e) {
+        /** @var IShare $share */
+        $share = $e->getSubject();
+
+        $formatted = $this->formatHookParams($share);
+        \OC_Hook::emit(Share::class, 'pre_unshare', $formatted);
+    }
+
+    /**
+     * @param GenericEvent $e
+     */
+    public function postUnshare(GenericEvent $e) {
+        /** @var IShare $share */
+        $share = $e->getSubject();
+
+        $formatted = $this->formatHookParams($share);
+
+        /** @var IShare[] $deletedShares */
+        $deletedShares = $e->getArgument('deletedShares');
+
+        $formattedDeletedShares = array_map(function ($share) {
+            return $this->formatHookParams($share);
+        }, $deletedShares);
+
+        $formatted['deletedShares'] = $formattedDeletedShares;
+
+        \OC_Hook::emit(Share::class, 'post_unshare', $formatted);
+    }
+
+    /**
+     * @param GenericEvent $e
+     */
+    public function postUnshareFromSelf(GenericEvent $e) {
+        /** @var IShare $share */
+        $share = $e->getSubject();
+
+        $formatted = $this->formatHookParams($share);
+        $formatted['itemTarget'] = $formatted['fileTarget'];
+        $formatted['unsharedItems'] = [$formatted];
+
+        \OC_Hook::emit(Share::class, 'post_unshareFromSelf', $formatted);
+    }
+
+    private function formatHookParams(IShare $share) {
+        // Prepare hook
+        $shareType = $share->getShareType();
+        $sharedWith = '';
+        if ($shareType === IShare::TYPE_USER ||
+            $shareType === IShare::TYPE_GROUP ||
+            $shareType === IShare::TYPE_REMOTE) {
+            $sharedWith = $share->getSharedWith();
+        }
+
+        $hookParams = [
+            'id' => $share->getId(),
+            'itemType' => $share->getNodeType(),
+            'itemSource' => $share->getNodeId(),
+            'shareType' => $shareType,
+            'shareWith' => $sharedWith,
+            'itemparent' => method_exists($share, 'getParent') ? $share->getParent() : '',
+            'uidOwner' => $share->getSharedBy(),
+            'fileSource' => $share->getNodeId(),
+            'fileTarget' => $share->getTarget()
+        ];
+        return $hookParams;
+    }
+
+    public function preShare(GenericEvent $e) {
+        /** @var IShare $share */
+        $share = $e->getSubject();
+
+        // Pre share hook
+        $run = true;
+        $error = '';
+        $preHookData = [
+            'itemType' => $share->getNode() instanceof File ? 'file' : 'folder',
+            'itemSource' => $share->getNode()->getId(),
+            'shareType' => $share->getShareType(),
+            'uidOwner' => $share->getSharedBy(),
+            'permissions' => $share->getPermissions(),
+            'fileSource' => $share->getNode()->getId(),
+            'expiration' => $share->getExpirationDate(),
+            'token' => $share->getToken(),
+            'itemTarget' => $share->getTarget(),
+            'shareWith' => $share->getSharedWith(),
+            'run' => &$run,
+            'error' => &$error,
+        ];
+        \OC_Hook::emit(Share::class, 'pre_shared', $preHookData);
+
+        if ($run === false) {
+            $e->setArgument('error', $error);
+            $e->stopPropagation();
+        }
+
+        return $e;
+    }
+
+    public function postShare(GenericEvent $e) {
+        /** @var IShare $share */
+        $share = $e->getSubject();
+
+        $postHookData = [
+            'itemType' => $share->getNode() instanceof File ? 'file' : 'folder',
+            'itemSource' => $share->getNode()->getId(),
+            'shareType' => $share->getShareType(),
+            'uidOwner' => $share->getSharedBy(),
+            'permissions' => $share->getPermissions(),
+            'fileSource' => $share->getNode()->getId(),
+            'expiration' => $share->getExpirationDate(),
+            'token' => $share->getToken(),
+            'id' => $share->getId(),
+            'shareWith' => $share->getSharedWith(),
+            'itemTarget' => $share->getTarget(),
+            'fileTarget' => $share->getTarget(),
+        ];
+
+        \OC_Hook::emit(Share::class, 'post_shared', $postHookData);
+    }
 }