nextcloud / server

lib/private/Encryption/Exceptions/EncryptionHeaderToLargeException.php

Indentation +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@
 use OCP\Encryption\Exceptions\GenericEncryptionException;
 
 class EncryptionHeaderToLargeException extends GenericEncryptionException {
-	public function __construct() {
-		parent::__construct('max header size exceeded');
-	}
+    public function __construct() {
+        parent::__construct('max header size exceeded');
+    }
 }

lib/private/Encryption/File.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 		// always add owner to the list of users with access to the file
 		$userIds = [$owner];
 
-		if (!$this->util->isFile($owner . '/' . $ownerPath)) {
+		if (!$this->util->isFile($owner.'/'.$ownerPath)) {
 			return ['users' => $userIds, 'public' => false];
 		}
 

Indentation +90 added lines, -90 removed lines

@@ -35,94 +35,94 @@
 
 class File implements \OCP\Encryption\IFile {
 
-	/** @var Util */
-	protected $util;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IManager */
-	private $shareManager;
-
-	/**
-	 * cache results of already checked folders
-	 *
-	 * @var array
-	 */
-	protected $cache;
-
-	public function __construct(Util $util,
-								IRootFolder $rootFolder,
-								IManager $shareManager) {
-		$this->util = $util;
-		$this->cache = new CappedMemoryCache();
-		$this->rootFolder = $rootFolder;
-		$this->shareManager = $shareManager;
-	}
-
-
-	/**
-	 * get list of users with access to the file
-	 *
-	 * @param string $path to the file
-	 * @return array  ['users' => $uniqueUserIds, 'public' => $public]
-	 */
-	public function getAccessList($path) {
-
-		// Make sure that a share key is generated for the owner too
-		[$owner, $ownerPath] = $this->util->getUidAndFilename($path);
-
-		// always add owner to the list of users with access to the file
-		$userIds = [$owner];
-
-		if (!$this->util->isFile($owner . '/' . $ownerPath)) {
-			return ['users' => $userIds, 'public' => false];
-		}
-
-		$ownerPath = substr($ownerPath, strlen('/files'));
-		$userFolder = $this->rootFolder->getUserFolder($owner);
-		try {
-			$file = $userFolder->get($ownerPath);
-		} catch (NotFoundException $e) {
-			$file = null;
-		}
-		$ownerPath = $this->util->stripPartialFileExtension($ownerPath);
-
-		// first get the shares for the parent and cache the result so that we don't
-		// need to check all parents for every file
-		$parent = dirname($ownerPath);
-		$parentNode = $userFolder->get($parent);
-		if (isset($this->cache[$parent])) {
-			$resultForParents = $this->cache[$parent];
-		} else {
-			$resultForParents = $this->shareManager->getAccessList($parentNode);
-			$this->cache[$parent] = $resultForParents;
-		}
-		$userIds = array_merge($userIds, $resultForParents['users']);
-		$public = $resultForParents['public'] || $resultForParents['remote'];
-
-
-		// Find out who, if anyone, is sharing the file
-		if ($file !== null) {
-			$resultForFile = $this->shareManager->getAccessList($file, false);
-			$userIds = array_merge($userIds, $resultForFile['users']);
-			$public = $resultForFile['public'] || $resultForFile['remote'] || $public;
-		}
-
-		// check if it is a group mount
-		if (\OCP\App::isEnabled("files_external")) {
-			$mounts = \OCA\Files_External\MountConfig::getSystemMountPoints();
-			foreach ($mounts as $mount) {
-				if ($mount['mountpoint'] == substr($ownerPath, 1, strlen($mount['mountpoint']))) {
-					$mountedFor = $this->util->getUserWithAccessToMountPoint($mount['applicable']['users'], $mount['applicable']['groups']);
-					$userIds = array_merge($userIds, $mountedFor);
-				}
-			}
-		}
-
-		// Remove duplicate UIDs
-		$uniqueUserIds = array_unique($userIds);
-
-		return ['users' => $uniqueUserIds, 'public' => $public];
-	}
+    /** @var Util */
+    protected $util;
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var IManager */
+    private $shareManager;
+
+    /**
+     * cache results of already checked folders
+     *
+     * @var array
+     */
+    protected $cache;
+
+    public function __construct(Util $util,
+                                IRootFolder $rootFolder,
+                                IManager $shareManager) {
+        $this->util = $util;
+        $this->cache = new CappedMemoryCache();
+        $this->rootFolder = $rootFolder;
+        $this->shareManager = $shareManager;
+    }
+
+
+    /**
+     * get list of users with access to the file
+     *
+     * @param string $path to the file
+     * @return array  ['users' => $uniqueUserIds, 'public' => $public]
+     */
+    public function getAccessList($path) {
+
+        // Make sure that a share key is generated for the owner too
+        [$owner, $ownerPath] = $this->util->getUidAndFilename($path);
+
+        // always add owner to the list of users with access to the file
+        $userIds = [$owner];
+
+        if (!$this->util->isFile($owner . '/' . $ownerPath)) {
+            return ['users' => $userIds, 'public' => false];
+        }
+
+        $ownerPath = substr($ownerPath, strlen('/files'));
+        $userFolder = $this->rootFolder->getUserFolder($owner);
+        try {
+            $file = $userFolder->get($ownerPath);
+        } catch (NotFoundException $e) {
+            $file = null;
+        }
+        $ownerPath = $this->util->stripPartialFileExtension($ownerPath);
+
+        // first get the shares for the parent and cache the result so that we don't
+        // need to check all parents for every file
+        $parent = dirname($ownerPath);
+        $parentNode = $userFolder->get($parent);
+        if (isset($this->cache[$parent])) {
+            $resultForParents = $this->cache[$parent];
+        } else {
+            $resultForParents = $this->shareManager->getAccessList($parentNode);
+            $this->cache[$parent] = $resultForParents;
+        }
+        $userIds = array_merge($userIds, $resultForParents['users']);
+        $public = $resultForParents['public'] || $resultForParents['remote'];
+
+
+        // Find out who, if anyone, is sharing the file
+        if ($file !== null) {
+            $resultForFile = $this->shareManager->getAccessList($file, false);
+            $userIds = array_merge($userIds, $resultForFile['users']);
+            $public = $resultForFile['public'] || $resultForFile['remote'] || $public;
+        }
+
+        // check if it is a group mount
+        if (\OCP\App::isEnabled("files_external")) {
+            $mounts = \OCA\Files_External\MountConfig::getSystemMountPoints();
+            foreach ($mounts as $mount) {
+                if ($mount['mountpoint'] == substr($ownerPath, 1, strlen($mount['mountpoint']))) {
+                    $mountedFor = $this->util->getUserWithAccessToMountPoint($mount['applicable']['users'], $mount['applicable']['groups']);
+                    $userIds = array_merge($userIds, $mountedFor);
+                }
+            }
+        }
+
+        // Remove duplicate UIDs
+        $uniqueUserIds = array_unique($userIds);
+
+        return ['users' => $uniqueUserIds, 'public' => $public];
+    }
 }

lib/private/TempManager.php

Spacing +5 added lines, -5 removed lines

@@ -66,12 +66,12 @@ 
 	 */
 	private function buildFileNameWithSuffix($absolutePath, $postFix = '') {
 		if ($postFix !== '') {
-			$postFix = '.' . ltrim($postFix, '.');
+			$postFix = '.'.ltrim($postFix, '.');
 			$postFix = str_replace(['\\', '/'], '', $postFix);
 			$absolutePath .= '-';
 		}
 
-		return $absolutePath . $postFix;
+		return $absolutePath.$postFix;
 	}
 
 	/**
@@ -127,11 +127,11 @@ 
 			$this->current[] = $uniqueFileName;
 
 			// Build a name without postfix
-			$path = $this->buildFileNameWithSuffix($uniqueFileName . '-folder', $postFix);
+			$path = $this->buildFileNameWithSuffix($uniqueFileName.'-folder', $postFix);
 			mkdir($path, 0700);
 			$this->current[] = $path;
 
-			return $path . '/';
+			return $path.'/';
 		} else {
 			$this->log->warning(
 				'Can not create a temporary folder in directory {dir}. Check it exists and has correct permissions',
@@ -190,7 +190,7 @@ 
 		if ($dh) {
 			while (($file = readdir($dh)) !== false) {
 				if (substr($file, 0, 7) === self::TMP_PREFIX) {
-					$path = $this->tmpBaseDir . '/' . $file;
+					$path = $this->tmpBaseDir.'/'.$file;
 					$mtime = filemtime($path);
 					if ($mtime < $cutOfTime) {
 						$files[] = $path;

Indentation +220 added lines, -220 removed lines

@@ -37,244 +37,244 @@
 use Psr\Log\LoggerInterface;
 
 class TempManager implements ITempManager {
-	/** @var string[] Current temporary files and folders, used for cleanup */
-	protected $current = [];
-	/** @var string i.e. /tmp on linux systems */
-	protected $tmpBaseDir;
-	/** @var LoggerInterface */
-	protected $log;
-	/** @var IConfig */
-	protected $config;
-	/** @var IniGetWrapper */
-	protected $iniGetWrapper;
+    /** @var string[] Current temporary files and folders, used for cleanup */
+    protected $current = [];
+    /** @var string i.e. /tmp on linux systems */
+    protected $tmpBaseDir;
+    /** @var LoggerInterface */
+    protected $log;
+    /** @var IConfig */
+    protected $config;
+    /** @var IniGetWrapper */
+    protected $iniGetWrapper;
 
-	/** Prefix */
-	public const TMP_PREFIX = 'oc_tmp_';
+    /** Prefix */
+    public const TMP_PREFIX = 'oc_tmp_';
 
-	public function __construct(LoggerInterface $logger, IConfig $config, IniGetWrapper $iniGetWrapper) {
-		$this->log = $logger;
-		$this->config = $config;
-		$this->iniGetWrapper = $iniGetWrapper;
-		$this->tmpBaseDir = $this->getTempBaseDir();
-	}
+    public function __construct(LoggerInterface $logger, IConfig $config, IniGetWrapper $iniGetWrapper) {
+        $this->log = $logger;
+        $this->config = $config;
+        $this->iniGetWrapper = $iniGetWrapper;
+        $this->tmpBaseDir = $this->getTempBaseDir();
+    }
 
-	/**
-	 * Builds the filename with suffix and removes potential dangerous characters
-	 * such as directory separators.
-	 *
-	 * @param string $absolutePath Absolute path to the file / folder
-	 * @param string $postFix Postfix appended to the temporary file name, may be user controlled
-	 * @return string
-	 */
-	private function buildFileNameWithSuffix($absolutePath, $postFix = '') {
-		if ($postFix !== '') {
-			$postFix = '.' . ltrim($postFix, '.');
-			$postFix = str_replace(['\\', '/'], '', $postFix);
-			$absolutePath .= '-';
-		}
+    /**
+     * Builds the filename with suffix and removes potential dangerous characters
+     * such as directory separators.
+     *
+     * @param string $absolutePath Absolute path to the file / folder
+     * @param string $postFix Postfix appended to the temporary file name, may be user controlled
+     * @return string
+     */
+    private function buildFileNameWithSuffix($absolutePath, $postFix = '') {
+        if ($postFix !== '') {
+            $postFix = '.' . ltrim($postFix, '.');
+            $postFix = str_replace(['\\', '/'], '', $postFix);
+            $absolutePath .= '-';
+        }
 
-		return $absolutePath . $postFix;
-	}
+        return $absolutePath . $postFix;
+    }
 
-	/**
-	 * Create a temporary file and return the path
-	 *
-	 * @param string $postFix Postfix appended to the temporary file name
-	 * @return string
-	 */
-	public function getTemporaryFile($postFix = '') {
-		if (is_writable($this->tmpBaseDir)) {
-			// To create an unique file and prevent the risk of race conditions
-			// or duplicated temporary files by other means such as collisions
-			// we need to create the file using `tempnam` and append a possible
-			// postfix to it later
-			$file = tempnam($this->tmpBaseDir, self::TMP_PREFIX);
-			$this->current[] = $file;
+    /**
+     * Create a temporary file and return the path
+     *
+     * @param string $postFix Postfix appended to the temporary file name
+     * @return string
+     */
+    public function getTemporaryFile($postFix = '') {
+        if (is_writable($this->tmpBaseDir)) {
+            // To create an unique file and prevent the risk of race conditions
+            // or duplicated temporary files by other means such as collisions
+            // we need to create the file using `tempnam` and append a possible
+            // postfix to it later
+            $file = tempnam($this->tmpBaseDir, self::TMP_PREFIX);
+            $this->current[] = $file;
 
-			// If a postfix got specified sanitize it and create a postfixed
-			// temporary file
-			if ($postFix !== '') {
-				$fileNameWithPostfix = $this->buildFileNameWithSuffix($file, $postFix);
-				touch($fileNameWithPostfix);
-				chmod($fileNameWithPostfix, 0600);
-				$this->current[] = $fileNameWithPostfix;
-				return $fileNameWithPostfix;
-			}
+            // If a postfix got specified sanitize it and create a postfixed
+            // temporary file
+            if ($postFix !== '') {
+                $fileNameWithPostfix = $this->buildFileNameWithSuffix($file, $postFix);
+                touch($fileNameWithPostfix);
+                chmod($fileNameWithPostfix, 0600);
+                $this->current[] = $fileNameWithPostfix;
+                return $fileNameWithPostfix;
+            }
 
-			return $file;
-		} else {
-			$this->log->warning(
-				'Can not create a temporary file in directory {dir}. Check it exists and has correct permissions',
-				[
-					'dir' => $this->tmpBaseDir,
-				]
-			);
-			return false;
-		}
-	}
+            return $file;
+        } else {
+            $this->log->warning(
+                'Can not create a temporary file in directory {dir}. Check it exists and has correct permissions',
+                [
+                    'dir' => $this->tmpBaseDir,
+                ]
+            );
+            return false;
+        }
+    }
 
-	/**
-	 * Create a temporary folder and return the path
-	 *
-	 * @param string $postFix Postfix appended to the temporary folder name
-	 * @return string
-	 */
-	public function getTemporaryFolder($postFix = '') {
-		if (is_writable($this->tmpBaseDir)) {
-			// To create an unique directory and prevent the risk of race conditions
-			// or duplicated temporary files by other means such as collisions
-			// we need to create the file using `tempnam` and append a possible
-			// postfix to it later
-			$uniqueFileName = tempnam($this->tmpBaseDir, self::TMP_PREFIX);
-			$this->current[] = $uniqueFileName;
+    /**
+     * Create a temporary folder and return the path
+     *
+     * @param string $postFix Postfix appended to the temporary folder name
+     * @return string
+     */
+    public function getTemporaryFolder($postFix = '') {
+        if (is_writable($this->tmpBaseDir)) {
+            // To create an unique directory and prevent the risk of race conditions
+            // or duplicated temporary files by other means such as collisions
+            // we need to create the file using `tempnam` and append a possible
+            // postfix to it later
+            $uniqueFileName = tempnam($this->tmpBaseDir, self::TMP_PREFIX);
+            $this->current[] = $uniqueFileName;
 
-			// Build a name without postfix
-			$path = $this->buildFileNameWithSuffix($uniqueFileName . '-folder', $postFix);
-			mkdir($path, 0700);
-			$this->current[] = $path;
+            // Build a name without postfix
+            $path = $this->buildFileNameWithSuffix($uniqueFileName . '-folder', $postFix);
+            mkdir($path, 0700);
+            $this->current[] = $path;
 
-			return $path . '/';
-		} else {
-			$this->log->warning(
-				'Can not create a temporary folder in directory {dir}. Check it exists and has correct permissions',
-				[
-					'dir' => $this->tmpBaseDir,
-				]
-			);
-			return false;
-		}
-	}
+            return $path . '/';
+        } else {
+            $this->log->warning(
+                'Can not create a temporary folder in directory {dir}. Check it exists and has correct permissions',
+                [
+                    'dir' => $this->tmpBaseDir,
+                ]
+            );
+            return false;
+        }
+    }
 
-	/**
-	 * Remove the temporary files and folders generated during this request
-	 */
-	public function clean() {
-		$this->cleanFiles($this->current);
-	}
+    /**
+     * Remove the temporary files and folders generated during this request
+     */
+    public function clean() {
+        $this->cleanFiles($this->current);
+    }
 
-	/**
-	 * @param string[] $files
-	 */
-	protected function cleanFiles($files) {
-		foreach ($files as $file) {
-			if (file_exists($file)) {
-				try {
-					\OC_Helper::rmdirr($file);
-				} catch (\UnexpectedValueException $ex) {
-					$this->log->warning(
-						"Error deleting temporary file/folder: {file} - Reason: {error}",
-						[
-							'file' => $file,
-							'error' => $ex->getMessage(),
-						]
-					);
-				}
-			}
-		}
-	}
+    /**
+     * @param string[] $files
+     */
+    protected function cleanFiles($files) {
+        foreach ($files as $file) {
+            if (file_exists($file)) {
+                try {
+                    \OC_Helper::rmdirr($file);
+                } catch (\UnexpectedValueException $ex) {
+                    $this->log->warning(
+                        "Error deleting temporary file/folder: {file} - Reason: {error}",
+                        [
+                            'file' => $file,
+                            'error' => $ex->getMessage(),
+                        ]
+                    );
+                }
+            }
+        }
+    }
 
-	/**
-	 * Remove old temporary files and folders that were failed to be cleaned
-	 */
-	public function cleanOld() {
-		$this->cleanFiles($this->getOldFiles());
-	}
+    /**
+     * Remove old temporary files and folders that were failed to be cleaned
+     */
+    public function cleanOld() {
+        $this->cleanFiles($this->getOldFiles());
+    }
 
-	/**
-	 * Get all temporary files and folders generated by oc older than an hour
-	 *
-	 * @return string[]
-	 */
-	protected function getOldFiles() {
-		$cutOfTime = time() - 3600;
-		$files = [];
-		$dh = opendir($this->tmpBaseDir);
-		if ($dh) {
-			while (($file = readdir($dh)) !== false) {
-				if (substr($file, 0, 7) === self::TMP_PREFIX) {
-					$path = $this->tmpBaseDir . '/' . $file;
-					$mtime = filemtime($path);
-					if ($mtime < $cutOfTime) {
-						$files[] = $path;
-					}
-				}
-			}
-		}
-		return $files;
-	}
+    /**
+     * Get all temporary files and folders generated by oc older than an hour
+     *
+     * @return string[]
+     */
+    protected function getOldFiles() {
+        $cutOfTime = time() - 3600;
+        $files = [];
+        $dh = opendir($this->tmpBaseDir);
+        if ($dh) {
+            while (($file = readdir($dh)) !== false) {
+                if (substr($file, 0, 7) === self::TMP_PREFIX) {
+                    $path = $this->tmpBaseDir . '/' . $file;
+                    $mtime = filemtime($path);
+                    if ($mtime < $cutOfTime) {
+                        $files[] = $path;
+                    }
+                }
+            }
+        }
+        return $files;
+    }
 
-	/**
-	 * Get the temporary base directory configured on the server
-	 *
-	 * @return string Path to the temporary directory or null
-	 * @throws \UnexpectedValueException
-	 */
-	public function getTempBaseDir() {
-		if ($this->tmpBaseDir) {
-			return $this->tmpBaseDir;
-		}
+    /**
+     * Get the temporary base directory configured on the server
+     *
+     * @return string Path to the temporary directory or null
+     * @throws \UnexpectedValueException
+     */
+    public function getTempBaseDir() {
+        if ($this->tmpBaseDir) {
+            return $this->tmpBaseDir;
+        }
 
-		$directories = [];
-		if ($temp = $this->config->getSystemValue('tempdirectory', null)) {
-			$directories[] = $temp;
-		}
-		if ($temp = $this->iniGetWrapper->get('upload_tmp_dir')) {
-			$directories[] = $temp;
-		}
-		if ($temp = getenv('TMP')) {
-			$directories[] = $temp;
-		}
-		if ($temp = getenv('TEMP')) {
-			$directories[] = $temp;
-		}
-		if ($temp = getenv('TMPDIR')) {
-			$directories[] = $temp;
-		}
-		if ($temp = sys_get_temp_dir()) {
-			$directories[] = $temp;
-		}
+        $directories = [];
+        if ($temp = $this->config->getSystemValue('tempdirectory', null)) {
+            $directories[] = $temp;
+        }
+        if ($temp = $this->iniGetWrapper->get('upload_tmp_dir')) {
+            $directories[] = $temp;
+        }
+        if ($temp = getenv('TMP')) {
+            $directories[] = $temp;
+        }
+        if ($temp = getenv('TEMP')) {
+            $directories[] = $temp;
+        }
+        if ($temp = getenv('TMPDIR')) {
+            $directories[] = $temp;
+        }
+        if ($temp = sys_get_temp_dir()) {
+            $directories[] = $temp;
+        }
 
-		foreach ($directories as $dir) {
-			if ($this->checkTemporaryDirectory($dir)) {
-				return $dir;
-			}
-		}
+        foreach ($directories as $dir) {
+            if ($this->checkTemporaryDirectory($dir)) {
+                return $dir;
+            }
+        }
 
-		$temp = tempnam(dirname(__FILE__), '');
-		if (file_exists($temp)) {
-			unlink($temp);
-			return dirname($temp);
-		}
-		throw new \UnexpectedValueException('Unable to detect system temporary directory');
-	}
+        $temp = tempnam(dirname(__FILE__), '');
+        if (file_exists($temp)) {
+            unlink($temp);
+            return dirname($temp);
+        }
+        throw new \UnexpectedValueException('Unable to detect system temporary directory');
+    }
 
-	/**
-	 * Check if a temporary directory is ready for use
-	 *
-	 * @param mixed $directory
-	 * @return bool
-	 */
-	private function checkTemporaryDirectory($directory) {
-		// suppress any possible errors caused by is_writable
-		// checks missing or invalid path or characters, wrong permissions etc
-		try {
-			if (is_writable($directory)) {
-				return true;
-			}
-		} catch (\Exception $e) {
-		}
-		$this->log->warning('Temporary directory {dir} is not present or writable',
-			['dir' => $directory]
-		);
-		return false;
-	}
+    /**
+     * Check if a temporary directory is ready for use
+     *
+     * @param mixed $directory
+     * @return bool
+     */
+    private function checkTemporaryDirectory($directory) {
+        // suppress any possible errors caused by is_writable
+        // checks missing or invalid path or characters, wrong permissions etc
+        try {
+            if (is_writable($directory)) {
+                return true;
+            }
+        } catch (\Exception $e) {
+        }
+        $this->log->warning('Temporary directory {dir} is not present or writable',
+            ['dir' => $directory]
+        );
+        return false;
+    }
 
-	/**
-	 * Override the temporary base directory
-	 *
-	 * @param string $directory
-	 */
-	public function overrideTempBaseDir($directory) {
-		$this->tmpBaseDir = $directory;
-	}
+    /**
+     * Override the temporary base directory
+     *
+     * @param string $directory
+     */
+    public function overrideTempBaseDir($directory) {
+        $this->tmpBaseDir = $directory;
+    }
 }

