nextcloud / server

lib/private/Files/Config/UserMountCacheListener.php

Indentation +15 added lines, -15 removed lines

@@ -29,21 +29,21 @@
  * Listen to hooks and update the mount cache as needed
  */
 class UserMountCacheListener {
-	/**
-	 * @var IUserMountCache
-	 */
-	private $userMountCache;
+    /**
+     * @var IUserMountCache
+     */
+    private $userMountCache;
 
-	/**
-	 * UserMountCacheListener constructor.
-	 *
-	 * @param IUserMountCache $userMountCache
-	 */
-	public function __construct(IUserMountCache $userMountCache) {
-		$this->userMountCache = $userMountCache;
-	}
+    /**
+     * UserMountCacheListener constructor.
+     *
+     * @param IUserMountCache $userMountCache
+     */
+    public function __construct(IUserMountCache $userMountCache) {
+        $this->userMountCache = $userMountCache;
+    }
 
-	public function listen(Manager $manager) {
-		$manager->listen('\OC\User', 'postDelete', [$this->userMountCache, 'removeUserMounts']);
-	}
+    public function listen(Manager $manager) {
+        $manager->listen('\OC\User', 'postDelete', [$this->userMountCache, 'removeUserMounts']);
+    }
 }

lib/private/Files/Notify/RenameChange.php

Indentation +21 added lines, -21 removed lines

@@ -26,27 +26,27 @@
 use OCP\Files\Notify\IRenameChange;
 
 class RenameChange extends Change implements IRenameChange {
-	/** @var string */
-	private $targetPath;
+    /** @var string */
+    private $targetPath;
 
-	/**
-	 * Change constructor.
-	 *
-	 * @param int $type
-	 * @param string $path
-	 * @param string $targetPath
-	 */
-	public function __construct($type, $path, $targetPath) {
-		parent::__construct($type, $path);
-		$this->targetPath = $targetPath;
-	}
+    /**
+     * Change constructor.
+     *
+     * @param int $type
+     * @param string $path
+     * @param string $targetPath
+     */
+    public function __construct($type, $path, $targetPath) {
+        parent::__construct($type, $path);
+        $this->targetPath = $targetPath;
+    }
 
-	/**
-	 * Get the new path of the renamed file relative to the storage root
-	 *
-	 * @return string
-	 */
-	public function getTargetPath() {
-		return $this->targetPath;
-	}
+    /**
+     * Get the new path of the renamed file relative to the storage root
+     *
+     * @return string
+     */
+    public function getTargetPath() {
+        return $this->targetPath;
+    }
 }

lib/private/Files/Notify/Change.php

Indentation +32 added lines, -32 removed lines

@@ -26,40 +26,40 @@
 use OCP\Files\Notify\IChange;
 
 class Change implements IChange {
-	/** @var int */
-	private $type;
+    /** @var int */
+    private $type;
 
-	/** @var string */
-	private $path;
+    /** @var string */
+    private $path;
 
-	/**
-	 * Change constructor.
-	 *
-	 * @param int $type
-	 * @param string $path
-	 */
-	public function __construct($type, $path) {
-		$this->type = $type;
-		$this->path = $path;
-	}
+    /**
+     * Change constructor.
+     *
+     * @param int $type
+     * @param string $path
+     */
+    public function __construct($type, $path) {
+        $this->type = $type;
+        $this->path = $path;
+    }
 
-	/**
-	 * Get the type of the change
-	 *
-	 * @return int IChange::ADDED, IChange::REMOVED, IChange::MODIFIED or IChange::RENAMED
-	 */
-	public function getType() {
-		return $this->type;
-	}
+    /**
+     * Get the type of the change
+     *
+     * @return int IChange::ADDED, IChange::REMOVED, IChange::MODIFIED or IChange::RENAMED
+     */
+    public function getType() {
+        return $this->type;
+    }
 
-	/**
-	 * Get the path of the file that was changed relative to the root of the storage
-	 *
-	 * Note, for rename changes this path is the old path for the file
-	 *
-	 * @return mixed
-	 */
-	public function getPath() {
-		return $this->path;
-	}
+    /**
+     * Get the path of the file that was changed relative to the root of the storage
+     *
+     * Note, for rename changes this path is the old path for the file
+     *
+     * @return mixed
+     */
+    public function getPath() {
+        return $this->path;
+    }
 }

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

