nextcloud / server

apps/dav/lib/Upload/UploadFolder.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 	}
 
 	public function createDirectory($name) {
-		throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
+		throw new Forbidden('Permission denied to create file (filename '.$name.')');
 	}
 
 	public function getChild($name) {

Indentation +64 added lines, -64 removed lines

@@ -30,68 +30,68 @@
 
 class UploadFolder implements ICollection {
 
-	/** @var Directory */
-	private $node;
-	/** @var CleanupService */
-	private $cleanupService;
-
-	public function __construct(Directory $node, CleanupService $cleanupService) {
-		$this->node = $node;
-		$this->cleanupService = $cleanupService;
-	}
-
-	public function createFile($name, $data = null) {
-		// TODO: verify name - should be a simple number
-		$this->node->createFile($name, $data);
-	}
-
-	public function createDirectory($name) {
-		throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
-	}
-
-	public function getChild($name) {
-		if ($name === '.file') {
-			return new FutureFile($this->node, '.file');
-		}
-		return new UploadFile($this->node->getChild($name));
-	}
-
-	public function getChildren() {
-		$tmpChildren = $this->node->getChildren();
-
-		$children = [];
-		$children[] = new FutureFile($this->node, '.file');
-
-		foreach ($tmpChildren as $child) {
-			$children[] = new UploadFile($child);
-		}
-
-		return $children;
-	}
-
-	public function childExists($name) {
-		if ($name === '.file') {
-			return true;
-		}
-		return $this->node->childExists($name);
-	}
-
-	public function delete() {
-		$this->node->delete();
-
-		// Background cleanup job is not needed anymore
-		$this->cleanupService->removeJob($this->getName());
-	}
-
-	public function getName() {
-		return $this->node->getName();
-	}
-
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this folder');
-	}
-
-	public function getLastModified() {
-		return $this->node->getLastModified();
-	}
+    /** @var Directory */
+    private $node;
+    /** @var CleanupService */
+    private $cleanupService;
+
+    public function __construct(Directory $node, CleanupService $cleanupService) {
+        $this->node = $node;
+        $this->cleanupService = $cleanupService;
+    }
+
+    public function createFile($name, $data = null) {
+        // TODO: verify name - should be a simple number
+        $this->node->createFile($name, $data);
+    }
+
+    public function createDirectory($name) {
+        throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
+    }
+
+    public function getChild($name) {
+        if ($name === '.file') {
+            return new FutureFile($this->node, '.file');
+        }
+        return new UploadFile($this->node->getChild($name));
+    }
+
+    public function getChildren() {
+        $tmpChildren = $this->node->getChildren();
+
+        $children = [];
+        $children[] = new FutureFile($this->node, '.file');
+
+        foreach ($tmpChildren as $child) {
+            $children[] = new UploadFile($child);
+        }
+
+        return $children;
+    }
+
+    public function childExists($name) {
+        if ($name === '.file') {
+            return true;
+        }
+        return $this->node->childExists($name);
+    }
+
+    public function delete() {
+        $this->node->delete();
+
+        // Background cleanup job is not needed anymore
+        $this->cleanupService->removeJob($this->getName());
+    }
+
+    public function getName() {
+        return $this->node->getName();
+    }
+
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this folder');
+    }
+
+    public function getLastModified() {
+        return $this->node->getLastModified();
+    }
 }

apps/dav/lib/Upload/FutureFile.php

Indentation +72 added lines, -72 removed lines