lib/private/Tagging/Tag.php

Indentation +47 added lines, -47 removed lines

@@ -36,54 +36,54 @@
  * @method void setName(string $name)
  */
 class Tag extends Entity {
-	protected $owner;
-	protected $type;
-	protected $name;
+    protected $owner;
+    protected $type;
+    protected $name;
 
-	/**
-	 * Constructor.
-	 *
-	 * @param string $owner The tag's owner
-	 * @param string $type The type of item this tag is used for
-	 * @param string $name The tag's name
-	 */
-	public function __construct($owner = null, $type = null, $name = null) {
-		$this->setOwner($owner);
-		$this->setType($type);
-		$this->setName($name);
-	}
+    /**
+     * Constructor.
+     *
+     * @param string $owner The tag's owner
+     * @param string $type The type of item this tag is used for
+     * @param string $name The tag's name
+     */
+    public function __construct($owner = null, $type = null, $name = null) {
+        $this->setOwner($owner);
+        $this->setType($type);
+        $this->setName($name);
+    }
 
-	/**
-	 * Transform a database columnname to a property
-	 *
-	 * @param string $columnName the name of the column
-	 * @return string the property name
-	 * @todo migrate existing database columns to the correct names
-	 * to be able to drop this direct mapping
-	 */
-	public function columnToProperty($columnName) {
-		if ($columnName === 'category') {
-			return 'name';
-		} elseif ($columnName === 'uid') {
-			return 'owner';
-		} else {
-			return parent::columnToProperty($columnName);
-		}
-	}
+    /**
+     * Transform a database columnname to a property
+     *
+     * @param string $columnName the name of the column
+     * @return string the property name
+     * @todo migrate existing database columns to the correct names
+     * to be able to drop this direct mapping
+     */
+    public function columnToProperty($columnName) {
+        if ($columnName === 'category') {
+            return 'name';
+        } elseif ($columnName === 'uid') {
+            return 'owner';
+        } else {
+            return parent::columnToProperty($columnName);
+        }
+    }
 
-	/**
-	 * Transform a property to a database column name
-	 *
-	 * @param string $property the name of the property
-	 * @return string the column name
-	 */
-	public function propertyToColumn($property) {
-		if ($property === 'name') {
-			return 'category';
-		} elseif ($property === 'owner') {
-			return 'uid';
-		} else {
-			return parent::propertyToColumn($property);
-		}
-	}
+    /**
+     * Transform a property to a database column name
+     *
+     * @param string $property the name of the property
+     * @return string the column name
+     */
+    public function propertyToColumn($property) {
+        if ($property === 'name') {
+            return 'category';
+        } elseif ($property === 'owner') {
+            return 'uid';
+        } else {
+            return parent::propertyToColumn($property);
+        }
+    }
 }