Indentation +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@
  * @package OC\AppFramework\Middleware\Security\Exceptions
  */
 class CrossSiteRequestForgeryException extends SecurityException {
-	public function __construct() {
-		parent::__construct('CSRF check failed', Http::STATUS_PRECONDITION_FAILED);
-	}
+    public function __construct() {
+        parent::__construct('CSRF check failed', Http::STATUS_PRECONDITION_FAILED);
+    }
 }

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

Indentation +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@
  * @package OC\AppFramework\Middleware\Security\Exceptions
  */
 class AppNotEnabledException extends SecurityException {
-	public function __construct() {
-		parent::__construct('App is not enabled', Http::STATUS_PRECONDITION_FAILED);
-	}
+    public function __construct() {
+        parent::__construct('App is not enabled', Http::STATUS_PRECONDITION_FAILED);
+    }
 }

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

Indentation +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@
  * @package OC\AppFramework\Middleware\Security\Exceptions
  */
 class NotLoggedInException extends SecurityException {
-	public function __construct() {
-		parent::__construct('Current user is not logged in', Http::STATUS_UNAUTHORIZED);
-	}
+    public function __construct() {
+        parent::__construct('Current user is not logged in', Http::STATUS_UNAUTHORIZED);
+    }
 }

lib/private/DB/AdapterOCI8.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 		}
 		if ($table !== null) {
 			$suffix = '_SEQ';
-			$table = '"' . $table . $suffix . '"';
+			$table = '"'.$table.$suffix.'"';
 		}
 		return $this->conn->realLastInsertId($table);
 	}

Indentation +18 added lines, -18 removed lines

@@ -26,24 +26,24 @@
 namespace OC\DB;
 
 class AdapterOCI8 extends Adapter {
-	public function lastInsertId($table) {
-		if (is_null($table)) {
-			throw new \InvalidArgumentException('Oracle requires a table name to be passed into lastInsertId()');
-		}
-		if ($table !== null) {
-			$suffix = '_SEQ';
-			$table = '"' . $table . $suffix . '"';
-		}
-		return $this->conn->realLastInsertId($table);
-	}
+    public function lastInsertId($table) {
+        if (is_null($table)) {
+            throw new \InvalidArgumentException('Oracle requires a table name to be passed into lastInsertId()');
+        }
+        if ($table !== null) {
+            $suffix = '_SEQ';
+            $table = '"' . $table . $suffix . '"';
+        }
+        return $this->conn->realLastInsertId($table);
+    }
 
-	public const UNIX_TIMESTAMP_REPLACEMENT = "(cast(sys_extract_utc(systimestamp) as date) - date'1970-01-01') * 86400";
+    public const UNIX_TIMESTAMP_REPLACEMENT = "(cast(sys_extract_utc(systimestamp) as date) - date'1970-01-01') * 86400";
 
-	public function fixupStatement($statement) {
-		$statement = preg_replace('/`(\w+)` ILIKE \?/', 'REGEXP_LIKE(`$1`, \'^\' || REPLACE(?, \'%\', \'.*\') || \'$\', \'i\')', $statement);
-		$statement = str_replace('`', '"', $statement);
-		$statement = str_ireplace('NOW()', 'CURRENT_TIMESTAMP', $statement);
-		$statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement);
-		return $statement;
-	}
+    public function fixupStatement($statement) {
+        $statement = preg_replace('/`(\w+)` ILIKE \?/', 'REGEXP_LIKE(`$1`, \'^\' || REPLACE(?, \'%\', \'.*\') || \'$\', \'i\')', $statement);
+        $statement = str_replace('`', '"', $statement);
+        $statement = str_ireplace('NOW()', 'CURRENT_TIMESTAMP', $statement);
+        $statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement);
+        return $statement;
+    }
 }

lib/private/Encryption/Exceptions/ModuleAlreadyExistsException.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	 * @param string $name
 	 */
 	public function __construct($id, $name) {
-		parent::__construct('Id "' . $id . '" already used by encryption module "' . $name . '"');
+		parent::__construct('Id "'.$id.'" already used by encryption module "'.$name.'"');
 	}
 
 }

Indentation +7 added lines, -7 removed lines

@@ -25,11 +25,11 @@
 use OCP\Encryption\Exceptions\GenericEncryptionException;
 
 class ModuleAlreadyExistsException extends GenericEncryptionException {
-	/**
-	 * @param string $id
-	 * @param string $name
-	 */
-	public function __construct($id, $name) {
-		parent::__construct('Id "' . $id . '" already used by encryption module "' . $name . '"');
-	}
+    /**
+     * @param string $id
+     * @param string $name
+     */
+    public function __construct($id, $name) {
+        parent::__construct('Id "' . $id . '" already used by encryption module "' . $name . '"');
+    }
 }

