nextcloud / server

apps/files_external/lib/Config/ExternalMountPoint.php

Indentation +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@
 use OC\Files\Mount\MountPoint;
 
 class ExternalMountPoint extends MountPoint {
-	public function getMountType() {
-		return 'external';
-	}
+    public function getMountType() {
+        return 'external';
+    }
 }

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

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	 * {@inheritDoc}
 	 */
 	public function getName() {
-		return (string)$this->l10n->t('Social sharing bundle');
+		return (string) $this->l10n->t('Social sharing bundle');
 	}
 
 	/**

Indentation +17 added lines, -17 removed lines

@@ -25,23 +25,23 @@
 
 class SocialSharingBundle extends Bundle {
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName() {
-		return (string)$this->l10n->t('Social sharing bundle');
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getName() {
+        return (string)$this->l10n->t('Social sharing bundle');
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getAppIdentifiers() {
-		return [
-			'socialsharing_twitter',
-			'socialsharing_facebook',
-			'socialsharing_email',
-			'socialsharing_diaspora',
-		];
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getAppIdentifiers() {
+        return [
+            'socialsharing_twitter',
+            'socialsharing_facebook',
+            'socialsharing_email',
+            'socialsharing_diaspora',
+        ];
+    }
 
 }

lib/public/Files/Mount/IMountPoint.php

Indentation +88 added lines, -88 removed lines

@@ -29,103 +29,103 @@
  */
 interface IMountPoint {
 
-	/**
-	 * get complete path to the mount point
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getMountPoint();
+    /**
+     * get complete path to the mount point
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getMountPoint();
 
-	/**
-	 * Set the mountpoint
-	 *
-	 * @param string $mountPoint new mount point
-	 * @since 8.0.0
-	 */
-	public function setMountPoint($mountPoint);
+    /**
+     * Set the mountpoint
+     *
+     * @param string $mountPoint new mount point
+     * @since 8.0.0
+     */
+    public function setMountPoint($mountPoint);
 
-	/**
-	 * Get the storage that is mounted
-	 *
-	 * @return \OC\Files\Storage\Storage
-	 * @since 8.0.0
-	 */
-	public function getStorage();
+    /**
+     * Get the storage that is mounted
+     *
+     * @return \OC\Files\Storage\Storage
+     * @since 8.0.0
+     */
+    public function getStorage();
 
-	/**
-	 * Get the id of the storages
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getStorageId();
+    /**
+     * Get the id of the storages
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getStorageId();
 
-	/**
-	 * Get the id of the storages
-	 *
-	 * @return int
-	 * @since 9.1.0
-	 */
-	public function getNumericStorageId();
+    /**
+     * Get the id of the storages
+     *
+     * @return int
+     * @since 9.1.0
+     */
+    public function getNumericStorageId();
 
-	/**
-	 * Get the path relative to the mountpoint
-	 *
-	 * @param string $path absolute path to a file or folder
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getInternalPath($path);
+    /**
+     * Get the path relative to the mountpoint
+     *
+     * @param string $path absolute path to a file or folder
+     * @return string
+     * @since 8.0.0
+     */
+    public function getInternalPath($path);
 
-	/**
-	 * Apply a storage wrapper to the mounted storage
-	 *
-	 * @param callable $wrapper
-	 * @since 8.0.0
-	 */
-	public function wrapStorage($wrapper);
+    /**
+     * Apply a storage wrapper to the mounted storage
+     *
+     * @param callable $wrapper
+     * @since 8.0.0
+     */
+    public function wrapStorage($wrapper);
 
-	/**
-	 * Get a mount option
-	 *
-	 * @param string $name Name of the mount option to get
-	 * @param mixed $default Default value for the mount option
-	 * @return mixed
-	 * @since 8.0.0
-	 */
-	public function getOption($name, $default);
+    /**
+     * Get a mount option
+     *
+     * @param string $name Name of the mount option to get
+     * @param mixed $default Default value for the mount option
+     * @return mixed
+     * @since 8.0.0
+     */
+    public function getOption($name, $default);
 
-	/**
-	 * Get all options for the mount
-	 *
-	 * @return array
-	 * @since 8.1.0
-	 */
-	public function getOptions();
+    /**
+     * Get all options for the mount
+     *
+     * @return array
+     * @since 8.1.0
+     */
+    public function getOptions();
 
-	/**
-	 * Get the file id of the root of the storage
-	 *
-	 * @return int
-	 * @since 9.1.0
-	 */
-	public function getStorageRootId();
+    /**
+     * Get the file id of the root of the storage
+     *
+     * @return int
+     * @since 9.1.0
+     */
+    public function getStorageRootId();
 
-	/**
-	 * Get the id of the configured mount
-	 *
-	 * @return int|null mount id or null if not applicable
-	 * @since 9.1.0
-	 */
-	public function getMountId();
+    /**
+     * Get the id of the configured mount
+     *
+     * @return int|null mount id or null if not applicable
+     * @since 9.1.0
+     */
+    public function getMountId();
 
-	/**
-	 * Get the type of mount point, used to distinguish things like shares and external storages
-	 * in the web interface
-	 *
-	 * @return string
-	 * @since 12.0.0
-	 */
-	public function getMountType();
+    /**
+     * Get the type of mount point, used to distinguish things like shares and external storages
+     * in the web interface
+     *
+     * @return string
+     * @since 12.0.0
+     */
+    public function getMountType();
 }

lib/private/App/AppStore/Fetcher/Fetcher.php