lib/private/Tagging/TagMapper.php

Spacing +3 added lines, -3 removed lines

@@ -54,8 +54,8 @@ 
 			$owners = [$owners];
 		}
 
-		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
-			. 'WHERE `uid` IN (' . str_repeat('?,', count($owners) - 1) . '?) AND `type` = ? ORDER BY `category`';
+		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `'.$this->getTableName().'` '
+			. 'WHERE `uid` IN ('.str_repeat('?,', count($owners) - 1).'?) AND `type` = ? ORDER BY `category`';
 		return $this->findEntities($sql, array_merge($owners, [$type]));
 	}
 
@@ -66,7 +66,7 @@ 
 	 * @return bool
 	 */
 	public function tagExists($tag) {
-		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
+		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `'.$this->getTableName().'` '
 			. 'WHERE `uid` = ? AND `type` = ? AND `category` = ?';
 		try {
 			$this->findEntity($sql, [$tag->getOwner(), $tag->getType(), $tag->getName()]);

Indentation +39 added lines, -39 removed lines

@@ -35,46 +35,46 @@
  */
 class TagMapper extends Mapper {
 
-	/**
-	 * Constructor.
-	 *
-	 * @param IDBConnection $db Instance of the Db abstraction layer.
-	 */
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'vcategory', Tag::class);
-	}
+    /**
+     * Constructor.
+     *
+     * @param IDBConnection $db Instance of the Db abstraction layer.
+     */
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'vcategory', Tag::class);
+    }
 