lib/private/Encryption/Manager.php

Spacing +1 added lines, -1 removed lines

@@ -274,7 +274,7 @@
 		}
 
 		// check if key storage is mounted correctly
-		if ($this->rootView->file_exists($rootDir . '/' . Storage::KEY_STORAGE_MARKER)) {
+		if ($this->rootView->file_exists($rootDir.'/'.Storage::KEY_STORAGE_MARKER)) {
 			return true;
 		}
 

Indentation +206 added lines, -206 removed lines

@@ -21,210 +21,210 @@
 use Psr\Log\LoggerInterface;
 
 class Manager implements IManager {
-	protected array $encryptionModules;
-
-	public function __construct(
-		protected IConfig $config,
-		protected LoggerInterface $logger,
-		protected IL10N $l,
-		protected View $rootView,
-		protected Util $util,
-		protected ArrayCache $arrayCache,
-	) {
-		$this->encryptionModules = [];
-	}
-
-	/**
-	 * Check if encryption is enabled
-	 *
-	 * @return bool true if enabled, false if not
-	 */
-	public function isEnabled() {
-		$installed = $this->config->getSystemValueBool('installed', false);
-		if (!$installed) {
-			return false;
-		}
-
-		$enabled = $this->config->getAppValue('core', 'encryption_enabled', 'no');
-		return $enabled === 'yes';
-	}
-
-	/**
-	 * check if new encryption is ready
-	 *
-	 * @return bool
-	 * @throws ServiceUnavailableException
-	 */
-	public function isReady() {
-		if ($this->isKeyStorageReady() === false) {
-			throw new ServiceUnavailableException('Key Storage is not ready');
-		}
-
-		return true;
-	}
-
-	/**
-	 * @param string $user
-	 */
-	public function isReadyForUser($user) {
-		if (!$this->isReady()) {
-			return false;
-		}
-
-		foreach ($this->getEncryptionModules() as $module) {
-			/** @var IEncryptionModule $m */
-			$m = call_user_func($module['callback']);
-			if (!$m->isReadyForUser($user)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Registers an callback function which must return an encryption module instance
-	 *
-	 * @param string $id
-	 * @param string $displayName
-	 * @param callable $callback
-	 * @throws Exceptions\ModuleAlreadyExistsException
-	 */
-	public function registerEncryptionModule($id, $displayName, callable $callback) {
-		if (isset($this->encryptionModules[$id])) {
-			throw new Exceptions\ModuleAlreadyExistsException($id, $displayName);
-		}
-
-		$this->encryptionModules[$id] = [
-			'id' => $id,
-			'displayName' => $displayName,
-			'callback' => $callback,
-		];
-
-		$defaultEncryptionModuleId = $this->getDefaultEncryptionModuleId();
-
-		if (empty($defaultEncryptionModuleId)) {
-			$this->setDefaultEncryptionModule($id);
-		}
-	}
-
-	/**
-	 * Unregisters an encryption module
-	 *
-	 * @param string $moduleId
-	 */
-	public function unregisterEncryptionModule($moduleId) {
-		unset($this->encryptionModules[$moduleId]);
-	}
-
-	/**
-	 * get a list of all encryption modules
-	 *
-	 * @return array [id => ['id' => $id, 'displayName' => $displayName, 'callback' => callback]]
-	 */
-	public function getEncryptionModules() {
-		return $this->encryptionModules;
-	}
-
-	/**
-	 * get a specific encryption module
-	 *
-	 * @param string $moduleId
-	 * @return IEncryptionModule
-	 * @throws Exceptions\ModuleDoesNotExistsException
-	 */
-	public function getEncryptionModule($moduleId = '') {
-		if (empty($moduleId)) {
-			return $this->getDefaultEncryptionModule();
-		}
-		if (isset($this->encryptionModules[$moduleId])) {
-			return call_user_func($this->encryptionModules[$moduleId]['callback']);
-		}
-		$message = "Module with ID: $moduleId does not exist.";
-		$hint = $this->l->t('Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator.', [$moduleId]);
-		throw new Exceptions\ModuleDoesNotExistsException($message, $hint);
-	}
-
-	/**
-	 * get default encryption module
-	 *
-	 * @return \OCP\Encryption\IEncryptionModule
-	 * @throws Exceptions\ModuleDoesNotExistsException
-	 */
-	protected function getDefaultEncryptionModule() {
-		$defaultModuleId = $this->getDefaultEncryptionModuleId();
-		if (empty($defaultModuleId)) {
-			$message = 'No default encryption module defined';
-			throw new Exceptions\ModuleDoesNotExistsException($message);
-		}
-		if (isset($this->encryptionModules[$defaultModuleId])) {
-			return call_user_func($this->encryptionModules[$defaultModuleId]['callback']);
-		}
-		$message = 'Default encryption module not loaded';
-		throw new Exceptions\ModuleDoesNotExistsException($message);
-	}
-
-	/**
-	 * set default encryption module Id
-	 *
-	 * @param string $moduleId
-	 * @return bool
-	 */
-	public function setDefaultEncryptionModule($moduleId) {
-		try {
-			$this->getEncryptionModule($moduleId);
-		} catch (\Exception $e) {
-			return false;
-		}
-
-		$this->config->setAppValue('core', 'default_encryption_module', $moduleId);
-		return true;
-	}
-
-	/**
-	 * get default encryption module Id
-	 *
-	 * @return string
-	 */
-	public function getDefaultEncryptionModuleId() {
-		return $this->config->getAppValue('core', 'default_encryption_module');
-	}
-
-	/**
-	 * Add storage wrapper
-	 */
-	public function setupStorage() {
-		// If encryption is disabled and there are no loaded modules it makes no sense to load the wrapper
-		if (!empty($this->encryptionModules) || $this->isEnabled()) {
-			$encryptionWrapper = new EncryptionWrapper($this->arrayCache, $this, $this->logger);
-			Filesystem::addStorageWrapper('oc_encryption', [$encryptionWrapper, 'wrapStorage'], 2);
-		}
-	}
-
-	public function forceWrapStorage(IMountPoint $mountPoint, IStorage $storage) {
-		$encryptionWrapper = new EncryptionWrapper($this->arrayCache, $this, $this->logger);
-		return $encryptionWrapper->wrapStorage($mountPoint->getMountPoint(), $storage, $mountPoint, true);
-	}
-
-
-	/**
-	 * check if key storage is ready
-	 *
-	 * @return bool
-	 */
-	protected function isKeyStorageReady() {
-		$rootDir = $this->util->getKeyStorageRoot();
-
-		// the default root is always valid
-		if ($rootDir === '') {
-			return true;
-		}
-
-		// check if key storage is mounted correctly
-		if ($this->rootView->file_exists($rootDir . '/' . Storage::KEY_STORAGE_MARKER)) {
-			return true;
-		}
-
-		return false;
-	}
+    protected array $encryptionModules;
+
+    public function __construct(
+        protected IConfig $config,
+        protected LoggerInterface $logger,
+        protected IL10N $l,
+        protected View $rootView,
+        protected Util $util,
+        protected ArrayCache $arrayCache,
+    ) {
+        $this->encryptionModules = [];
+    }
+
+    /**
+     * Check if encryption is enabled
+     *
+     * @return bool true if enabled, false if not
+     */
+    public function isEnabled() {
+        $installed = $this->config->getSystemValueBool('installed', false);
+        if (!$installed) {
+            return false;
+        }
+
+        $enabled = $this->config->getAppValue('core', 'encryption_enabled', 'no');
+        return $enabled === 'yes';
+    }
+
+    /**
+     * check if new encryption is ready
+     *
+     * @return bool
+     * @throws ServiceUnavailableException
+     */
+    public function isReady() {
+        if ($this->isKeyStorageReady() === false) {
+            throw new ServiceUnavailableException('Key Storage is not ready');
+        }
+
+        return true;
+    }
+
+    /**
+     * @param string $user
+     */
+    public function isReadyForUser($user) {
+        if (!$this->isReady()) {
+            return false;
+        }
+
+        foreach ($this->getEncryptionModules() as $module) {
+            /** @var IEncryptionModule $m */
+            $m = call_user_func($module['callback']);
+            if (!$m->isReadyForUser($user)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Registers an callback function which must return an encryption module instance
+     *
+     * @param string $id
+     * @param string $displayName
+     * @param callable $callback
+     * @throws Exceptions\ModuleAlreadyExistsException
+     */
+    public function registerEncryptionModule($id, $displayName, callable $callback) {
+        if (isset($this->encryptionModules[$id])) {
+            throw new Exceptions\ModuleAlreadyExistsException($id, $displayName);
+        }
+
+        $this->encryptionModules[$id] = [
+            'id' => $id,
+            'displayName' => $displayName,
+            'callback' => $callback,
+        ];
+
+        $defaultEncryptionModuleId = $this->getDefaultEncryptionModuleId();
+
+        if (empty($defaultEncryptionModuleId)) {
+            $this->setDefaultEncryptionModule($id);
+        }
+    }
+
+    /**
+     * Unregisters an encryption module
+     *
+     * @param string $moduleId
+     */
+    public function unregisterEncryptionModule($moduleId) {
+        unset($this->encryptionModules[$moduleId]);
+    }
+
+    /**
+     * get a list of all encryption modules
+     *
+     * @return array [id => ['id' => $id, 'displayName' => $displayName, 'callback' => callback]]
+     */
+    public function getEncryptionModules() {
+        return $this->encryptionModules;
+    }
+
+    /**
+     * get a specific encryption module
+     *
+     * @param string $moduleId
+     * @return IEncryptionModule
+     * @throws Exceptions\ModuleDoesNotExistsException
+     */
+    public function getEncryptionModule($moduleId = '') {
+        if (empty($moduleId)) {
+            return $this->getDefaultEncryptionModule();
+        }
+        if (isset($this->encryptionModules[$moduleId])) {
+            return call_user_func($this->encryptionModules[$moduleId]['callback']);
+        }
+        $message = "Module with ID: $moduleId does not exist.";
+        $hint = $this->l->t('Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator.', [$moduleId]);
+        throw new Exceptions\ModuleDoesNotExistsException($message, $hint);
+    }
+
+    /**
+     * get default encryption module
+     *
+     * @return \OCP\Encryption\IEncryptionModule
+     * @throws Exceptions\ModuleDoesNotExistsException
+     */
+    protected function getDefaultEncryptionModule() {
+        $defaultModuleId = $this->getDefaultEncryptionModuleId();
+        if (empty($defaultModuleId)) {
+            $message = 'No default encryption module defined';
+            throw new Exceptions\ModuleDoesNotExistsException($message);
+        }
+        if (isset($this->encryptionModules[$defaultModuleId])) {
+            return call_user_func($this->encryptionModules[$defaultModuleId]['callback']);
+        }
+        $message = 'Default encryption module not loaded';
+        throw new Exceptions\ModuleDoesNotExistsException($message);
+    }
+
+    /**
+     * set default encryption module Id
+     *
+     * @param string $moduleId
+     * @return bool
+     */
+    public function setDefaultEncryptionModule($moduleId) {
+        try {
+            $this->getEncryptionModule($moduleId);
+        } catch (\Exception $e) {
+            return false;
+        }
+
+        $this->config->setAppValue('core', 'default_encryption_module', $moduleId);
+        return true;
+    }
+
+    /**
+     * get default encryption module Id
+     *
+     * @return string
+     */
+    public function getDefaultEncryptionModuleId() {
+        return $this->config->getAppValue('core', 'default_encryption_module');
+    }
+
+    /**
+     * Add storage wrapper
+     */
+    public function setupStorage() {
+        // If encryption is disabled and there are no loaded modules it makes no sense to load the wrapper
+        if (!empty($this->encryptionModules) || $this->isEnabled()) {
+            $encryptionWrapper = new EncryptionWrapper($this->arrayCache, $this, $this->logger);
+            Filesystem::addStorageWrapper('oc_encryption', [$encryptionWrapper, 'wrapStorage'], 2);
+        }
+    }
+
+    public function forceWrapStorage(IMountPoint $mountPoint, IStorage $storage) {
+        $encryptionWrapper = new EncryptionWrapper($this->arrayCache, $this, $this->logger);
+        return $encryptionWrapper->wrapStorage($mountPoint->getMountPoint(), $storage, $mountPoint, true);
+    }
+
+
+    /**
+     * check if key storage is ready
+     *
+     * @return bool
+     */
+    protected function isKeyStorageReady() {
+        $rootDir = $this->util->getKeyStorageRoot();
+
+        // the default root is always valid
+        if ($rootDir === '') {
+            return true;
+        }
+
+        // check if key storage is mounted correctly
+        if ($this->rootView->file_exists($rootDir . '/' . Storage::KEY_STORAGE_MARKER)) {
+            return true;
+        }
+
+        return false;
+    }
 }