Spacing +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
 				if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) {
 
 					// If the timestamp is older than 300 seconds request the files new
-					if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {
+					if ((int) $jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {
 						return $jsonBlob['data'];
 					}
 

Indentation +179 added lines, -179 removed lines

@@ -39,183 +39,183 @@
 use OCP\Util;
 
 abstract class Fetcher {
-	const INVALIDATE_AFTER_SECONDS = 300;
-
-	/** @var IAppData */
-	protected $appData;
-	/** @var IClientService */
-	protected $clientService;
-	/** @var ITimeFactory */
-	protected $timeFactory;
-	/** @var IConfig */
-	protected $config;
-	/** @var Ilogger */
-	protected $logger;
-	/** @var string */
-	protected $fileName;
-	/** @var string */
-	protected $endpointUrl;
-	/** @var string */
-	protected $version;
-	/** @var string */
-	protected $channel;
-
-	/**
-	 * @param Factory $appDataFactory
-	 * @param IClientService $clientService
-	 * @param ITimeFactory $timeFactory
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 */
-	public function __construct(Factory $appDataFactory,
-								IClientService $clientService,
-								ITimeFactory $timeFactory,
-								IConfig $config,
-								ILogger $logger) {
-		$this->appData = $appDataFactory->get('appstore');
-		$this->clientService = $clientService;
-		$this->timeFactory = $timeFactory;
-		$this->config = $config;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * Fetches the response from the server
-	 *
-	 * @param string $ETag
-	 * @param string $content
-	 *
-	 * @return array
-	 */
-	protected function fetch($ETag, $content) {
-		$appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
-
-		if (!$appstoreenabled) {
-			return [];
-		}
-
-		$options = [
-			'timeout' => 10,
-		];
-
-		if ($ETag !== '') {
-			$options['headers'] = [
-				'If-None-Match' => $ETag,
-			];
-		}
-
-		$client = $this->clientService->newClient();
-		$response = $client->get($this->endpointUrl, $options);
-
-		$responseJson = [];
-		if ($response->getStatusCode() === Http::STATUS_NOT_MODIFIED) {
-			$responseJson['data'] = json_decode($content, true);
-		} else {
-			$responseJson['data'] = json_decode($response->getBody(), true);
-			$ETag = $response->getHeader('ETag');
-		}
-
-		$responseJson['timestamp'] = $this->timeFactory->getTime();
-		$responseJson['ncversion'] = $this->getVersion();
-		if ($ETag !== '') {
-			$responseJson['ETag'] = $ETag;
-		}
-
-		return $responseJson;
-	}
-
-	/**
-	 * Returns the array with the categories on the appstore server
-	 *
-	 * @return array
-	 */
-	public function get() {
-		$appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
-		$internetavailable = $this->config->getSystemValue('has_internet_connection', true);
-
-		if (!$appstoreenabled || !$internetavailable) {
-			return [];
-		}
-
-		$rootFolder = $this->appData->getFolder('/');
-
-		$ETag = '';
-		$content = '';
-
-		try {
-			// File does already exists
-			$file = $rootFolder->getFile($this->fileName);
-			$jsonBlob = json_decode($file->getContent(), true);
-			if (is_array($jsonBlob)) {
-
-				// No caching when the version has been updated
-				if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) {
-
-					// If the timestamp is older than 300 seconds request the files new
-					if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {
-						return $jsonBlob['data'];
-					}
-
-					if (isset($jsonBlob['ETag'])) {
-						$ETag = $jsonBlob['ETag'];
-						$content = json_encode($jsonBlob['data']);
-					}
-				}
-			}
-		} catch (NotFoundException $e) {
-			// File does not already exists
-			$file = $rootFolder->newFile($this->fileName);
-		}
-
-		// Refresh the file content
-		try {
-			$responseJson = $this->fetch($ETag, $content);
-			$file->putContent(json_encode($responseJson));
-			return json_decode($file->getContent(), true)['data'];
-		} catch (ConnectException $e) {
-			$this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::INFO, 'message' => 'Could not connect to appstore']);
-			return [];
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::INFO]);
-			return [];
-		}
-	}
-
-	/**
-	 * Get the currently Nextcloud version
-	 * @return string
-	 */
-	protected function getVersion() {
-		if ($this->version === null) {
-			$this->version = $this->config->getSystemValue('version', '0.0.0');
-		}
-		return $this->version;
-	}
-
-	/**
-	 * Set the current Nextcloud version
-	 * @param string $version
-	 */
-	public function setVersion(string $version) {
-		$this->version = $version;
-	}
-
-	/**
-	 * Get the currently Nextcloud update channel
-	 * @return string
-	 */
-	protected function getChannel() {
-		if ($this->channel === null) {
-			$this->channel = \OC_Util::getChannel();
-		}
-		return $this->channel;
-	}
-
-	/**
-	 * Set the current Nextcloud update channel
-	 * @param string $channel
-	 */
-	public function setChannel(string $channel) {
-		$this->channel = $channel;
-	}
+    const INVALIDATE_AFTER_SECONDS = 300;
+
+    /** @var IAppData */
+    protected $appData;
+    /** @var IClientService */
+    protected $clientService;
+    /** @var ITimeFactory */
+    protected $timeFactory;
+    /** @var IConfig */
+    protected $config;
+    /** @var Ilogger */
+    protected $logger;
+    /** @var string */
+    protected $fileName;
+    /** @var string */
+    protected $endpointUrl;
+    /** @var string */
+    protected $version;
+    /** @var string */
+    protected $channel;
+
+    /**
+     * @param Factory $appDataFactory
+     * @param IClientService $clientService
+     * @param ITimeFactory $timeFactory
+     * @param IConfig $config
+     * @param ILogger $logger
+     */
+    public function __construct(Factory $appDataFactory,
+                                IClientService $clientService,
+                                ITimeFactory $timeFactory,
+                                IConfig $config,
+                                ILogger $logger) {
+        $this->appData = $appDataFactory->get('appstore');
+        $this->clientService = $clientService;
+        $this->timeFactory = $timeFactory;
+        $this->config = $config;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Fetches the response from the server
+     *
+     * @param string $ETag
+     * @param string $content
+     *
+     * @return array
+     */
+    protected function fetch($ETag, $content) {
+        $appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
+
+        if (!$appstoreenabled) {
+            return [];
+        }
+
+        $options = [
+            'timeout' => 10,
+        ];
+
+        if ($ETag !== '') {
+            $options['headers'] = [
+                'If-None-Match' => $ETag,
+            ];
+        }
+
+        $client = $this->clientService->newClient();
+        $response = $client->get($this->endpointUrl, $options);
+
+        $responseJson = [];
+        if ($response->getStatusCode() === Http::STATUS_NOT_MODIFIED) {
+            $responseJson['data'] = json_decode($content, true);
+        } else {
+            $responseJson['data'] = json_decode($response->getBody(), true);
+            $ETag = $response->getHeader('ETag');
+        }
+
+        $responseJson['timestamp'] = $this->timeFactory->getTime();
+        $responseJson['ncversion'] = $this->getVersion();
+        if ($ETag !== '') {
+            $responseJson['ETag'] = $ETag;
+        }
+
+        return $responseJson;
+    }
+
+    /**
+     * Returns the array with the categories on the appstore server
+     *
+     * @return array
+     */
+    public function get() {
+        $appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
+        $internetavailable = $this->config->getSystemValue('has_internet_connection', true);
+
+        if (!$appstoreenabled || !$internetavailable) {
+            return [];
+        }
+
+        $rootFolder = $this->appData->getFolder('/');
+
+        $ETag = '';
+        $content = '';
+
+        try {
+            // File does already exists
+            $file = $rootFolder->getFile($this->fileName);
+            $jsonBlob = json_decode($file->getContent(), true);
+            if (is_array($jsonBlob)) {
+
+                // No caching when the version has been updated
+                if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) {
+
+                    // If the timestamp is older than 300 seconds request the files new
+                    if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {
+                        return $jsonBlob['data'];
+                    }
+
+                    if (isset($jsonBlob['ETag'])) {
+                        $ETag = $jsonBlob['ETag'];
+                        $content = json_encode($jsonBlob['data']);
+                    }
+                }
+            }
+        } catch (NotFoundException $e) {
+            // File does not already exists
+            $file = $rootFolder->newFile($this->fileName);
+        }
+
+        // Refresh the file content
+        try {
+            $responseJson = $this->fetch($ETag, $content);
+            $file->putContent(json_encode($responseJson));
+            return json_decode($file->getContent(), true)['data'];
+        } catch (ConnectException $e) {
+            $this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::INFO, 'message' => 'Could not connect to appstore']);
+            return [];
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::INFO]);
+            return [];
+        }
+    }
+
+    /**
+     * Get the currently Nextcloud version
+     * @return string
+     */
+    protected function getVersion() {
+        if ($this->version === null) {
+            $this->version = $this->config->getSystemValue('version', '0.0.0');
+        }
+        return $this->version;
+    }
+
+    /**
+     * Set the current Nextcloud version
+     * @param string $version
+     */
+    public function setVersion(string $version) {
+        $this->version = $version;
+    }
+
+    /**
+     * Get the currently Nextcloud update channel
+     * @return string
+     */
+    protected function getChannel() {
+        if ($this->channel === null) {
+            $this->channel = \OC_Util::getChannel();
+        }
+        return $this->channel;
+    }
+
+    /**
+     * Set the current Nextcloud update channel
+     * @param string $channel
+     */
+    public function setChannel(string $channel) {
+        $this->channel = $channel;
+    }
 }