-	/**
-	 * Load tags from the database.
-	 *
-	 * @param array|string $owners The user(s) whose tags we are going to load.
-	 * @param string $type The type of item for which we are loading tags.
-	 * @return array An array of Tag objects.
-	 */
-	public function loadTags($owners, $type) {
-		if (!is_array($owners)) {
-			$owners = [$owners];
-		}
+    /**
+     * Load tags from the database.
+     *
+     * @param array|string $owners The user(s) whose tags we are going to load.
+     * @param string $type The type of item for which we are loading tags.
+     * @return array An array of Tag objects.
+     */
+    public function loadTags($owners, $type) {
+        if (!is_array($owners)) {
+            $owners = [$owners];
+        }
 
-		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
-			. 'WHERE `uid` IN (' . str_repeat('?,', count($owners) - 1) . '?) AND `type` = ? ORDER BY `category`';
-		return $this->findEntities($sql, array_merge($owners, [$type]));
-	}
+        $sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
+            . 'WHERE `uid` IN (' . str_repeat('?,', count($owners) - 1) . '?) AND `type` = ? ORDER BY `category`';
+        return $this->findEntities($sql, array_merge($owners, [$type]));
+    }
 
-	/**
-	 * Check if a given Tag object already exists in the database.
-	 *
-	 * @param Tag $tag The tag to look for in the database.
-	 * @return bool
-	 */
-	public function tagExists($tag) {
-		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
-			. 'WHERE `uid` = ? AND `type` = ? AND `category` = ?';
-		try {
-			$this->findEntity($sql, [$tag->getOwner(), $tag->getType(), $tag->getName()]);
-		} catch (DoesNotExistException $e) {
-			return false;
-		}
-		return true;
-	}
+    /**
+     * Check if a given Tag object already exists in the database.
+     *
+     * @param Tag $tag The tag to look for in the database.
+     * @return bool
+     */
+    public function tagExists($tag) {
+        $sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
+            . 'WHERE `uid` = ? AND `type` = ? AND `category` = ?';
+        try {
+            $this->findEntity($sql, [$tag->getOwner(), $tag->getType(), $tag->getName()]);
+        } catch (DoesNotExistException $e) {
+            return false;
+        }
+        return true;
+    }
 }