@@ -36,87 +36,87 @@
  */
 class FutureFile implements \Sabre\DAV\IFile {
 
-	/** @var Directory */
-	private $root;
-	/** @var string */
-	private $name;
+    /** @var Directory */
+    private $root;
+    /** @var string */
+    private $name;
 
-	/**
-	 * @param Directory $root
-	 * @param string $name
-	 */
-	public function __construct(Directory $root, $name) {
-		$this->root = $root;
-		$this->name = $name;
-	}
+    /**
+     * @param Directory $root
+     * @param string $name
+     */
+    public function __construct(Directory $root, $name) {
+        $this->root = $root;
+        $this->name = $name;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function put($data) {
-		throw new Forbidden('Permission denied to put into this file');
-	}
+    /**
+     * @inheritdoc
+     */
+    public function put($data) {
+        throw new Forbidden('Permission denied to put into this file');
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function get() {
-		$nodes = $this->root->getChildren();
-		return AssemblyStream::wrap($nodes);
-	}
+    /**
+     * @inheritdoc
+     */
+    public function get() {
+        $nodes = $this->root->getChildren();
+        return AssemblyStream::wrap($nodes);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getContentType() {
-		return 'application/octet-stream';
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getContentType() {
+        return 'application/octet-stream';
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getETag() {
-		return $this->root->getETag();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getETag() {
+        return $this->root->getETag();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getSize() {
-		$children = $this->root->getChildren();
-		$sizes = array_map(function ($node) {
-			/** @var IFile $node */
-			return $node->getSize();
-		}, $children);
+    /**
+     * @inheritdoc
+     */
+    public function getSize() {
+        $children = $this->root->getChildren();
+        $sizes = array_map(function ($node) {
+            /** @var IFile $node */
+            return $node->getSize();
+        }, $children);
 
-		return array_sum($sizes);
-	}
+        return array_sum($sizes);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function delete() {
-		$this->root->delete();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function delete() {
+        $this->root->delete();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getName() {
-		return $this->name;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getName() {
+        return $this->name;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this file');
-	}
+    /**
+     * @inheritdoc
+     */
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this file');
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getLastModified() {
-		return $this->root->getLastModified();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getLastModified() {
+        return $this->root->getLastModified();
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 	 */
 	public function getSize() {
 		$children = $this->root->getChildren();
-		$sizes = array_map(function ($node) {
+		$sizes = array_map(function($node) {
 			/** @var IFile $node */
 			return $node->getSize();
 		}, $children);

apps/dav/appinfo/v1/webdav.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 
 $requestUri = \OC::$server->getRequest()->getRequestUri();
 
-$server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function () {
+$server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function() {
 	// use the view for the logged in user
 	return \OC\Files\Filesystem::getView();
 });

Indentation +22 added lines, -22 removed lines

@@ -30,7 +30,7 @@ 
  */
 // no php execution timeout for webdav
 if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-	@set_time_limit(0);
+    @set_time_limit(0);
 }
 ignore_user_abort(true);
 
@@ -38,40 +38,40 @@ 
 \OC_Util::obEnd();
 
 $serverFactory = new \OCA\DAV\Connector\Sabre\ServerFactory(
-	\OC::$server->getConfig(),
-	\OC::$server->getLogger(),
-	\OC::$server->getDatabaseConnection(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getMountManager(),
-	\OC::$server->getTagManager(),
-	\OC::$server->getRequest(),
-	\OC::$server->getPreviewManager(),
-	\OC::$server->getEventDispatcher(),
-	\OC::$server->getL10N('dav')
+    \OC::$server->getConfig(),
+    \OC::$server->getLogger(),
+    \OC::$server->getDatabaseConnection(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getMountManager(),
+    \OC::$server->getTagManager(),
+    \OC::$server->getRequest(),
+    \OC::$server->getPreviewManager(),
+    \OC::$server->getEventDispatcher(),
+    \OC::$server->getL10N('dav')
 );
 
 // Backends
 $authBackend = new \OCA\DAV\Connector\Sabre\Auth(
-	\OC::$server->getSession(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getRequest(),
-	\OC::$server->getTwoFactorAuthManager(),
-	\OC::$server->getBruteForceThrottler(),
-	'principals/'
+    \OC::$server->getSession(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getRequest(),
+    \OC::$server->getTwoFactorAuthManager(),
+    \OC::$server->getBruteForceThrottler(),
+    'principals/'
 );
 $authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
 $bearerAuthPlugin = new \OCA\DAV\Connector\Sabre\BearerAuth(
-	\OC::$server->getUserSession(),
-	\OC::$server->getSession(),
-	\OC::$server->getRequest()
+    \OC::$server->getUserSession(),
+    \OC::$server->getSession(),
+    \OC::$server->getRequest()
 );
 $authPlugin->addBackend($bearerAuthPlugin);
 
 $requestUri = \OC::$server->getRequest()->getRequestUri();
 
 $server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function () {
-	// use the view for the logged in user
-	return \OC\Files\Filesystem::getView();
+    // use the view for the logged in user
+    return \OC\Files\Filesystem::getView();
 });
 
 $dispatcher = \OC::$server->getEventDispatcher();

apps/files_sharing/lib/DeleteOrphanedSharesJob.php

Indentation +27 added lines, -27 removed lines

@@ -31,35 +31,35 @@
  */
 class DeleteOrphanedSharesJob extends TimedJob {
 
-	/**
-	 * Default interval in minutes
-	 *
-	 * @var int $defaultIntervalMin
-	 **/
-	protected $defaultIntervalMin = 15;
+    /**
+     * Default interval in minutes
+     *
+     * @var int $defaultIntervalMin
+     **/
+    protected $defaultIntervalMin = 15;
 
-	/**
-	 * sets the correct interval for this timed job
-	 */
-	public function __construct() {
-		$this->interval = $this->defaultIntervalMin * 60;
-	}
+    /**
+     * sets the correct interval for this timed job
+     */
+    public function __construct() {
+        $this->interval = $this->defaultIntervalMin * 60;
+    }
 
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 */
-	public function run($argument) {
-		$connection = \OC::$server->getDatabaseConnection();
-		$logger = \OC::$server->getLogger();
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     */
+    public function run($argument) {
+        $connection = \OC::$server->getDatabaseConnection();
+        $logger = \OC::$server->getLogger();
 
-		$sql =
-			'DELETE FROM `*PREFIX*share` ' .
-			'WHERE `item_type` in (\'file\', \'folder\') ' .
-			'AND NOT EXISTS (SELECT `fileid` FROM `*PREFIX*filecache` WHERE `file_source` = `fileid`)';
+        $sql =
+            'DELETE FROM `*PREFIX*share` ' .
+            'WHERE `item_type` in (\'file\', \'folder\') ' .
+            'AND NOT EXISTS (SELECT `fileid` FROM `*PREFIX*filecache` WHERE `file_source` = `fileid`)';
 
-		$deletedEntries = $connection->executeUpdate($sql);
-		$logger->debug("$deletedEntries orphaned share(s) deleted", ['app' => 'DeleteOrphanedSharesJob']);
-	}
+        $deletedEntries = $connection->executeUpdate($sql);
+        $logger->debug("$deletedEntries orphaned share(s) deleted", ['app' => 'DeleteOrphanedSharesJob']);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -55,8 +55,8 @@
 		$logger = \OC::$server->getLogger();
 
 		$sql =
-			'DELETE FROM `*PREFIX*share` ' .
-			'WHERE `item_type` in (\'file\', \'folder\') ' .
+			'DELETE FROM `*PREFIX*share` '.
+			'WHERE `item_type` in (\'file\', \'folder\') '.
 			'AND NOT EXISTS (SELECT `fileid` FROM `*PREFIX*filecache` WHERE `file_source` = `fileid`)';
 
 		$deletedEntries = $connection->executeUpdate($sql);

apps/files_external/lib/Lib/PriorityTrait.php

Indentation +24 added lines, -24 removed lines

@@ -29,31 +29,31 @@
  */
 trait PriorityTrait {
 
-	/** @var int initial priority */
-	protected $priority = BackendService::PRIORITY_DEFAULT;
+    /** @var int initial priority */
+    protected $priority = BackendService::PRIORITY_DEFAULT;
 
-	/**
-	 * @return int
-	 */
-	public function getPriority() {
-		return $this->priority;
-	}
+    /**
+     * @return int
+     */
+    public function getPriority() {
+        return $this->priority;
+    }
 
-	/**
-	 * @param int $priority
-	 * @return self
-	 */
-	public function setPriority($priority) {
-		$this->priority = $priority;
-		return $this;
-	}
+    /**
+     * @param int $priority
+     * @return self
+     */
+    public function setPriority($priority) {
+        $this->priority = $priority;
+        return $this;
+    }
 
-	/**
-	 * @param PriorityTrait $a
-	 * @param PriorityTrait $b
-	 * @return int
-	 */
-	public static function priorityCompare(PriorityTrait $a, PriorityTrait $b) {
-		return ($a->getPriority() - $b->getPriority());
-	}
+    /**
+     * @param PriorityTrait $a
+     * @param PriorityTrait $b
+     * @return int
+     */
+    public static function priorityCompare(PriorityTrait $a, PriorityTrait $b) {
+        return ($a->getPriority() - $b->getPriority());
+    }
 }

apps/files_external/lib/Lib/StorageConfig.php

Spacing +2 added lines, -2 removed lines

@@ -220,7 +220,7 @@ 
 				if (isset($parameters[$key])) {
 					switch ($parameters[$key]->getType()) {
 						case \OCA\Files_External\Lib\DefinitionParameter::VALUE_BOOLEAN:
-							$value = (bool)$value;
+							$value = (bool) $value;
 							break;
 					}
 					$backendOptions[$key] = $value;
@@ -426,7 +426,7 @@ 
 			$result['statusMessage'] = $this->statusMessage;
 		}
 		$result['userProvided'] = $this->authMechanism instanceof IUserProvided;
-		$result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal': 'system';
+		$result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal' : 'system';
 		return $result;
 	}
 }

Indentation +392 added lines, -392 removed lines

@@ -36,396 +36,396 @@
  * External storage configuration
  */
 class StorageConfig implements \JsonSerializable {
-	public const MOUNT_TYPE_ADMIN = 1;
-	public const MOUNT_TYPE_PERSONAl = 2;
-
-	/**
-	 * Storage config id
-	 *
-	 * @var int
-	 */
-	private $id;
-
-	/**
-	 * Backend
-	 *
-	 * @var Backend
-	 */
-	private $backend;
-
-	/**
-	 * Authentication mechanism
-	 *
-	 * @var AuthMechanism
-	 */
-	private $authMechanism;
-
-	/**
-	 * Backend options
-	 *
-	 * @var array
-	 */
-	private $backendOptions = [];
-
-	/**
-	 * Mount point path, relative to the user's "files" folder
-	 *
-	 * @var string
-	 */
-	private $mountPoint;
-
-	/**
-	 * Storage status
-	 *
-	 * @var int
-	 */
-	private $status;
-
-	/**
-	 * Status message
-	 *
-	 * @var string
-	 */
-	private $statusMessage;
-
-	/**
-	 * Priority
-	 *
-	 * @var int
-	 */
-	private $priority;
-
-	/**
-	 * List of users who have access to this storage
-	 *
-	 * @var string[]
-	 */
-	private $applicableUsers = [];
-
-	/**
-	 * List of groups that have access to this storage
-	 *
-	 * @var string[]
-	 */
-	private $applicableGroups = [];
-
-	/**
-	 * Mount-specific options
-	 *
-	 * @var array
-	 */
-	private $mountOptions = [];
-
-	/**
-	 * Whether it's a personal or admin mount
-	 *
-	 * @var int
-	 */
-	private $type;
-
-	/**
-	 * Creates a storage config
-	 *
-	 * @param int|null $id config id or null for a new config
-	 */
-	public function __construct($id = null) {
-		$this->id = $id;
-		$this->mountOptions['enable_sharing'] = false;
-	}
-
-	/**
-	 * Returns the configuration id
-	 *
-	 * @return int
-	 */
-	public function getId() {
-		return $this->id;
-	}
-
-	/**
-	 * Sets the configuration id
-	 *
-	 * @param int $id configuration id
-	 */
-	public function setId($id) {
-		$this->id = $id;
-	}
-
-	/**
-	 * Returns mount point path relative to the user's
-	 * "files" folder.
-	 *
-	 * @return string path
-	 */
-	public function getMountPoint() {
-		return $this->mountPoint;
-	}
-
-	/**
-	 * Sets mount point path relative to the user's
-	 * "files" folder.
-	 * The path will be normalized.
-	 *
-	 * @param string $mountPoint path
-	 */
-	public function setMountPoint($mountPoint) {
-		$this->mountPoint = \OC\Files\Filesystem::normalizePath($mountPoint);
-	}
-
-	/**
-	 * @return Backend
-	 */
-	public function getBackend() {
-		return $this->backend;
-	}
-
-	/**
-	 * @param Backend $backend
-	 */
-	public function setBackend(Backend $backend) {
-		$this->backend = $backend;
-	}
-
-	/**
-	 * @return AuthMechanism
-	 */
-	public function getAuthMechanism() {
-		return $this->authMechanism;
-	}
-
-	/**
-	 * @param AuthMechanism $authMechanism
-	 */
-	public function setAuthMechanism(AuthMechanism $authMechanism) {
-		$this->authMechanism = $authMechanism;
-	}
-
-	/**
-	 * Returns the external storage backend-specific options
-	 *
-	 * @return array backend options
-	 */
-	public function getBackendOptions() {
-		return $this->backendOptions;
-	}
-
-	/**
-	 * Sets the external storage backend-specific options
-	 *
-	 * @param array $backendOptions backend options
-	 */
-	public function setBackendOptions($backendOptions) {
-		if ($this->getBackend() instanceof  Backend) {
-			$parameters = $this->getBackend()->getParameters();
-			foreach ($backendOptions as $key => $value) {
-				if (isset($parameters[$key])) {
-					switch ($parameters[$key]->getType()) {
-						case \OCA\Files_External\Lib\DefinitionParameter::VALUE_BOOLEAN:
-							$value = (bool)$value;
-							break;
-					}
-					$backendOptions[$key] = $value;
-				}
-			}
-		}
-
-		$this->backendOptions = $backendOptions;
-	}
-
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function getBackendOption($key) {
-		if (isset($this->backendOptions[$key])) {
-			return $this->backendOptions[$key];
-		}
-		return null;
-	}
-
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 */
-	public function setBackendOption($key, $value) {
-		$this->backendOptions[$key] = $value;
-	}
-
-	/**
-	 * Returns the mount priority
-	 *
-	 * @return int priority
-	 */
-	public function getPriority() {
-		return $this->priority;
-	}
-
-	/**
-	 * Sets the mount priotity
-	 *
-	 * @param int $priority priority
-	 */
-	public function setPriority($priority) {
-		$this->priority = $priority;
-	}
-
-	/**
-	 * Returns the users for which to mount this storage
-	 *
-	 * @return string[] applicable users
-	 */
-	public function getApplicableUsers() {
-		return $this->applicableUsers;
-	}
-
-	/**
-	 * Sets the users for which to mount this storage
-	 *
-	 * @param string[]|null $applicableUsers applicable users
-	 */
-	public function setApplicableUsers($applicableUsers) {
-		if (is_null($applicableUsers)) {
-			$applicableUsers = [];
-		}
-		$this->applicableUsers = $applicableUsers;
-	}
-
-	/**
-	 * Returns the groups for which to mount this storage
-	 *
-	 * @return string[] applicable groups
-	 */
-	public function getApplicableGroups() {
-		return $this->applicableGroups;
-	}
-
-	/**
-	 * Sets the groups for which to mount this storage
-	 *
-	 * @param string[]|null $applicableGroups applicable groups
-	 */
-	public function setApplicableGroups($applicableGroups) {
-		if (is_null($applicableGroups)) {
-			$applicableGroups = [];
-		}
-		$this->applicableGroups = $applicableGroups;
-	}
-
-	/**
-	 * Returns the mount-specific options
-	 *
-	 * @return array mount specific options
-	 */
-	public function getMountOptions() {
-		return $this->mountOptions;
-	}
-
-	/**
-	 * Sets the mount-specific options
-	 *
-	 * @param array $mountOptions applicable groups
-	 */
-	public function setMountOptions($mountOptions) {
-		if (is_null($mountOptions)) {
-			$mountOptions = [];
-		}
-		$this->mountOptions = $mountOptions;
-	}
-
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function getMountOption($key) {
-		if (isset($this->mountOptions[$key])) {
-			return $this->mountOptions[$key];
-		}
-		return null;
-	}
-
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 */
-	public function setMountOption($key, $value) {
-		$this->mountOptions[$key] = $value;
-	}
-
-	/**
-	 * Gets the storage status, whether the config worked last time
-	 *
-	 * @return int $status status
-	 */
-	public function getStatus() {
-		return $this->status;
-	}
-
-	/**
-	 * Gets the message describing the storage status
-	 *
-	 * @return string|null
-	 */
-	public function getStatusMessage() {
-		return $this->statusMessage;
-	}
-
-	/**
-	 * Sets the storage status, whether the config worked last time
-	 *
-	 * @param int $status status
-	 * @param string|null $message optional message
-	 */
-	public function setStatus($status, $message = null) {
-		$this->status = $status;
-		$this->statusMessage = $message;
-	}
-
-	/**
-	 * @return int self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl
-	 */
-	public function getType() {
-		return $this->type;
-	}
-
-	/**
-	 * @param int $type self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl
-	 */
-	public function setType($type) {
-		$this->type = $type;
-	}
-
-	/**
-	 * Serialize config to JSON
-	 */
-	public function jsonSerialize(): array {
-		$result = [];
-		if (!is_null($this->id)) {
-			$result['id'] = $this->id;
-		}
-		$result['mountPoint'] = $this->mountPoint;
-		$result['backend'] = $this->backend->getIdentifier();
-		$result['authMechanism'] = $this->authMechanism->getIdentifier();
-		$result['backendOptions'] = $this->backendOptions;
-		if (!is_null($this->priority)) {
-			$result['priority'] = $this->priority;
-		}
-		if (!empty($this->applicableUsers)) {
-			$result['applicableUsers'] = $this->applicableUsers;
-		}
-		if (!empty($this->applicableGroups)) {
-			$result['applicableGroups'] = $this->applicableGroups;
-		}
-		if (!empty($this->mountOptions)) {
-			$result['mountOptions'] = $this->mountOptions;
-		}
-		if (!is_null($this->status)) {
-			$result['status'] = $this->status;
-		}
-		if (!is_null($this->statusMessage)) {
-			$result['statusMessage'] = $this->statusMessage;
-		}
-		$result['userProvided'] = $this->authMechanism instanceof IUserProvided;
-		$result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal': 'system';
-		return $result;
-	}
+    public const MOUNT_TYPE_ADMIN = 1;
+    public const MOUNT_TYPE_PERSONAl = 2;
+
+    /**
+     * Storage config id
+     *
+     * @var int
+     */
+    private $id;
+
+    /**
+     * Backend
+     *
+     * @var Backend
+     */
+    private $backend;
+
+    /**
+     * Authentication mechanism
+     *
+     * @var AuthMechanism
+     */
+    private $authMechanism;
+
+    /**
+     * Backend options
+     *
+     * @var array
+     */
+    private $backendOptions = [];
+
+    /**
+     * Mount point path, relative to the user's "files" folder
+     *
+     * @var string
+     */
+    private $mountPoint;
+
+    /**
+     * Storage status
+     *
+     * @var int
+     */
+    private $status;
+
+    /**
+     * Status message
+     *
+     * @var string
+     */
+    private $statusMessage;
+
+    /**
+     * Priority
+     *
+     * @var int
+     */
+    private $priority;
+
+    /**
+     * List of users who have access to this storage
+     *
+     * @var string[]
+     */
+    private $applicableUsers = [];
+
+    /**
+     * List of groups that have access to this storage
+     *
+     * @var string[]
+     */
+    private $applicableGroups = [];
+
+    /**
+     * Mount-specific options
+     *
+     * @var array
+     */
+    private $mountOptions = [];
+
+    /**
+     * Whether it's a personal or admin mount
+     *
+     * @var int
+     */
+    private $type;
+
+    /**
+     * Creates a storage config
+     *
+     * @param int|null $id config id or null for a new config
+     */
+    public function __construct($id = null) {
+        $this->id = $id;
+        $this->mountOptions['enable_sharing'] = false;
+    }
+
+    /**
+     * Returns the configuration id
+     *
+     * @return int
+     */
+    public function getId() {
+        return $this->id;
+    }
+
+    /**
+     * Sets the configuration id
+     *
+     * @param int $id configuration id
+     */
+    public function setId($id) {
+        $this->id = $id;
+    }
+
+    /**
+     * Returns mount point path relative to the user's
+     * "files" folder.
+     *
+     * @return string path
+     */
+    public function getMountPoint() {
+        return $this->mountPoint;
+    }
+
+    /**
+     * Sets mount point path relative to the user's
+     * "files" folder.
+     * The path will be normalized.
+     *
+     * @param string $mountPoint path
+     */
+    public function setMountPoint($mountPoint) {
+        $this->mountPoint = \OC\Files\Filesystem::normalizePath($mountPoint);
+    }
+
+    /**
+     * @return Backend
+     */
+    public function getBackend() {
+        return $this->backend;
+    }
+
+    /**
+     * @param Backend $backend
+     */
+    public function setBackend(Backend $backend) {
+        $this->backend = $backend;
+    }
+
+    /**
+     * @return AuthMechanism
+     */
+    public function getAuthMechanism() {
+        return $this->authMechanism;
+    }
+
+    /**
+     * @param AuthMechanism $authMechanism
+     */
+    public function setAuthMechanism(AuthMechanism $authMechanism) {
+        $this->authMechanism = $authMechanism;
+    }
+
+    /**
+     * Returns the external storage backend-specific options
+     *
+     * @return array backend options
+     */
+    public function getBackendOptions() {
+        return $this->backendOptions;
+    }
+
+    /**
+     * Sets the external storage backend-specific options
+     *
+     * @param array $backendOptions backend options
+     */
+    public function setBackendOptions($backendOptions) {
+        if ($this->getBackend() instanceof  Backend) {
+            $parameters = $this->getBackend()->getParameters();
+            foreach ($backendOptions as $key => $value) {
+                if (isset($parameters[$key])) {
+                    switch ($parameters[$key]->getType()) {
+                        case \OCA\Files_External\Lib\DefinitionParameter::VALUE_BOOLEAN:
+                            $value = (bool)$value;
+                            break;
+                    }
+                    $backendOptions[$key] = $value;
+                }
+            }
+        }
+
+        $this->backendOptions = $backendOptions;
+    }
+
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    public function getBackendOption($key) {
+        if (isset($this->backendOptions[$key])) {
+            return $this->backendOptions[$key];
+        }
+        return null;
+    }
+
+    /**
+     * @param string $key
+     * @param mixed $value
+     */
+    public function setBackendOption($key, $value) {
+        $this->backendOptions[$key] = $value;
+    }
+
+    /**
+     * Returns the mount priority
+     *
+     * @return int priority
+     */
+    public function getPriority() {
+        return $this->priority;
+    }
+
+    /**
+     * Sets the mount priotity
+     *
+     * @param int $priority priority
+     */
+    public function setPriority($priority) {
+        $this->priority = $priority;
+    }
+
+    /**
+     * Returns the users for which to mount this storage
+     *
+     * @return string[] applicable users
+     */
+    public function getApplicableUsers() {
+        return $this->applicableUsers;
+    }
+
+    /**
+     * Sets the users for which to mount this storage
+     *
+     * @param string[]|null $applicableUsers applicable users
+     */
+    public function setApplicableUsers($applicableUsers) {
+        if (is_null($applicableUsers)) {
+            $applicableUsers = [];
+        }
+        $this->applicableUsers = $applicableUsers;
+    }
+
+    /**
+     * Returns the groups for which to mount this storage
+     *
+     * @return string[] applicable groups
+     */
+    public function getApplicableGroups() {
+        return $this->applicableGroups;
+    }
+
+    /**
+     * Sets the groups for which to mount this storage
+     *
+     * @param string[]|null $applicableGroups applicable groups
+     */
+    public function setApplicableGroups($applicableGroups) {
+        if (is_null($applicableGroups)) {
+            $applicableGroups = [];
+        }
+        $this->applicableGroups = $applicableGroups;
+    }
+
+    /**
+     * Returns the mount-specific options
+     *
+     * @return array mount specific options
+     */
+    public function getMountOptions() {
+        return $this->mountOptions;
+    }
+
+    /**
+     * Sets the mount-specific options
+     *
+     * @param array $mountOptions applicable groups
+     */
+    public function setMountOptions($mountOptions) {
+        if (is_null($mountOptions)) {
+            $mountOptions = [];
+        }
+        $this->mountOptions = $mountOptions;
+    }
+
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    public function getMountOption($key) {
+        if (isset($this->mountOptions[$key])) {
+            return $this->mountOptions[$key];
+        }
+        return null;
+    }
+
+    /**
+     * @param string $key
+     * @param mixed $value
+     */
+    public function setMountOption($key, $value) {
+        $this->mountOptions[$key] = $value;
+    }
+
+    /**
+     * Gets the storage status, whether the config worked last time
+     *
+     * @return int $status status
+     */
+    public function getStatus() {
+        return $this->status;
+    }
+
+    /**
+     * Gets the message describing the storage status
+     *
+     * @return string|null
+     */
+    public function getStatusMessage() {
+        return $this->statusMessage;
+    }
+
+    /**
+     * Sets the storage status, whether the config worked last time
+     *
+     * @param int $status status
+     * @param string|null $message optional message
+     */
+    public function setStatus($status, $message = null) {
+        $this->status = $status;
+        $this->statusMessage = $message;
+    }
+
+    /**
+     * @return int self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl
+     */
+    public function getType() {
+        return $this->type;
+    }
+
+    /**
+     * @param int $type self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl
+     */
+    public function setType($type) {
+        $this->type = $type;
+    }
+
+    /**
+     * Serialize config to JSON
+     */
+    public function jsonSerialize(): array {
+        $result = [];
+        if (!is_null($this->id)) {
+            $result['id'] = $this->id;
+        }
+        $result['mountPoint'] = $this->mountPoint;
+        $result['backend'] = $this->backend->getIdentifier();
+        $result['authMechanism'] = $this->authMechanism->getIdentifier();
+        $result['backendOptions'] = $this->backendOptions;
+        if (!is_null($this->priority)) {
+            $result['priority'] = $this->priority;
+        }
+        if (!empty($this->applicableUsers)) {
+            $result['applicableUsers'] = $this->applicableUsers;
+        }
+        if (!empty($this->applicableGroups)) {
+            $result['applicableGroups'] = $this->applicableGroups;
+        }
+        if (!empty($this->mountOptions)) {
+            $result['mountOptions'] = $this->mountOptions;
+        }
+        if (!is_null($this->status)) {
+            $result['status'] = $this->status;
+        }
+        if (!is_null($this->statusMessage)) {
+            $result['statusMessage'] = $this->statusMessage;
+        }
+        $result['userProvided'] = $this->authMechanism instanceof IUserProvided;
+        $result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal': 'system';
+        return $result;
+    }
 }

apps/files_external/lib/Lib/Backend/Swift.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
 			])
 			->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK)
-			->setLegacyAuthMechanismCallback(function (array $params) use ($openstackAuth, $rackspaceAuth) {
+			->setLegacyAuthMechanismCallback(function(array $params) use ($openstackAuth, $rackspaceAuth) {
 				if (isset($params['options']['key']) && $params['options']['key']) {
 					return $rackspaceAuth;
 				}

Indentation +24 added lines, -24 removed lines

@@ -33,29 +33,29 @@
 use OCP\IL10N;
 
 class Swift extends Backend {
-	use LegacyDependencyCheckPolyfill;
+    use LegacyDependencyCheckPolyfill;
 
-	public function __construct(IL10N $l, OpenStackV2 $openstackAuth, Rackspace $rackspaceAuth) {
-		$this
-			->setIdentifier('swift')
-			->addIdentifierAlias('\OC\Files\Storage\Swift') // legacy compat
-			->setStorageClass('\OCA\Files_External\Lib\Storage\Swift')
-			->setText($l->t('OpenStack Object Storage'))
-			->addParameters([
-				(new DefinitionParameter('service_name', $l->t('Service name')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				new DefinitionParameter('region', $l->t('Region')),
-				new DefinitionParameter('bucket', $l->t('Bucket')),
-				(new DefinitionParameter('timeout', $l->t('Request timeout (seconds)')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-			])
-			->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK)
-			->setLegacyAuthMechanismCallback(function (array $params) use ($openstackAuth, $rackspaceAuth) {
-				if (isset($params['options']['key']) && $params['options']['key']) {
-					return $rackspaceAuth;
-				}
-				return $openstackAuth;
-			})
-		;
-	}
+    public function __construct(IL10N $l, OpenStackV2 $openstackAuth, Rackspace $rackspaceAuth) {
+        $this
+            ->setIdentifier('swift')
+            ->addIdentifierAlias('\OC\Files\Storage\Swift') // legacy compat
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\Swift')
+            ->setText($l->t('OpenStack Object Storage'))
+            ->addParameters([
+                (new DefinitionParameter('service_name', $l->t('Service name')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                new DefinitionParameter('region', $l->t('Region')),
+                new DefinitionParameter('bucket', $l->t('Bucket')),
+                (new DefinitionParameter('timeout', $l->t('Request timeout (seconds)')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+            ])
+            ->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK)
+            ->setLegacyAuthMechanismCallback(function (array $params) use ($openstackAuth, $rackspaceAuth) {
+                if (isset($params['options']['key']) && $params['options']['key']) {
+                    return $rackspaceAuth;
+                }
+                return $openstackAuth;
+            })
+        ;
+    }
 }

apps/files_external/lib/Lib/VisibilityTrait.php

Indentation +86 added lines, -86 removed lines

@@ -36,101 +36,101 @@
  */
 trait VisibilityTrait {
 
-	/** @var int visibility */
-	protected $visibility = BackendService::VISIBILITY_DEFAULT;
+    /** @var int visibility */
+    protected $visibility = BackendService::VISIBILITY_DEFAULT;
 
-	/** @var int allowed visibilities */
-	protected $allowedVisibility = BackendService::VISIBILITY_DEFAULT;
+    /** @var int allowed visibilities */
+    protected $allowedVisibility = BackendService::VISIBILITY_DEFAULT;
 
-	/**
-	 * @return int
-	 */
-	public function getVisibility() {
-		return $this->visibility;
-	}
+    /**
+     * @return int
+     */
+    public function getVisibility() {
+        return $this->visibility;
+    }
 
-	/**
-	 * Check if the backend is visible for a user type
-	 *
-	 * @param int $visibility
-	 * @return bool
-	 */
-	public function isVisibleFor($visibility) {
-		if ($this->visibility & $visibility) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     * Check if the backend is visible for a user type
+     *
+     * @param int $visibility
+     * @return bool
+     */
+    public function isVisibleFor($visibility) {
+        if ($this->visibility & $visibility) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * @param int $visibility
-	 * @return self
-	 */
-	public function setVisibility($visibility) {
-		$this->visibility = $visibility;
-		$this->allowedVisibility |= $visibility;
-		return $this;
-	}
+    /**
+     * @param int $visibility
+     * @return self
+     */
+    public function setVisibility($visibility) {
+        $this->visibility = $visibility;
+        $this->allowedVisibility |= $visibility;
+        return $this;
+    }
 
-	/**
-	 * @param int $visibility
-	 * @return self
-	 */
-	public function addVisibility($visibility) {
-		return $this->setVisibility($this->visibility | $visibility);
-	}
+    /**
+     * @param int $visibility
+     * @return self
+     */
+    public function addVisibility($visibility) {
+        return $this->setVisibility($this->visibility | $visibility);
+    }
 
-	/**
-	 * @param int $visibility
-	 * @return self
-	 */
-	public function removeVisibility($visibility) {
-		return $this->setVisibility($this->visibility & ~$visibility);
-	}
+    /**
+     * @param int $visibility
+     * @return self
+     */
+    public function removeVisibility($visibility) {
+        return $this->setVisibility($this->visibility & ~$visibility);
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getAllowedVisibility() {
-		return $this->allowedVisibility;
-	}
+    /**
+     * @return int
+     */
+    public function getAllowedVisibility() {
+        return $this->allowedVisibility;
+    }
 
-	/**
-	 * Check if the backend is allowed to be visible for a user type
-	 *
-	 * @param int $allowedVisibility
-	 * @return bool
-	 */
-	public function isAllowedVisibleFor($allowedVisibility) {
-		if ($this->allowedVisibility & $allowedVisibility) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     * Check if the backend is allowed to be visible for a user type
+     *
+     * @param int $allowedVisibility
+     * @return bool
+     */
+    public function isAllowedVisibleFor($allowedVisibility) {
+        if ($this->allowedVisibility & $allowedVisibility) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * @param int $allowedVisibility
-	 * @return self
-	 */
-	public function setAllowedVisibility($allowedVisibility) {
-		$this->allowedVisibility = $allowedVisibility;
-		$this->visibility &= $allowedVisibility;
-		return $this;
-	}
+    /**
+     * @param int $allowedVisibility
+     * @return self
+     */
+    public function setAllowedVisibility($allowedVisibility) {
+        $this->allowedVisibility = $allowedVisibility;
+        $this->visibility &= $allowedVisibility;
+        return $this;
+    }
 
-	/**
-	 * @param int $allowedVisibility
-	 * @return self
-	 */
-	public function addAllowedVisibility($allowedVisibility) {
-		return $this->setAllowedVisibility($this->allowedVisibility | $allowedVisibility);
-	}
+    /**
+     * @param int $allowedVisibility
+     * @return self
+     */
+    public function addAllowedVisibility($allowedVisibility) {
+        return $this->setAllowedVisibility($this->allowedVisibility | $allowedVisibility);
+    }
 
-	/**
-	 * @param int $allowedVisibility
-	 * @return self
-	 */
-	public function removeAllowedVisibility($allowedVisibility) {
-		return $this->setAllowedVisibility($this->allowedVisibility & ~$allowedVisibility);
-	}
+    /**
+     * @param int $allowedVisibility
+     * @return self
+     */
+    public function removeAllowedVisibility($allowedVisibility) {
+        return $this->setAllowedVisibility($this->allowedVisibility & ~$allowedVisibility);
+    }
 }

apps/files_external/lib/Lib/Auth/Builtin.php

Indentation +7 added lines, -7 removed lines

@@ -28,11 +28,11 @@
  * Builtin authentication mechanism, for legacy backends
  */
 class Builtin extends AuthMechanism {
-	public function __construct(IL10N $l) {
-		$this
-			->setIdentifier('builtin::builtin')
-			->setScheme(self::SCHEME_BUILTIN)
-			->setText($l->t('Builtin'))
-		;
-	}
+    public function __construct(IL10N $l) {
+        $this
+            ->setIdentifier('builtin::builtin')
+            ->setScheme(self::SCHEME_BUILTIN)
+            ->setText($l->t('Builtin'))
+        ;
+    }
 }