apps/dav/lib/CardDAV/ImageExportPlugin.php

Indentation +81 added lines, -81 removed lines

@@ -32,85 +32,85 @@
 
 class ImageExportPlugin extends ServerPlugin {
 
-	/** @var Server */
-	protected $server;
-	/** @var PhotoCache */
-	private $cache;
-
-	/**
-	 * ImageExportPlugin constructor.
-	 *
-	 * @param PhotoCache $cache
-	 */
-	public function __construct(PhotoCache $cache) {
-		$this->cache = $cache;
-	}
-
-	/**
-	 * Initializes the plugin and registers event handlers
-	 *
-	 * @param Server $server
-	 * @return void
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-		$this->server->on('method:GET', [$this, 'httpGet'], 90);
-	}
-
-	/**
-	 * Intercepts GET requests on addressbook urls ending with ?photo.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return bool
-	 */
-	public function httpGet(RequestInterface $request, ResponseInterface $response) {
-
-		$queryParams = $request->getQueryParameters();
-		// TODO: in addition to photo we should also add logo some point in time
-		if (!array_key_exists('photo', $queryParams)) {
-			return true;
-		}
-
-		$size = isset($queryParams['size']) ? (int)$queryParams['size'] : -1;
-
-		$path = $request->getPath();
-		$node = $this->server->tree->getNodeForPath($path);
-
-		if (!($node instanceof Card)) {
-			return true;
-		}
-
-		$this->server->transactionType = 'carddav-image-export';
-
-		// Checking ACL, if available.
-		if ($aclPlugin = $this->server->getPlugin('acl')) {
-			/** @var \Sabre\DAVACL\Plugin $aclPlugin */
-			$aclPlugin->checkPrivileges($path, '{DAV:}read');
-		}
-
-		// Fetch addressbook
-		$addressbookpath = explode('/', $path);
-		array_pop($addressbookpath);
-		$addressbookpath = implode('/', $addressbookpath);
-		/** @var AddressBook $addressbook */
-		$addressbook = $this->server->tree->getNodeForPath($addressbookpath);
-
-		$response->setHeader('Cache-Control', 'private, max-age=3600, must-revalidate');
-		$response->setHeader('Etag', $node->getETag() );
-		$response->setHeader('Pragma', 'public');
-
-		try {
-			$file = $this->cache->get($addressbook->getResourceId(), $node->getName(), $size, $node);
-			$response->setHeader('Content-Type', $file->getMimeType());
-			$response->setHeader('Content-Disposition', 'attachment');
-			$response->setStatus(200);
-
-			$response->setBody($file->getContent());
-		} catch (NotFoundException $e) {
-			$response->setStatus(404);
-		}
-
-		return false;
-	}
+    /** @var Server */
+    protected $server;
+    /** @var PhotoCache */
+    private $cache;
+
+    /**
+     * ImageExportPlugin constructor.
+     *
+     * @param PhotoCache $cache
+     */
+    public function __construct(PhotoCache $cache) {
+        $this->cache = $cache;
+    }
+
+    /**
+     * Initializes the plugin and registers event handlers
+     *
+     * @param Server $server
+     * @return void
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+        $this->server->on('method:GET', [$this, 'httpGet'], 90);
+    }
+
+    /**
+     * Intercepts GET requests on addressbook urls ending with ?photo.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool
+     */
+    public function httpGet(RequestInterface $request, ResponseInterface $response) {
+
+        $queryParams = $request->getQueryParameters();
+        // TODO: in addition to photo we should also add logo some point in time
+        if (!array_key_exists('photo', $queryParams)) {
+            return true;
+        }
+
+        $size = isset($queryParams['size']) ? (int)$queryParams['size'] : -1;
+
+        $path = $request->getPath();
+        $node = $this->server->tree->getNodeForPath($path);
+
+        if (!($node instanceof Card)) {
+            return true;
+        }
+
+        $this->server->transactionType = 'carddav-image-export';
+
+        // Checking ACL, if available.
+        if ($aclPlugin = $this->server->getPlugin('acl')) {
+            /** @var \Sabre\DAVACL\Plugin $aclPlugin */
+            $aclPlugin->checkPrivileges($path, '{DAV:}read');
+        }
+
+        // Fetch addressbook
+        $addressbookpath = explode('/', $path);
+        array_pop($addressbookpath);
+        $addressbookpath = implode('/', $addressbookpath);
+        /** @var AddressBook $addressbook */
+        $addressbook = $this->server->tree->getNodeForPath($addressbookpath);
+
+        $response->setHeader('Cache-Control', 'private, max-age=3600, must-revalidate');
+        $response->setHeader('Etag', $node->getETag() );
+        $response->setHeader('Pragma', 'public');
+
+        try {
+            $file = $this->cache->get($addressbook->getResourceId(), $node->getName(), $size, $node);
+            $response->setHeader('Content-Type', $file->getMimeType());
+            $response->setHeader('Content-Disposition', 'attachment');
+            $response->setStatus(200);
+
+            $response->setBody($file->getContent());
+        } catch (NotFoundException $e) {
+            $response->setStatus(404);
+        }
+
+        return false;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
 			return true;
 		}
 
-		$size = isset($queryParams['size']) ? (int)$queryParams['size'] : -1;
+		$size = isset($queryParams['size']) ? (int) $queryParams['size'] : -1;
 
 		$path = $request->getPath();
 		$node = $this->server->tree->getNodeForPath($path);
@@ -97,7 +97,7 @@ 
 		$addressbook = $this->server->tree->getNodeForPath($addressbookpath);
 
 		$response->setHeader('Cache-Control', 'private, max-age=3600, must-revalidate');
-		$response->setHeader('Etag', $node->getETag() );
+		$response->setHeader('Etag', $node->getETag());
 		$response->setHeader('Pragma', 'public');
 
 		try {

core/templates/layout.guest.php

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 									<?php p($theme->getName()); ?>
 								</h1>
 								<?php if(\OC::$server->getConfig()->getSystemValue('installed', false)
-									&& \OC::$server->getConfig()->getAppValue('theming', 'logoMime', false)): ?>
+                                    && \OC::$server->getConfig()->getAppValue('theming', 'logoMime', false)): ?>
 									<img src="<?php p($theme->getLogo()); ?>"/>
 								<?php endif; ?>
 							</div>

Spacing +3 added lines, -3 removed lines

@@ -18,21 +18,21 @@
 		<?php emit_script_loading_tags($_); ?>
 		<?php print_unescaped($_['headers']); ?>
 	</head>
-	<body id="<?php p($_['bodyid']);?>">
+	<body id="<?php p($_['bodyid']); ?>">
 		<?php include 'layout.noscript.warning.php'; ?>
 		<?php foreach ($_['initialStates'] as $app => $initialState) { ?>
 			<input type="hidden" id="initial-state-<?php p($app); ?>" value="<?php p(base64_encode($initialState)); ?>">
 		<?php }?>
 		<div class="wrapper">
 			<div class="v-align">
-				<?php if ($_['bodyid'] === 'body-login' ): ?>
+				<?php if ($_['bodyid'] === 'body-login'): ?>
 					<header role="banner">
 						<div id="header">
 							<div class="logo">
 								<h1 class="hidden-visually">
 									<?php p($theme->getName()); ?>
 								</h1>
-								<?php if(\OC::$server->getConfig()->getSystemValue('installed', false)
+								<?php if (\OC::$server->getConfig()->getSystemValue('installed', false)
 									&& \OC::$server->getConfig()->getAppValue('theming', 'logoMime', false)): ?>
 									<img src="<?php p($theme->getLogo()); ?>"/>
 								<?php endif; ?>

lib/private/Config.php

Spacing +9 added lines, -9 removed lines

@@ -85,7 +85,7 @@ 
 	 * @return mixed the value or $default
 	 */
 	public function getValue($key, $default = null) {
-		$envValue = getenv(self::ENV_PREFIX . $key);
+		$envValue = getenv(self::ENV_PREFIX.$key);
 		if ($envValue !== false) {
 			return $envValue;
 		}
@@ -197,7 +197,7 @@ 
 		foreach ($configFiles as $file) {
 			$fileExistsAndIsReadable = file_exists($file) && is_readable($file);
 			$filePointer = $fileExistsAndIsReadable ? fopen($file, 'r') : false;
-			if($file === $this->configFilePath &&
+			if ($file === $this->configFilePath &&
 				$filePointer === false) {
 				// Opening the main config might not be possible, e.g. if the wrong
 				// permissions are set (likely on a new installation)
@@ -205,13 +205,13 @@ 
 			}
 
 			// Try to acquire a file lock
-			if(!flock($filePointer, LOCK_SH)) {
+			if (!flock($filePointer, LOCK_SH)) {
 				throw new \Exception(sprintf('Could not acquire a shared lock on the config file %s', $file));
 			}
 
 			unset($CONFIG);
 			include $file;
-			if(isset($CONFIG) && is_array($CONFIG)) {
+			if (isset($CONFIG) && is_array($CONFIG)) {
 				$this->cache = array_merge($this->cache, $CONFIG);
 			}
 
@@ -236,29 +236,29 @@ 
 		$content .= var_export($this->cache, true);
 		$content .= ";\n";
 
-		touch ($this->configFilePath);
+		touch($this->configFilePath);
 		$filePointer = fopen($this->configFilePath, 'r+');
 
 		// Prevent others not to read the config
 		chmod($this->configFilePath, 0640);
 
 		// File does not exist, this can happen when doing a fresh install
-		if(!is_resource ($filePointer)) {
+		if (!is_resource($filePointer)) {
 			// TODO fix this via DI once it is very clear that this doesn't cause side effects due to initialization order
 			// currently this breaks app routes but also could have other side effects especially during setup and exception handling
 			$url = \OC::$server->getURLGenerator()->linkToDocs('admin-dir_permissions');
 			throw new HintException(
 				"Can't write into config directory!",
-				'This can usually be fixed by giving the webserver write access to the config directory. See ' . $url);
+				'This can usually be fixed by giving the webserver write access to the config directory. See '.$url);
 		}
 
 		// Try to acquire a file lock
-		if(!flock($filePointer, LOCK_EX)) {
+		if (!flock($filePointer, LOCK_EX)) {
 			throw new \Exception(sprintf('Could not acquire an exclusive lock on the config file %s', $this->configFilePath));
 		}
 
 		// Write the config and release the lock
-		ftruncate ($filePointer, 0);
+		ftruncate($filePointer, 0);
 		fwrite($filePointer, $content);
 		fflush($filePointer);
 		flock($filePointer, LOCK_UN);

Indentation +202 added lines, -202 removed lines

@@ -41,233 +41,233 @@
  */
 class Config {
 
-	const ENV_PREFIX = 'NC_';
+    const ENV_PREFIX = 'NC_';
 
-	/** @var array Associative array ($key => $value) */
-	protected $cache = array();
-	/** @var string */
-	protected $configDir;
-	/** @var string */
-	protected $configFilePath;
-	/** @var string */
-	protected $configFileName;
+    /** @var array Associative array ($key => $value) */
+    protected $cache = array();
+    /** @var string */
+    protected $configDir;
+    /** @var string */
+    protected $configFilePath;
+    /** @var string */
+    protected $configFileName;
 
-	/**
-	 * @param string $configDir Path to the config dir, needs to end with '/'
-	 * @param string $fileName (Optional) Name of the config file. Defaults to config.php
-	 */
-	public function __construct($configDir, $fileName = 'config.php') {
-		$this->configDir = $configDir;
-		$this->configFilePath = $this->configDir.$fileName;
-		$this->configFileName = $fileName;
-		$this->readData();
-	}
+    /**
+     * @param string $configDir Path to the config dir, needs to end with '/'
+     * @param string $fileName (Optional) Name of the config file. Defaults to config.php
+     */
+    public function __construct($configDir, $fileName = 'config.php') {
+        $this->configDir = $configDir;
+        $this->configFilePath = $this->configDir.$fileName;
+        $this->configFileName = $fileName;
+        $this->readData();
+    }
 
-	/**
-	 * Lists all available config keys
-	 *
-	 * Please note that it does not return the values.
-	 *
-	 * @return array an array of key names
-	 */
-	public function getKeys() {
-		return array_keys($this->cache);
-	}
+    /**
+     * Lists all available config keys
+     *
+     * Please note that it does not return the values.
+     *
+     * @return array an array of key names
+     */
+    public function getKeys() {
+        return array_keys($this->cache);
+    }
 
-	/**
-	 * Returns a config value
-	 *
-	 * gets its value from an `NC_` prefixed environment variable
-	 * if it doesn't exist from config.php
-	 * if this doesn't exist either, it will return the given `$default`
-	 *
-	 * @param string $key key
-	 * @param mixed $default = null default value
-	 * @return mixed the value or $default
-	 */
-	public function getValue($key, $default = null) {
-		$envValue = getenv(self::ENV_PREFIX . $key);
-		if ($envValue !== false) {
-			return $envValue;
-		}
+    /**
+     * Returns a config value
+     *
+     * gets its value from an `NC_` prefixed environment variable
+     * if it doesn't exist from config.php
+     * if this doesn't exist either, it will return the given `$default`
+     *
+     * @param string $key key
+     * @param mixed $default = null default value
+     * @return mixed the value or $default
+     */
+    public function getValue($key, $default = null) {
+        $envValue = getenv(self::ENV_PREFIX . $key);
+        if ($envValue !== false) {
+            return $envValue;
+        }
 
-		if (isset($this->cache[$key])) {
-			return $this->cache[$key];
-		}
+        if (isset($this->cache[$key])) {
+            return $this->cache[$key];
+        }
 
-		return $default;
-	}
+        return $default;
+    }
 
-	/**
-	 * Sets and deletes values and writes the config.php
-	 *
-	 * @param array $configs Associative array with `key => value` pairs
-	 *                       If value is null, the config key will be deleted
-	 */
-	public function setValues(array $configs) {
-		$needsUpdate = false;
-		foreach ($configs as $key => $value) {
-			if ($value !== null) {
-				$needsUpdate |= $this->set($key, $value);
-			} else {
-				$needsUpdate |= $this->delete($key);
-			}
-		}
+    /**
+     * Sets and deletes values and writes the config.php
+     *
+     * @param array $configs Associative array with `key => value` pairs
+     *                       If value is null, the config key will be deleted
+     */
+    public function setValues(array $configs) {
+        $needsUpdate = false;
+        foreach ($configs as $key => $value) {
+            if ($value !== null) {
+                $needsUpdate |= $this->set($key, $value);
+            } else {
+                $needsUpdate |= $this->delete($key);
+            }
+        }
 
-		if ($needsUpdate) {
-			// Write changes
-			$this->writeData();
-		}
-	}
+        if ($needsUpdate) {
+            // Write changes
+            $this->writeData();
+        }
+    }
 
-	/**
-	 * Sets the value and writes it to config.php if required
-	 *
-	 * @param string $key key
-	 * @param mixed $value value
-	 */
-	public function setValue($key, $value) {
-		if ($this->set($key, $value)) {
-			// Write changes
-			$this->writeData();
-		}
-	}
+    /**
+     * Sets the value and writes it to config.php if required
+     *
+     * @param string $key key
+     * @param mixed $value value
+     */
+    public function setValue($key, $value) {
+        if ($this->set($key, $value)) {
+            // Write changes
+            $this->writeData();
+        }
+    }
 
-	/**
-	 * This function sets the value
-	 *
-	 * @param string $key key
-	 * @param mixed $value value
-	 * @return bool True if the file needs to be updated, false otherwise
-	 */
-	protected function set($key, $value) {
-		if (!isset($this->cache[$key]) || $this->cache[$key] !== $value) {
-			// Add change
-			$this->cache[$key] = $value;
-			return true;
-		}
+    /**
+     * This function sets the value
+     *
+     * @param string $key key
+     * @param mixed $value value
+     * @return bool True if the file needs to be updated, false otherwise
+     */
+    protected function set($key, $value) {
+        if (!isset($this->cache[$key]) || $this->cache[$key] !== $value) {
+            // Add change
+            $this->cache[$key] = $value;
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * Removes a key from the config and removes it from config.php if required
-	 * @param string $key
-	 */
-	public function deleteKey($key) {
-		if ($this->delete($key)) {
-			// Write changes
-			$this->writeData();
-		}
-	}
+    /**
+     * Removes a key from the config and removes it from config.php if required
+     * @param string $key
+     */
+    public function deleteKey($key) {
+        if ($this->delete($key)) {
+            // Write changes
+            $this->writeData();
+        }
+    }
 
-	/**
-	 * This function removes a key from the config
-	 *
-	 * @param string $key
-	 * @return bool True if the file needs to be updated, false otherwise
-	 */
-	protected function delete($key) {
-		if (isset($this->cache[$key])) {
-			// Delete key from cache
-			unset($this->cache[$key]);
-			return true;
-		}
-		return false;
-	}
+    /**
+     * This function removes a key from the config
+     *
+     * @param string $key
+     * @return bool True if the file needs to be updated, false otherwise
+     */
+    protected function delete($key) {
+        if (isset($this->cache[$key])) {
+            // Delete key from cache
+            unset($this->cache[$key]);
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * Loads the config file
-	 *
-	 * Reads the config file and saves it to the cache
-	 *
-	 * @throws \Exception If no lock could be acquired or the config file has not been found
-	 */
-	private function readData() {
-		// Default config should always get loaded
-		$configFiles = array($this->configFilePath);
+    /**
+     * Loads the config file
+     *
+     * Reads the config file and saves it to the cache
+     *
+     * @throws \Exception If no lock could be acquired or the config file has not been found
+     */
+    private function readData() {
+        // Default config should always get loaded
+        $configFiles = array($this->configFilePath);
 
-		// Add all files in the config dir ending with the same file name
-		$extra = glob($this->configDir.'*.'.$this->configFileName);
-		if (is_array($extra)) {
-			natsort($extra);
-			$configFiles = array_merge($configFiles, $extra);
-		}
+        // Add all files in the config dir ending with the same file name
+        $extra = glob($this->configDir.'*.'.$this->configFileName);
+        if (is_array($extra)) {
+            natsort($extra);
+            $configFiles = array_merge($configFiles, $extra);
+        }
 
-		// Include file and merge config
-		foreach ($configFiles as $file) {
-			$fileExistsAndIsReadable = file_exists($file) && is_readable($file);
-			$filePointer = $fileExistsAndIsReadable ? fopen($file, 'r') : false;
-			if($file === $this->configFilePath &&
-				$filePointer === false) {
-				// Opening the main config might not be possible, e.g. if the wrong
-				// permissions are set (likely on a new installation)
-				continue;
-			}
+        // Include file and merge config
+        foreach ($configFiles as $file) {
+            $fileExistsAndIsReadable = file_exists($file) && is_readable($file);
+            $filePointer = $fileExistsAndIsReadable ? fopen($file, 'r') : false;
+            if($file === $this->configFilePath &&
+                $filePointer === false) {
+                // Opening the main config might not be possible, e.g. if the wrong
+                // permissions are set (likely on a new installation)
+                continue;
+            }
 
-			// Try to acquire a file lock
-			if(!flock($filePointer, LOCK_SH)) {
-				throw new \Exception(sprintf('Could not acquire a shared lock on the config file %s', $file));
-			}
+            // Try to acquire a file lock
+            if(!flock($filePointer, LOCK_SH)) {
+                throw new \Exception(sprintf('Could not acquire a shared lock on the config file %s', $file));
+            }
 
-			unset($CONFIG);
-			include $file;
-			if(isset($CONFIG) && is_array($CONFIG)) {
-				$this->cache = array_merge($this->cache, $CONFIG);
-			}
+            unset($CONFIG);
+            include $file;
+            if(isset($CONFIG) && is_array($CONFIG)) {
+                $this->cache = array_merge($this->cache, $CONFIG);
+            }
 
-			// Close the file pointer and release the lock
-			flock($filePointer, LOCK_UN);
-			fclose($filePointer);
-		}
-	}
+            // Close the file pointer and release the lock
+            flock($filePointer, LOCK_UN);
+            fclose($filePointer);
+        }
+    }
 
-	/**
-	 * Writes the config file
-	 *
-	 * Saves the config to the config file.
-	 *
-	 * @throws HintException If the config file cannot be written to
-	 * @throws \Exception If no file lock can be acquired
-	 */
-	private function writeData() {
-		// Create a php file ...
-		$content = "<?php\n";
-		$content .= '$CONFIG = ';
-		$content .= var_export($this->cache, true);
-		$content .= ";\n";
+    /**
+     * Writes the config file
+     *
+     * Saves the config to the config file.
+     *
+     * @throws HintException If the config file cannot be written to
+     * @throws \Exception If no file lock can be acquired
+     */
+    private function writeData() {
+        // Create a php file ...
+        $content = "<?php\n";
+        $content .= '$CONFIG = ';
+        $content .= var_export($this->cache, true);
+        $content .= ";\n";
 
-		touch ($this->configFilePath);
-		$filePointer = fopen($this->configFilePath, 'r+');
+        touch ($this->configFilePath);
+        $filePointer = fopen($this->configFilePath, 'r+');
 
-		// Prevent others not to read the config
-		chmod($this->configFilePath, 0640);
+        // Prevent others not to read the config
+        chmod($this->configFilePath, 0640);
 
-		// File does not exist, this can happen when doing a fresh install
-		if(!is_resource ($filePointer)) {
-			// TODO fix this via DI once it is very clear that this doesn't cause side effects due to initialization order
-			// currently this breaks app routes but also could have other side effects especially during setup and exception handling
-			$url = \OC::$server->getURLGenerator()->linkToDocs('admin-dir_permissions');
-			throw new HintException(
-				"Can't write into config directory!",
-				'This can usually be fixed by giving the webserver write access to the config directory. See ' . $url);
-		}
+        // File does not exist, this can happen when doing a fresh install
+        if(!is_resource ($filePointer)) {
+            // TODO fix this via DI once it is very clear that this doesn't cause side effects due to initialization order
+            // currently this breaks app routes but also could have other side effects especially during setup and exception handling
+            $url = \OC::$server->getURLGenerator()->linkToDocs('admin-dir_permissions');
+            throw new HintException(
+                "Can't write into config directory!",
+                'This can usually be fixed by giving the webserver write access to the config directory. See ' . $url);
+        }
 
-		// Try to acquire a file lock
-		if(!flock($filePointer, LOCK_EX)) {
-			throw new \Exception(sprintf('Could not acquire an exclusive lock on the config file %s', $this->configFilePath));
-		}
+        // Try to acquire a file lock
+        if(!flock($filePointer, LOCK_EX)) {
+            throw new \Exception(sprintf('Could not acquire an exclusive lock on the config file %s', $this->configFilePath));
+        }
 
-		// Write the config and release the lock
-		ftruncate ($filePointer, 0);
-		fwrite($filePointer, $content);
-		fflush($filePointer);
-		flock($filePointer, LOCK_UN);
-		fclose($filePointer);
+        // Write the config and release the lock
+        ftruncate ($filePointer, 0);
+        fwrite($filePointer, $content);
+        fflush($filePointer);
+        flock($filePointer, LOCK_UN);
+        fclose($filePointer);
 
-		if (function_exists('opcache_invalidate')) {
-			@opcache_invalidate($this->configFilePath, true);
-		}
-	}
+        if (function_exists('opcache_invalidate')) {
+            @opcache_invalidate($this->configFilePath, true);
+        }
+    }
 }
 

lib/private/App/CodeChecker/LanguageParseChecker.php

Indentation +32 added lines, -32 removed lines

@@ -25,36 +25,36 @@
 
 class LanguageParseChecker {
 
-	/**
-	 * @param string $appId
-	 * @return array
-	 */
-	public function analyse($appId) {
-		$appPath = \OC_App::getAppPath($appId);
-		if ($appPath === false) {
-			throw new \RuntimeException("No app with given id <$appId> known.");
-		}
-
-		if (!is_dir($appPath . '/l10n/')) {
-			return [];
-		}
-
-		$errors = [];
-		$directory = new \DirectoryIterator($appPath . '/l10n/');
-
-		foreach ($directory as $file) {
-			if ($file->getExtension() !== 'json') {
-				continue;
-			}
-
-			$content = file_get_contents($file->getPathname());
-			json_decode($content, true);
-
-			if (json_last_error() !== JSON_ERROR_NONE) {
-				$errors[] = 'Invalid language file found: l10n/' . $file->getFilename() . ': ' . json_last_error_msg();
-			}
-		}
-
-		return $errors;
-	}
+    /**
+     * @param string $appId
+     * @return array
+     */
+    public function analyse($appId) {
+        $appPath = \OC_App::getAppPath($appId);
+        if ($appPath === false) {
+            throw new \RuntimeException("No app with given id <$appId> known.");
+        }
+
+        if (!is_dir($appPath . '/l10n/')) {
+            return [];
+        }
+
+        $errors = [];
+        $directory = new \DirectoryIterator($appPath . '/l10n/');
+
+        foreach ($directory as $file) {
+            if ($file->getExtension() !== 'json') {
+                continue;
+            }
+
+            $content = file_get_contents($file->getPathname());
+            json_decode($content, true);
+
+            if (json_last_error() !== JSON_ERROR_NONE) {
+                $errors[] = 'Invalid language file found: l10n/' . $file->getFilename() . ': ' . json_last_error_msg();
+            }
+        }
+
+        return $errors;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -35,12 +35,12 @@ 
 			throw new \RuntimeException("No app with given id <$appId> known.");
 		}
 
-		if (!is_dir($appPath . '/l10n/')) {
+		if (!is_dir($appPath.'/l10n/')) {
 			return [];
 		}
 
 		$errors = [];
-		$directory = new \DirectoryIterator($appPath . '/l10n/');
+		$directory = new \DirectoryIterator($appPath.'/l10n/');
 
 		foreach ($directory as $file) {
 			if ($file->getExtension() !== 'json') {
@@ -51,7 +51,7 @@ 
 			json_decode($content, true);
 
 			if (json_last_error() !== JSON_ERROR_NONE) {
-				$errors[] = 'Invalid language file found: l10n/' . $file->getFilename() . ': ' . json_last_error_msg();
+				$errors[] = 'Invalid language file found: l10n/'.$file->getFilename().': '.json_last_error_msg();
 			}
 		}
 

apps/files_external/lib/Command/Import.php

Spacing +2 added lines, -2 removed lines

@@ -112,7 +112,7 @@ 
 			$json = file_get_contents('php://stdin');
 		} else {
 			if (!file_exists($path)) {
-				$output->writeln('<error>File not found: ' . $path . '</error>');
+				$output->writeln('<error>File not found: '.$path.'</error>');
 				return 1;
 			}
 			$json = file_get_contents($path);
@@ -164,7 +164,7 @@ 
 					$existingMount->getApplicableUsers() === $mount->getApplicableUsers() &&
 					$existingMount->getBackendOptions() === $mount->getBackendOptions()
 				) {
-					$output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>");
+					$output->writeln("<error>Duplicate mount (".$mount->getMountPoint().")</error>");
 					return 1;
 				}
 			}

Indentation +183 added lines, -183 removed lines

@@ -39,187 +39,187 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Import extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	private $globalService;
-
-	/**
-	 * @var UserStoragesService
-	 */
-	private $userService;
-
-	/**
-	 * @var IUserSession
-	 */
-	private $userSession;
-
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
-
-	/** @var ImportLegacyStoragesService */
-	private $importLegacyStorageService;
-
-	/** @var BackendService */
-	private $backendService;
-
-	function __construct(GlobalStoragesService $globalService,
-						 UserStoragesService $userService,
-						 IUserSession $userSession,
-						 IUserManager $userManager,
-						 ImportLegacyStoragesService $importLegacyStorageService,
-						 BackendService $backendService
-	) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->userService = $userService;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-		$this->importLegacyStorageService = $importLegacyStorageService;
-		$this->backendService = $backendService;
-	}
-
-	protected function configure() {
-		$this
-			->setName('files_external:import')
-			->setDescription('Import mount configurations')
-			->addOption(
-				'user',
-				'',
-				InputOption::VALUE_OPTIONAL,
-				'user to add the mount configurations for, if not set the mount will be added as system mount'
-			)
-			->addArgument(
-				'path',
-				InputArgument::REQUIRED,
-				'path to a json file containing the mounts to import, use "-" to read from stdin'
-			)
-			->addOption(
-				'dry',
-				'',
-				InputOption::VALUE_NONE,
-				'Don\'t save the imported mounts, only list the new mounts'
-			);
-		parent::configure();
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$user = $input->getOption('user');
-		$path = $input->getArgument('path');
-		if ($path === '-') {
-			$json = file_get_contents('php://stdin');
-		} else {
-			if (!file_exists($path)) {
-				$output->writeln('<error>File not found: ' . $path . '</error>');
-				return 1;
-			}
-			$json = file_get_contents($path);
-		}
-		if (!is_string($json) || strlen($json) < 2) {
-			$output->writeln('<error>Error while reading json</error>');
-			return 1;
-		}
-		$data = json_decode($json, true);
-		if (!is_array($data)) {
-			$output->writeln('<error>Error while parsing json</error>');
-			return 1;
-		}
-
-		$isLegacy = isset($data['user']) || isset($data['group']);
-		if ($isLegacy) {
-			$this->importLegacyStorageService->setData($data);
-			$mounts = $this->importLegacyStorageService->getAllStorages();
-			foreach ($mounts as $mount) {
-				if ($mount->getBackendOption('password') === false) {
-					$output->writeln('<error>Failed to decrypt password</error>');
-					return 1;
-				}
-			}
-		} else {
-			if (!isset($data[0])) { //normalize to an array of mounts
-				$data = [$data];
-			}
-			$mounts = array_map([$this, 'parseData'], $data);
-		}
-
-		if ($user) {
-			// ensure applicables are correct for personal mounts
-			foreach ($mounts as $mount) {
-				$mount->setApplicableGroups([]);
-				$mount->setApplicableUsers([$user]);
-			}
-		}
-
-		$storageService = $this->getStorageService($user);
-
-		$existingMounts = $storageService->getAllStorages();
-
-		foreach ($mounts as $mount) {
-			foreach ($existingMounts as $existingMount) {
-				if (
-					$existingMount->getMountPoint() === $mount->getMountPoint() &&
-					$existingMount->getApplicableGroups() === $mount->getApplicableGroups() &&
-					$existingMount->getApplicableUsers() === $mount->getApplicableUsers() &&
-					$existingMount->getBackendOptions() === $mount->getBackendOptions()
-				) {
-					$output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>");
-					return 1;
-				}
-			}
-		}
-
-		if ($input->getOption('dry')) {
-			if (count($mounts) === 0) {
-				$output->writeln('<error>No mounts to be imported</error>');
-				return 1;
-			}
-			$listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
-			$listInput = new ArrayInput([], $listCommand->getDefinition());
-			$listInput->setOption('output', $input->getOption('output'));
-			$listInput->setOption('show-password', true);
-			$listCommand->listMounts($user, $mounts, $listInput, $output);
-		} else {
-			foreach ($mounts as $mount) {
-				$storageService->addStorage($mount);
-			}
-		}
-		return 0;
-	}
-
-	private function parseData(array $data) {
-		$mount = new StorageConfig($data['mount_id']);
-		$mount->setMountPoint($data['mount_point']);
-		$mount->setBackend($this->getBackendByClass($data['storage']));
-		$authBackend = $this->backendService->getAuthMechanism($data['authentication_type']);
-		$mount->setAuthMechanism($authBackend);
-		$mount->setBackendOptions($data['configuration']);
-		$mount->setMountOptions($data['options']);
-		$mount->setApplicableUsers(isset($data['applicable_users']) ? $data['applicable_users'] : []);
-		$mount->setApplicableGroups(isset($data['applicable_groups']) ? $data['applicable_groups'] : []);
-		return $mount;
-	}
-
-	private function getBackendByClass($className) {
-		$backends = $this->backendService->getBackends();
-		foreach ($backends as $backend) {
-			if ($backend->getStorageClass() === $className) {
-				return $backend;
-			}
-		}
-	}
-
-	protected function getStorageService($userId) {
-		if (!empty($userId)) {
-			$user = $this->userManager->get($userId);
-			if (is_null($user)) {
-				throw new NoUserException("user $userId not found");
-			}
-			$this->userSession->setUser($user);
-			return $this->userService;
-		} else {
-			return $this->globalService;
-		}
-	}
+    /**
+     * @var GlobalStoragesService
+     */
+    private $globalService;
+
+    /**
+     * @var UserStoragesService
+     */
+    private $userService;
+
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
+
+    /** @var ImportLegacyStoragesService */
+    private $importLegacyStorageService;
+
+    /** @var BackendService */
+    private $backendService;
+
+    function __construct(GlobalStoragesService $globalService,
+                            UserStoragesService $userService,
+                            IUserSession $userSession,
+                            IUserManager $userManager,
+                            ImportLegacyStoragesService $importLegacyStorageService,
+                            BackendService $backendService
+    ) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->userService = $userService;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+        $this->importLegacyStorageService = $importLegacyStorageService;
+        $this->backendService = $backendService;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('files_external:import')
+            ->setDescription('Import mount configurations')
+            ->addOption(
+                'user',
+                '',
+                InputOption::VALUE_OPTIONAL,
+                'user to add the mount configurations for, if not set the mount will be added as system mount'
+            )
+            ->addArgument(
+                'path',
+                InputArgument::REQUIRED,
+                'path to a json file containing the mounts to import, use "-" to read from stdin'
+            )
+            ->addOption(
+                'dry',
+                '',
+                InputOption::VALUE_NONE,
+                'Don\'t save the imported mounts, only list the new mounts'
+            );
+        parent::configure();
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $user = $input->getOption('user');
+        $path = $input->getArgument('path');
+        if ($path === '-') {
+            $json = file_get_contents('php://stdin');
+        } else {
+            if (!file_exists($path)) {
+                $output->writeln('<error>File not found: ' . $path . '</error>');
+                return 1;
+            }
+            $json = file_get_contents($path);
+        }
+        if (!is_string($json) || strlen($json) < 2) {
+            $output->writeln('<error>Error while reading json</error>');
+            return 1;
+        }
+        $data = json_decode($json, true);
+        if (!is_array($data)) {
+            $output->writeln('<error>Error while parsing json</error>');
+            return 1;
+        }
+
+        $isLegacy = isset($data['user']) || isset($data['group']);
+        if ($isLegacy) {
+            $this->importLegacyStorageService->setData($data);
+            $mounts = $this->importLegacyStorageService->getAllStorages();
+            foreach ($mounts as $mount) {
+                if ($mount->getBackendOption('password') === false) {
+                    $output->writeln('<error>Failed to decrypt password</error>');
+                    return 1;
+                }
+            }
+        } else {
+            if (!isset($data[0])) { //normalize to an array of mounts
+                $data = [$data];
+            }
+            $mounts = array_map([$this, 'parseData'], $data);
+        }
+
+        if ($user) {
+            // ensure applicables are correct for personal mounts
+            foreach ($mounts as $mount) {
+                $mount->setApplicableGroups([]);
+                $mount->setApplicableUsers([$user]);
+            }
+        }
+
+        $storageService = $this->getStorageService($user);
+
+        $existingMounts = $storageService->getAllStorages();
+
+        foreach ($mounts as $mount) {
+            foreach ($existingMounts as $existingMount) {
+                if (
+                    $existingMount->getMountPoint() === $mount->getMountPoint() &&
+                    $existingMount->getApplicableGroups() === $mount->getApplicableGroups() &&
+                    $existingMount->getApplicableUsers() === $mount->getApplicableUsers() &&
+                    $existingMount->getBackendOptions() === $mount->getBackendOptions()
+                ) {
+                    $output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>");
+                    return 1;
+                }
+            }
+        }
+
+        if ($input->getOption('dry')) {
+            if (count($mounts) === 0) {
+                $output->writeln('<error>No mounts to be imported</error>');
+                return 1;
+            }
+            $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
+            $listInput = new ArrayInput([], $listCommand->getDefinition());
+            $listInput->setOption('output', $input->getOption('output'));
+            $listInput->setOption('show-password', true);
+            $listCommand->listMounts($user, $mounts, $listInput, $output);
+        } else {
+            foreach ($mounts as $mount) {
+                $storageService->addStorage($mount);
+            }
+        }
+        return 0;
+    }
+
+    private function parseData(array $data) {
+        $mount = new StorageConfig($data['mount_id']);
+        $mount->setMountPoint($data['mount_point']);
+        $mount->setBackend($this->getBackendByClass($data['storage']));
+        $authBackend = $this->backendService->getAuthMechanism($data['authentication_type']);
+        $mount->setAuthMechanism($authBackend);
+        $mount->setBackendOptions($data['configuration']);
+        $mount->setMountOptions($data['options']);
+        $mount->setApplicableUsers(isset($data['applicable_users']) ? $data['applicable_users'] : []);
+        $mount->setApplicableGroups(isset($data['applicable_groups']) ? $data['applicable_groups'] : []);
+        return $mount;
+    }
+
+    private function getBackendByClass($className) {
+        $backends = $this->backendService->getBackends();
+        foreach ($backends as $backend) {
+            if ($backend->getStorageClass() === $className) {
+                return $backend;
+            }
+        }
+    }
+
+    protected function getStorageService($userId) {
+        if (!empty($userId)) {
+            $user = $this->userManager->get($userId);
+            if (is_null($user)) {
+                throw new NoUserException("user $userId not found");
+            }
+            $this->userSession->setUser($user);
+            return $this->userService;
+        } else {
+            return $this->globalService;
+        }
+    }
 }