lib/private/AppFramework/Middleware/Security/Exceptions/StrictCookieMissingException.php

Indentation +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@
  * @package OC\AppFramework\Middleware\Security\Exceptions
  */
 class StrictCookieMissingException extends SecurityException {
-	public function __construct() {
-		parent::__construct('Strict Cookie has not been found in request.', Http::STATUS_PRECONDITION_FAILED);
-	}
+    public function __construct() {
+        parent::__construct('Strict Cookie has not been found in request.', Http::STATUS_PRECONDITION_FAILED);
+    }
 }

lib/private/AppFramework/OCS/V1Response.php

Spacing +2 added lines, -2 removed lines

@@ -70,8 +70,8 @@
 			'message' => $this->getOCSStatus() === 100 ? 'OK' : $this->statusMessage,
 		];
 
-		$meta['totalitems'] = $this->itemsCount !== null ? (string)$this->itemsCount : '';
-		$meta['itemsperpage'] = $this->itemsPerPage !== null ? (string)$this->itemsPerPage: '';
+		$meta['totalitems'] = $this->itemsCount !== null ? (string) $this->itemsCount : '';
+		$meta['itemsperpage'] = $this->itemsPerPage !== null ? (string) $this->itemsPerPage : '';
 
 		return $this->renderResult($meta);
 	}

Indentation +41 added lines, -41 removed lines

@@ -29,52 +29,52 @@
 
 class V1Response extends BaseResponse {
 
-	/**
-	 * The V1 endpoint has very limited http status codes basically everything
-	 * is status 200 except 401
-	 *
-	 * @return int
-	 */
-	public function getStatus() {
-		$status = parent::getStatus();
-		if ($status === Http::STATUS_FORBIDDEN || $status === OCSController::RESPOND_UNAUTHORISED) {
-			return Http::STATUS_UNAUTHORIZED;
-		}
+    /**
+     * The V1 endpoint has very limited http status codes basically everything
+     * is status 200 except 401
+     *
+     * @return int
+     */
+    public function getStatus() {
+        $status = parent::getStatus();
+        if ($status === Http::STATUS_FORBIDDEN || $status === OCSController::RESPOND_UNAUTHORISED) {
+            return Http::STATUS_UNAUTHORIZED;
+        }
 
-		return Http::STATUS_OK;
-	}
+        return Http::STATUS_OK;
+    }
 
-	/**
-	 * In v1 all OK is 100
-	 *
-	 * @return int
-	 */
-	public function getOCSStatus() {
-		$status = parent::getOCSStatus();
+    /**
+     * In v1 all OK is 100
+     *
+     * @return int
+     */
+    public function getOCSStatus() {
+        $status = parent::getOCSStatus();
 
-		if ($status === Http::STATUS_OK) {
-			return 100;
-		}
+        if ($status === Http::STATUS_OK) {
+            return 100;
+        }
 
-		return $status;
-	}
+        return $status;
+    }
 
-	/**
-	 * Construct the meta part of the response
-	 * And then late the base class render
-	 *
-	 * @return string
-	 */
-	public function render() {
-		$meta = [
-			'status' => $this->getOCSStatus() === 100 ? 'ok' : 'failure',
-			'statuscode' => $this->getOCSStatus(),
-			'message' => $this->getOCSStatus() === 100 ? 'OK' : $this->statusMessage,
-		];
+    /**
+     * Construct the meta part of the response
+     * And then late the base class render
+     *
+     * @return string
+     */
+    public function render() {
+        $meta = [
+            'status' => $this->getOCSStatus() === 100 ? 'ok' : 'failure',
+            'statuscode' => $this->getOCSStatus(),
+            'message' => $this->getOCSStatus() === 100 ? 'OK' : $this->statusMessage,
+        ];
 
-		$meta['totalitems'] = $this->itemsCount !== null ? (string)$this->itemsCount : '';
-		$meta['itemsperpage'] = $this->itemsPerPage !== null ? (string)$this->itemsPerPage: '';
+        $meta['totalitems'] = $this->itemsCount !== null ? (string)$this->itemsCount : '';
+        $meta['itemsperpage'] = $this->itemsPerPage !== null ? (string)$this->itemsPerPage: '';
 
-		return $this->renderResult($meta);
-	}
+        return $this->renderResult($meta);
+    }
 }

apps/dav/lib/Comments/RootCollection.php

Spacing +1 added lines, -1 removed lines

@@ -147,7 +147,7 @@
 		if (isset($this->entityTypeCollections[$name])) {
 			return $this->entityTypeCollections[$name];
 		}
-		throw new NotFound('Entity type "' . $name . '" not found."');
+		throw new NotFound('Entity type "'.$name.'" not found."');
 	}
 
 	/**

Indentation +172 added lines, -172 removed lines

@@ -37,176 +37,176 @@
 
 class RootCollection implements ICollection {
 
-	/** @var EntityTypeCollection[]|null */
-	private $entityTypeCollections;
-
-	/** @var ICommentsManager */
-	protected $commentsManager;
-
-	/** @var string */
-	protected $name = 'comments';
-
-	/** @var ILogger */
-	protected $logger;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/** @var EventDispatcherInterface */
-	protected $dispatcher;
-
-	/**
-	 * @param ICommentsManager $commentsManager
-	 * @param IUserManager $userManager
-	 * @param IUserSession $userSession
-	 * @param EventDispatcherInterface $dispatcher
-	 * @param ILogger $logger
-	 */
-	public function __construct(
-		ICommentsManager $commentsManager,
-		IUserManager $userManager,
-		IUserSession $userSession,
-		EventDispatcherInterface $dispatcher,
-		ILogger $logger) {
-		$this->commentsManager = $commentsManager;
-		$this->logger = $logger;
-		$this->userManager = $userManager;
-		$this->userSession = $userSession;
-		$this->dispatcher = $dispatcher;
-	}
-
-	/**
-	 * initializes the collection. At this point of time, we need the logged in
-	 * user. Since it is not the case when the instance is created, we cannot
-	 * have this in the constructor.
-	 *
-	 * @throws NotAuthenticated
-	 */
-	protected function initCollections() {
-		if ($this->entityTypeCollections !== null) {
-			return;
-		}
-		$user = $this->userSession->getUser();
-		if (is_null($user)) {
-			throw new NotAuthenticated();
-		}
-
-		$event = new CommentsEntityEvent(CommentsEntityEvent::EVENT_ENTITY);
-		$this->dispatcher->dispatch(CommentsEntityEvent::EVENT_ENTITY, $event);
-
-		$this->entityTypeCollections = [];
-		foreach ($event->getEntityCollections() as $entity => $entityExistsFunction) {
-			$this->entityTypeCollections[$entity] = new EntityTypeCollection(
-				$entity,
-				$this->commentsManager,
-				$this->userManager,
-				$this->userSession,
-				$this->logger,
-				$entityExistsFunction
-			);
-		}
-	}
-
-	/**
-	 * Creates a new file in the directory
-	 *
-	 * @param string $name Name of the file
-	 * @param resource|string $data Initial payload
-	 * @return null|string
-	 * @throws Forbidden
-	 */
-	public function createFile($name, $data = null) {
-		throw new Forbidden('Cannot create comments by id');
-	}
-
-	/**
-	 * Creates a new subdirectory
-	 *
-	 * @param string $name
-	 * @throws Forbidden
-	 */
-	public function createDirectory($name) {
-		throw new Forbidden('Permission denied to create collections');
-	}
-
-	/**
-	 * Returns a specific child node, referenced by its name
-	 *
-	 * This method must throw Sabre\DAV\Exception\NotFound if the node does not
-	 * exist.
-	 *
-	 * @param string $name
-	 * @return \Sabre\DAV\INode
-	 * @throws NotFound
-	 */
-	public function getChild($name) {
-		$this->initCollections();
-		if (isset($this->entityTypeCollections[$name])) {
-			return $this->entityTypeCollections[$name];
-		}
-		throw new NotFound('Entity type "' . $name . '" not found."');
-	}
-
-	/**
-	 * Returns an array with all the child nodes
-	 *
-	 * @return \Sabre\DAV\INode[]
-	 */
-	public function getChildren() {
-		$this->initCollections();
-		return $this->entityTypeCollections;
-	}
-
-	/**
-	 * Checks if a child-node with the specified name exists
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function childExists($name) {
-		$this->initCollections();
-		return isset($this->entityTypeCollections[$name]);
-	}
-
-	/**
-	 * Deleted the current node
-	 *
-	 * @throws Forbidden
-	 */
-	public function delete() {
-		throw new Forbidden('Permission denied to delete this collection');
-	}
-
-	/**
-	 * Returns the name of the node.
-	 *
-	 * This is used to generate the url.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return $this->name;
-	}
-
-	/**
-	 * Renames the node
-	 *
-	 * @param string $name The new name
-	 * @throws Forbidden
-	 */
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this collection');
-	}
-
-	/**
-	 * Returns the last modification time, as a unix timestamp
-	 *
-	 * @return int
-	 */
-	public function getLastModified() {
-		return null;
-	}
+    /** @var EntityTypeCollection[]|null */
+    private $entityTypeCollections;
+
+    /** @var ICommentsManager */
+    protected $commentsManager;
+
+    /** @var string */
+    protected $name = 'comments';
+
+    /** @var ILogger */
+    protected $logger;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IUserSession */
+    protected $userSession;
+
+    /** @var EventDispatcherInterface */
+    protected $dispatcher;
+
+    /**
+     * @param ICommentsManager $commentsManager
+     * @param IUserManager $userManager
+     * @param IUserSession $userSession
+     * @param EventDispatcherInterface $dispatcher
+     * @param ILogger $logger
+     */
+    public function __construct(
+        ICommentsManager $commentsManager,
+        IUserManager $userManager,
+        IUserSession $userSession,
+        EventDispatcherInterface $dispatcher,
+        ILogger $logger) {
+        $this->commentsManager = $commentsManager;
+        $this->logger = $logger;
+        $this->userManager = $userManager;
+        $this->userSession = $userSession;
+        $this->dispatcher = $dispatcher;
+    }
+
+    /**
+     * initializes the collection. At this point of time, we need the logged in
+     * user. Since it is not the case when the instance is created, we cannot
+     * have this in the constructor.
+     *
+     * @throws NotAuthenticated
+     */
+    protected function initCollections() {
+        if ($this->entityTypeCollections !== null) {
+            return;
+        }
+        $user = $this->userSession->getUser();
+        if (is_null($user)) {
+            throw new NotAuthenticated();
+        }
+
+        $event = new CommentsEntityEvent(CommentsEntityEvent::EVENT_ENTITY);
+        $this->dispatcher->dispatch(CommentsEntityEvent::EVENT_ENTITY, $event);
+
+        $this->entityTypeCollections = [];
+        foreach ($event->getEntityCollections() as $entity => $entityExistsFunction) {
+            $this->entityTypeCollections[$entity] = new EntityTypeCollection(
+                $entity,
+                $this->commentsManager,
+                $this->userManager,
+                $this->userSession,
+                $this->logger,
+                $entityExistsFunction
+            );
+        }
+    }
+
+    /**
+     * Creates a new file in the directory
+     *
+     * @param string $name Name of the file
+     * @param resource|string $data Initial payload
+     * @return null|string
+     * @throws Forbidden
+     */
+    public function createFile($name, $data = null) {
+        throw new Forbidden('Cannot create comments by id');
+    }
+
+    /**
+     * Creates a new subdirectory
+     *
+     * @param string $name
+     * @throws Forbidden
+     */
+    public function createDirectory($name) {
+        throw new Forbidden('Permission denied to create collections');
+    }
+
+    /**
+     * Returns a specific child node, referenced by its name
+     *
+     * This method must throw Sabre\DAV\Exception\NotFound if the node does not
+     * exist.
+     *
+     * @param string $name
+     * @return \Sabre\DAV\INode
+     * @throws NotFound
+     */
+    public function getChild($name) {
+        $this->initCollections();
+        if (isset($this->entityTypeCollections[$name])) {
+            return $this->entityTypeCollections[$name];
+        }
+        throw new NotFound('Entity type "' . $name . '" not found."');
+    }
+
+    /**
+     * Returns an array with all the child nodes
+     *
+     * @return \Sabre\DAV\INode[]
+     */
+    public function getChildren() {
+        $this->initCollections();
+        return $this->entityTypeCollections;
+    }
+
+    /**
+     * Checks if a child-node with the specified name exists
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name) {
+        $this->initCollections();
+        return isset($this->entityTypeCollections[$name]);
+    }
+
+    /**
+     * Deleted the current node
+     *
+     * @throws Forbidden
+     */
+    public function delete() {
+        throw new Forbidden('Permission denied to delete this collection');
+    }
+
+    /**
+     * Returns the name of the node.
+     *
+     * This is used to generate the url.
+     *
+     * @return string
+     */
+    public function getName() {
+        return $this->name;
+    }
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @throws Forbidden
+     */
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this collection');
+    }
+
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int
+     */
+    public function getLastModified() {
+        return null;
+    }
 }

apps/dav/lib/Comments/EntityTypeCollection.php

Indentation +74 added lines, -74 removed lines

@@ -43,84 +43,84 @@
  */
 class EntityTypeCollection extends RootCollection {
 
-	/** @var ILogger */
-	protected $logger;
+    /** @var ILogger */
+    protected $logger;
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/** @var \Closure */
-	protected $childExistsFunction;
+    /** @var \Closure */
+    protected $childExistsFunction;
 
-	/**
-	 * @param string $name
-	 * @param ICommentsManager $commentsManager
-	 * @param IUserManager $userManager
-	 * @param IUserSession $userSession
-	 * @param ILogger $logger
-	 * @param \Closure $childExistsFunction
-	 */
-	public function __construct(
-		$name,
-		ICommentsManager $commentsManager,
-		IUserManager $userManager,
-		IUserSession $userSession,
-		ILogger $logger,
-		\Closure $childExistsFunction
-	) {
-		$name = trim($name);
-		if (empty($name) || !is_string($name)) {
-			throw new \InvalidArgumentException('"name" parameter must be non-empty string');
-		}
-		$this->name = $name;
-		$this->commentsManager = $commentsManager;
-		$this->logger = $logger;
-		$this->userManager = $userManager;
-		$this->userSession = $userSession;
-		$this->childExistsFunction = $childExistsFunction;
-	}
+    /**
+     * @param string $name
+     * @param ICommentsManager $commentsManager
+     * @param IUserManager $userManager
+     * @param IUserSession $userSession
+     * @param ILogger $logger
+     * @param \Closure $childExistsFunction
+     */
+    public function __construct(
+        $name,
+        ICommentsManager $commentsManager,
+        IUserManager $userManager,
+        IUserSession $userSession,
+        ILogger $logger,
+        \Closure $childExistsFunction
+    ) {
+        $name = trim($name);
+        if (empty($name) || !is_string($name)) {
+            throw new \InvalidArgumentException('"name" parameter must be non-empty string');
+        }
+        $this->name = $name;
+        $this->commentsManager = $commentsManager;
+        $this->logger = $logger;
+        $this->userManager = $userManager;
+        $this->userSession = $userSession;
+        $this->childExistsFunction = $childExistsFunction;
+    }
 
-	/**
-	 * Returns a specific child node, referenced by its name
-	 *
-	 * This method must throw Sabre\DAV\Exception\NotFound if the node does not
-	 * exist.
-	 *
-	 * @param string $name
-	 * @return \Sabre\DAV\INode
-	 * @throws NotFound
-	 */
-	public function getChild($name) {
-		if (!$this->childExists($name)) {
-			throw new NotFound('Entity does not exist or is not available');
-		}
-		return new EntityCollection(
-			$name,
-			$this->name,
-			$this->commentsManager,
-			$this->userManager,
-			$this->userSession,
-			$this->logger
-		);
-	}
+    /**
+     * Returns a specific child node, referenced by its name
+     *
+     * This method must throw Sabre\DAV\Exception\NotFound if the node does not
+     * exist.
+     *
+     * @param string $name
+     * @return \Sabre\DAV\INode
+     * @throws NotFound
+     */
+    public function getChild($name) {
+        if (!$this->childExists($name)) {
+            throw new NotFound('Entity does not exist or is not available');
+        }
+        return new EntityCollection(
+            $name,
+            $this->name,
+            $this->commentsManager,
+            $this->userManager,
+            $this->userSession,
+            $this->logger
+        );
+    }
 
-	/**
-	 * Returns an array with all the child nodes
-	 *
-	 * @return \Sabre\DAV\INode[]
-	 * @throws MethodNotAllowed
-	 */
-	public function getChildren() {
-		throw new MethodNotAllowed('No permission to list folder contents');
-	}
+    /**
+     * Returns an array with all the child nodes
+     *
+     * @return \Sabre\DAV\INode[]
+     * @throws MethodNotAllowed
+     */
+    public function getChildren() {
+        throw new MethodNotAllowed('No permission to list folder contents');
+    }
 
-	/**
-	 * Checks if a child-node with the specified name exists
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function childExists($name) {
-		return call_user_func($this->childExistsFunction, $name);
-	}
+    /**
+     * Checks if a child-node with the specified name exists
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name) {
+        return call_user_func($this->childExistsFunction, $name);
+    }
 }