nextcloud / server

lib/private/Files/Storage/DAV.php

Unused Use Statements -1 removed lines

@@ -34,7 +34,6 @@
 namespace OC\Files\Storage;
 
 use Exception;
-use GuzzleHttp\Exception\RequestException;
 use OCP\ILogger;
 use Psr\Http\Message\ResponseInterface;
 use Icewind\Streams\CallbackWrapper;

Indentation +796 added lines, -796 removed lines

@@ -58,801 +58,801 @@
  * @package OC\Files\Storage
  */
 class DAV extends Common {
-	/** @var string */
-	protected $password;
-	/** @var string */
-	protected $user;
-	/** @var string */
-	protected $authType;
-	/** @var string */
-	protected $host;
-	/** @var bool */
-	protected $secure;
-	/** @var string */
-	protected $root;
-	/** @var string */
-	protected $certPath;
-	/** @var bool */
-	protected $ready;
-	/** @var Client */
-	protected $client;
-	/** @var ArrayCache */
-	protected $statCache;
-	/** @var \OCP\Http\Client\IClientService */
-	protected $httpClientService;
-
-	/**
-	 * @param array $params
-	 * @throws \Exception
-	 */
-	public function __construct($params) {
-		$this->statCache = new ArrayCache();
-		$this->httpClientService = \OC::$server->getHTTPClientService();
-		if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
-			$host = $params['host'];
-			//remove leading http[s], will be generated in createBaseUri()
-			if (substr($host, 0, 8) == "https://") $host = substr($host, 8);
-			else if (substr($host, 0, 7) == "http://") $host = substr($host, 7);
-			$this->host = $host;
-			$this->user = $params['user'];
-			$this->password = $params['password'];
-			if (isset($params['authType'])) {
-				$this->authType = $params['authType'];
-			}
-			if (isset($params['secure'])) {
-				if (is_string($params['secure'])) {
-					$this->secure = ($params['secure'] === 'true');
-				} else {
-					$this->secure = (bool)$params['secure'];
-				}
-			} else {
-				$this->secure = false;
-			}
-			if ($this->secure === true) {
-				// inject mock for testing
-				$certManager = \OC::$server->getCertificateManager();
-				if (is_null($certManager)) { //no user
-					$certManager = \OC::$server->getCertificateManager(null);
-				}
-				$certPath = $certManager->getAbsoluteBundlePath();
-				if (file_exists($certPath)) {
-					$this->certPath = $certPath;
-				}
-			}
-			$this->root = $params['root'] ?? '/';
-			$this->root = '/' . ltrim($this->root, '/');
-			$this->root = rtrim($this->root, '/') . '/';
-		} else {
-			throw new \Exception('Invalid webdav storage configuration');
-		}
-	}
-
-	protected function init() {
-		if ($this->ready) {
-			return;
-		}
-		$this->ready = true;
-
-		$settings = [
-			'baseUri' => $this->createBaseUri(),
-			'userName' => $this->user,
-			'password' => $this->password,
-		];
-		if (isset($this->authType)) {
-			$settings['authType'] = $this->authType;
-		}
-
-		$proxy = \OC::$server->getConfig()->getSystemValue('proxy', '');
-		if ($proxy !== '') {
-			$settings['proxy'] = $proxy;
-		}
-
-		$this->client = new Client($settings);
-		$this->client->setThrowExceptions(true);
-		if ($this->secure === true && $this->certPath) {
-			$this->client->addCurlSetting(CURLOPT_CAINFO, $this->certPath);
-		}
-	}
-
-	/**
-	 * Clear the stat cache
-	 */
-	public function clearStatCache() {
-		$this->statCache->clear();
-	}
-
-	/** {@inheritdoc} */
-	public function getId() {
-		return 'webdav::' . $this->user . '@' . $this->host . '/' . $this->root;
-	}
-
-	/** {@inheritdoc} */
-	public function createBaseUri() {
-		$baseUri = 'http';
-		if ($this->secure) {
-			$baseUri .= 's';
-		}
-		$baseUri .= '://' . $this->host . $this->root;
-		return $baseUri;
-	}
-
-	/** {@inheritdoc} */
-	public function mkdir($path) {
-		$this->init();
-		$path = $this->cleanPath($path);
-		$result = $this->simpleResponse('MKCOL', $path, null, 201);
-		if ($result) {
-			$this->statCache->set($path, true);
-		}
-		return $result;
-	}
-
-	/** {@inheritdoc} */
-	public function rmdir($path) {
-		$this->init();
-		$path = $this->cleanPath($path);
-		// FIXME: some WebDAV impl return 403 when trying to DELETE
-		// a non-empty folder
-		$result = $this->simpleResponse('DELETE', $path . '/', null, 204);
-		$this->statCache->clear($path . '/');
-		$this->statCache->remove($path);
-		return $result;
-	}
-
-	/** {@inheritdoc} */
-	public function opendir($path) {
-		$this->init();
-		$path = $this->cleanPath($path);
-		try {
-			$response = $this->client->propFind(
-				$this->encodePath($path),
-				['{DAV:}href'],
-				1
-			);
-			if ($response === false) {
-				return false;
-			}
-			$content = [];
-			$files = array_keys($response);
-			array_shift($files); //the first entry is the current directory
-
-			if (!$this->statCache->hasKey($path)) {
-				$this->statCache->set($path, true);
-			}
-			foreach ($files as $file) {
-				$file = urldecode($file);
-				// do not store the real entry, we might not have all properties
-				if (!$this->statCache->hasKey($path)) {
-					$this->statCache->set($file, true);
-				}
-				$file = basename($file);
-				$content[] = $file;
-			}
-			return IteratorDirectory::wrap($content);
-		} catch (\Exception $e) {
-			$this->convertException($e, $path);
-		}
-		return false;
-	}
-
-	/**
-	 * Propfind call with cache handling.
-	 *
-	 * First checks if information is cached.
-	 * If not, request it from the server then store to cache.
-	 *
-	 * @param string $path path to propfind
-	 *
-	 * @return array|boolean propfind response or false if the entry was not found
-	 *
-	 * @throws ClientHttpException
-	 */
-	protected function propfind($path) {
-		$path = $this->cleanPath($path);
-		$cachedResponse = $this->statCache->get($path);
-		// we either don't know it, or we know it exists but need more details
-		if (is_null($cachedResponse) || $cachedResponse === true) {
-			$this->init();
-			try {
-				$response = $this->client->propFind(
-					$this->encodePath($path),
-					array(
-						'{DAV:}getlastmodified',
-						'{DAV:}getcontentlength',
-						'{DAV:}getcontenttype',
-						'{http://owncloud.org/ns}permissions',
-						'{http://open-collaboration-services.org/ns}share-permissions',
-						'{DAV:}resourcetype',
-						'{DAV:}getetag',
-					)
-				);
-				$this->statCache->set($path, $response);
-			} catch (ClientHttpException $e) {
-				if ($e->getHttpStatus() === 404) {
-					$this->statCache->clear($path . '/');
-					$this->statCache->set($path, false);
-					return false;
-				}
-				$this->convertException($e, $path);
-			} catch (\Exception $e) {
-				$this->convertException($e, $path);
-			}
-		} else {
-			$response = $cachedResponse;
-		}
-		return $response;
-	}
-
-	/** {@inheritdoc} */
-	public function filetype($path) {
-		try {
-			$response = $this->propfind($path);
-			if ($response === false) {
-				return false;
-			}
-			$responseType = [];
-			if (isset($response["{DAV:}resourcetype"])) {
-				/** @var ResourceType[] $response */
-				$responseType = $response["{DAV:}resourcetype"]->getValue();
-			}
-			return (count($responseType) > 0 and $responseType[0] == "{DAV:}collection") ? 'dir' : 'file';
-		} catch (\Exception $e) {
-			$this->convertException($e, $path);
-		}
-		return false;
-	}
-
-	/** {@inheritdoc} */
-	public function file_exists($path) {
-		try {
-			$path = $this->cleanPath($path);
-			$cachedState = $this->statCache->get($path);
-			if ($cachedState === false) {
-				// we know the file doesn't exist
-				return false;
-			} else if (!is_null($cachedState)) {
-				return true;
-			}
-			// need to get from server
-			return ($this->propfind($path) !== false);
-		} catch (\Exception $e) {
-			$this->convertException($e, $path);
-		}
-		return false;
-	}
-
-	/** {@inheritdoc} */
-	public function unlink($path) {
-		$this->init();
-		$path = $this->cleanPath($path);
-		$result = $this->simpleResponse('DELETE', $path, null, 204);
-		$this->statCache->clear($path . '/');
-		$this->statCache->remove($path);
-		return $result;
-	}
-
-	/** {@inheritdoc} */
-	public function fopen($path, $mode) {
-		$this->init();
-		$path = $this->cleanPath($path);
-		switch ($mode) {
-			case 'r':
-			case 'rb':
-				try {
-					$response = $this->httpClientService
-						->newClient()
-						->get($this->createBaseUri() . $this->encodePath($path), [
-							'auth' => [$this->user, $this->password],
-							'stream' => true
-						]);
-				} catch (\GuzzleHttp\Exception\ClientException $e) {
-					if ($e->getResponse() instanceof ResponseInterface
-						&& $e->getResponse()->getStatusCode() === 404) {
-						return false;
-					} else {
-						throw $e;
-					}
-				}
-
-				if ($response->getStatusCode() !== Http::STATUS_OK) {
-					if ($response->getStatusCode() === Http::STATUS_LOCKED) {
-						throw new \OCP\Lock\LockedException($path);
-					} else {
-						Util::writeLog("webdav client", 'Guzzle get returned status code ' . $response->getStatusCode(), ILogger::ERROR);
-					}
-				}
-
-				return $response->getBody();
-			case 'w':
-			case 'wb':
-			case 'a':
-			case 'ab':
-			case 'r+':
-			case 'w+':
-			case 'wb+':
-			case 'a+':
-			case 'x':
-			case 'x+':
-			case 'c':
-			case 'c+':
-				//emulate these
-				$tempManager = \OC::$server->getTempManager();
-				if (strrpos($path, '.') !== false) {
-					$ext = substr($path, strrpos($path, '.'));
-				} else {
-					$ext = '';
-				}
-				if ($this->file_exists($path)) {
-					if (!$this->isUpdatable($path)) {
-						return false;
-					}
-					if ($mode === 'w' or $mode === 'w+') {
-						$tmpFile = $tempManager->getTemporaryFile($ext);
-					} else {
-						$tmpFile = $this->getCachedFile($path);
-					}
-				} else {
-					if (!$this->isCreatable(dirname($path))) {
-						return false;
-					}
-					$tmpFile = $tempManager->getTemporaryFile($ext);
-				}
-				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
-					$this->writeBack($tmpFile, $path);
-				});
-		}
-	}
-
-	/**
-	 * @param string $tmpFile
-	 */
-	public function writeBack($tmpFile, $path) {
-		$this->uploadFile($tmpFile, $path);
-		unlink($tmpFile);
-	}
-
-	/** {@inheritdoc} */
-	public function free_space($path) {
-		$this->init();
-		$path = $this->cleanPath($path);
-		try {
-			// TODO: cacheable ?
-			$response = $this->client->propfind($this->encodePath($path), ['{DAV:}quota-available-bytes']);
-			if ($response === false) {
-				return FileInfo::SPACE_UNKNOWN;
-			}
-			if (isset($response['{DAV:}quota-available-bytes'])) {
-				return (int)$response['{DAV:}quota-available-bytes'];
-			} else {
-				return FileInfo::SPACE_UNKNOWN;
-			}
-		} catch (\Exception $e) {
-			return FileInfo::SPACE_UNKNOWN;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function touch($path, $mtime = null) {
-		$this->init();
-		if (is_null($mtime)) {
-			$mtime = time();
-		}
-		$path = $this->cleanPath($path);
-
-		// if file exists, update the mtime, else create a new empty file
-		if ($this->file_exists($path)) {
-			try {
-				$this->statCache->remove($path);
-				$this->client->proppatch($this->encodePath($path), ['{DAV:}lastmodified' => $mtime]);
-				// non-owncloud clients might not have accepted the property, need to recheck it
-				$response = $this->client->propfind($this->encodePath($path), ['{DAV:}getlastmodified'], 0);
-				if ($response === false) {
-					return false;
-				}
-				if (isset($response['{DAV:}getlastmodified'])) {
-					$remoteMtime = strtotime($response['{DAV:}getlastmodified']);
-					if ($remoteMtime !== $mtime) {
-						// server has not accepted the mtime
-						return false;
-					}
-				}
-			} catch (ClientHttpException $e) {
-				if ($e->getHttpStatus() === 501) {
-					return false;
-				}
-				$this->convertException($e, $path);
-				return false;
-			} catch (\Exception $e) {
-				$this->convertException($e, $path);
-				return false;
-			}
-		} else {
-			$this->file_put_contents($path, '');
-		}
-		return true;
-	}
-
-	/**
-	 * @param string $path
-	 * @param string $data
-	 * @return int
-	 */
-	public function file_put_contents($path, $data) {
-		$path = $this->cleanPath($path);
-		$result = parent::file_put_contents($path, $data);
-		$this->statCache->remove($path);
-		return $result;
-	}
-
-	/**
-	 * @param string $path
-	 * @param string $target
-	 */
-	protected function uploadFile($path, $target) {
-		$this->init();
-
-		// invalidate
-		$target = $this->cleanPath($target);
-		$this->statCache->remove($target);
-		$source = fopen($path, 'r');
-
-		$this->httpClientService
-			->newClient()
-			->put($this->createBaseUri() . $this->encodePath($target), [
-				'body' => $source,
-				'auth' => [$this->user, $this->password]
-			]);
-
-		$this->removeCachedFile($target);
-	}
-
-	/** {@inheritdoc} */
-	public function rename($path1, $path2) {
-		$this->init();
-		$path1 = $this->cleanPath($path1);
-		$path2 = $this->cleanPath($path2);
-		try {
-			// overwrite directory ?
-			if ($this->is_dir($path2)) {
-				// needs trailing slash in destination
-				$path2 = rtrim($path2, '/') . '/';
-			}
-			$this->client->request(
-				'MOVE',
-				$this->encodePath($path1),
-				null,
-				[
-					'Destination' => $this->createBaseUri() . $this->encodePath($path2),
-				]
-			);
-			$this->statCache->clear($path1 . '/');
-			$this->statCache->clear($path2 . '/');
-			$this->statCache->set($path1, false);
-			$this->statCache->set($path2, true);
-			$this->removeCachedFile($path1);
-			$this->removeCachedFile($path2);
-			return true;
-		} catch (\Exception $e) {
-			$this->convertException($e);
-		}
-		return false;
-	}
-
-	/** {@inheritdoc} */
-	public function copy($path1, $path2) {
-		$this->init();
-		$path1 = $this->cleanPath($path1);
-		$path2 = $this->cleanPath($path2);
-		try {
-			// overwrite directory ?
-			if ($this->is_dir($path2)) {
-				// needs trailing slash in destination
-				$path2 = rtrim($path2, '/') . '/';
-			}
-			$this->client->request(
-				'COPY',
-				$this->encodePath($path1),
-				null,
-				[
-					'Destination' => $this->createBaseUri() . $this->encodePath($path2),
-				]
-			);
-			$this->statCache->clear($path2 . '/');
-			$this->statCache->set($path2, true);
-			$this->removeCachedFile($path2);
-			return true;
-		} catch (\Exception $e) {
-			$this->convertException($e);
-		}
-		return false;
-	}
-
-	/** {@inheritdoc} */
-	public function stat($path) {
-		try {
-			$response = $this->propfind($path);
-			if (!$response) {
-				return false;
-			}
-			return [
-				'mtime' => strtotime($response['{DAV:}getlastmodified']),
-				'size' => (int)isset($response['{DAV:}getcontentlength']) ? $response['{DAV:}getcontentlength'] : 0,
-			];
-		} catch (\Exception $e) {
-			$this->convertException($e, $path);
-		}
-		return array();
-	}
-
-	/** {@inheritdoc} */
-	public function getMimeType($path) {
-		$remoteMimetype = $this->getMimeTypeFromRemote($path);
-		if ($remoteMimetype === 'application/octet-stream') {
-			return \OC::$server->getMimeTypeDetector()->detectPath($path);
-		} else {
-			return $remoteMimetype;
-		}
-	}
-
-	public function getMimeTypeFromRemote($path) {
-		try {
-			$response = $this->propfind($path);
-			if ($response === false) {
-				return false;
-			}
-			$responseType = [];
-			if (isset($response["{DAV:}resourcetype"])) {
-				/** @var ResourceType[] $response */
-				$responseType = $response["{DAV:}resourcetype"]->getValue();
-			}
-			$type = (count($responseType) > 0 and $responseType[0] == "{DAV:}collection") ? 'dir' : 'file';
-			if ($type == 'dir') {
-				return 'httpd/unix-directory';
-			} elseif (isset($response['{DAV:}getcontenttype'])) {
-				return $response['{DAV:}getcontenttype'];
-			} else {
-				return 'application/octet-stream';
-			}
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	public function cleanPath($path) {
-		if ($path === '') {
-			return $path;
-		}
-		$path = Filesystem::normalizePath($path);
-		// remove leading slash
-		return substr($path, 1);
-	}
-
-	/**
-	 * URL encodes the given path but keeps the slashes
-	 *
-	 * @param string $path to encode
-	 * @return string encoded path
-	 */
-	protected function encodePath($path) {
-		// slashes need to stay
-		return str_replace('%2F', '/', rawurlencode($path));
-	}
-
-	/**
-	 * @param string $method
-	 * @param string $path
-	 * @param string|resource|null $body
-	 * @param int $expected
-	 * @return bool
-	 * @throws StorageInvalidException
-	 * @throws StorageNotAvailableException
-	 */
-	protected function simpleResponse($method, $path, $body, $expected) {
-		$path = $this->cleanPath($path);
-		try {
-			$response = $this->client->request($method, $this->encodePath($path), $body);
-			return $response['statusCode'] == $expected;
-		} catch (ClientHttpException $e) {
-			if ($e->getHttpStatus() === 404 && $method === 'DELETE') {
-				$this->statCache->clear($path . '/');
-				$this->statCache->set($path, false);
-				return false;
-			}
-
-			$this->convertException($e, $path);
-		} catch (\Exception $e) {
-			$this->convertException($e, $path);
-		}
-		return false;
-	}
-
-	/**
-	 * check if curl is installed
-	 */
-	public static function checkDependencies() {
-		return true;
-	}
-
-	/** {@inheritdoc} */
-	public function isUpdatable($path) {
-		return (bool)($this->getPermissions($path) & Constants::PERMISSION_UPDATE);
-	}
-
-	/** {@inheritdoc} */
-	public function isCreatable($path) {
-		return (bool)($this->getPermissions($path) & Constants::PERMISSION_CREATE);
-	}
-
-	/** {@inheritdoc} */
-	public function isSharable($path) {
-		return (bool)($this->getPermissions($path) & Constants::PERMISSION_SHARE);
-	}
-
-	/** {@inheritdoc} */
-	public function isDeletable($path) {
-		return (bool)($this->getPermissions($path) & Constants::PERMISSION_DELETE);
-	}
-
-	/** {@inheritdoc} */
-	public function getPermissions($path) {
-		$this->init();
-		$path = $this->cleanPath($path);
-		$response = $this->propfind($path);
-		if ($response === false) {
-			return 0;
-		}
-		if (isset($response['{http://owncloud.org/ns}permissions'])) {
-			return $this->parsePermissions($response['{http://owncloud.org/ns}permissions']);
-		} else if ($this->is_dir($path)) {
-			return Constants::PERMISSION_ALL;
-		} else if ($this->file_exists($path)) {
-			return Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE;
-		} else {
-			return 0;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function getETag($path) {
-		$this->init();
-		$path = $this->cleanPath($path);
-		$response = $this->propfind($path);
-		if ($response === false) {
-			return null;
-		}
-		if (isset($response['{DAV:}getetag'])) {
-			return trim($response['{DAV:}getetag'], '"');
-		}
-		return parent::getEtag($path);
-	}
-
-	/**
-	 * @param string $permissionsString
-	 * @return int
-	 */
-	protected function parsePermissions($permissionsString) {
-		$permissions = Constants::PERMISSION_READ;
-		if (strpos($permissionsString, 'R') !== false) {
-			$permissions |= Constants::PERMISSION_SHARE;
-		}
-		if (strpos($permissionsString, 'D') !== false) {
-			$permissions |= Constants::PERMISSION_DELETE;
-		}
-		if (strpos($permissionsString, 'W') !== false) {
-			$permissions |= Constants::PERMISSION_UPDATE;
-		}
-		if (strpos($permissionsString, 'CK') !== false) {
-			$permissions |= Constants::PERMISSION_CREATE;
-			$permissions |= Constants::PERMISSION_UPDATE;
-		}
-		return $permissions;
-	}
-
-	/**
-	 * check if a file or folder has been updated since $time
-	 *
-	 * @param string $path
-	 * @param int $time
-	 * @throws \OCP\Files\StorageNotAvailableException
-	 * @return bool
-	 */
-	public function hasUpdated($path, $time) {
-		$this->init();
-		$path = $this->cleanPath($path);
-		try {
-			// force refresh for $path
-			$this->statCache->remove($path);
-			$response = $this->propfind($path);
-			if ($response === false) {
-				if ($path === '') {
-					// if root is gone it means the storage is not available
-					throw new StorageNotAvailableException('root is gone');
-				}
-				return false;
-			}
-			if (isset($response['{DAV:}getetag'])) {
-				$cachedData = $this->getCache()->get($path);
-				$etag = null;
-				if (isset($response['{DAV:}getetag'])) {
-					$etag = trim($response['{DAV:}getetag'], '"');
-				}
-				if (!empty($etag) && $cachedData['etag'] !== $etag) {
-					return true;
-				} else if (isset($response['{http://open-collaboration-services.org/ns}share-permissions'])) {
-					$sharePermissions = (int)$response['{http://open-collaboration-services.org/ns}share-permissions'];
-					return $sharePermissions !== $cachedData['permissions'];
-				} else if (isset($response['{http://owncloud.org/ns}permissions'])) {
-					$permissions = $this->parsePermissions($response['{http://owncloud.org/ns}permissions']);
-					return $permissions !== $cachedData['permissions'];
-				} else {
-					return false;
-				}
-			} else {
-				$remoteMtime = strtotime($response['{DAV:}getlastmodified']);
-				return $remoteMtime > $time;
-			}
-		} catch (ClientHttpException $e) {
-			if ($e->getHttpStatus() === 405) {
-				if ($path === '') {
-					// if root is gone it means the storage is not available
-					throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
-				}
-				return false;
-			}
-			$this->convertException($e, $path);
-			return false;
-		} catch (\Exception $e) {
-			$this->convertException($e, $path);
-			return false;
-		}
-	}
-
-	/**
-	 * Interpret the given exception and decide whether it is due to an
-	 * unavailable storage, invalid storage or other.
-	 * This will either throw StorageInvalidException, StorageNotAvailableException
-	 * or do nothing.
-	 *
-	 * @param Exception $e sabre exception
-	 * @param string $path optional path from the operation
-	 *
-	 * @throws StorageInvalidException if the storage is invalid, for example
-	 * when the authentication expired or is invalid
-	 * @throws StorageNotAvailableException if the storage is not available,
-	 * which might be temporary
-	 */
-	protected function convertException(Exception $e, $path = '') {
-		\OC::$server->getLogger()->logException($e, ['app' => 'files_external']);
-		if ($e instanceof ClientHttpException) {
-			if ($e->getHttpStatus() === Http::STATUS_LOCKED) {
-				throw new \OCP\Lock\LockedException($path);
-			}
-			if ($e->getHttpStatus() === Http::STATUS_UNAUTHORIZED) {
-				// either password was changed or was invalid all along
-				throw new StorageInvalidException(get_class($e) . ': ' . $e->getMessage());
-			} else if ($e->getHttpStatus() === Http::STATUS_METHOD_NOT_ALLOWED) {
-				// ignore exception for MethodNotAllowed, false will be returned
-				return;
-			}
-			throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
-		} else if ($e instanceof ClientException) {
-			// connection timeout or refused, server could be temporarily down
-			throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
-		} else if ($e instanceof \InvalidArgumentException) {
-			// parse error because the server returned HTML instead of XML,
-			// possibly temporarily down
-			throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
-		} else if (($e instanceof StorageNotAvailableException) || ($e instanceof StorageInvalidException)) {
-			// rethrow
-			throw $e;
-		}
-
-		// TODO: only log for now, but in the future need to wrap/rethrow exception
-	}
+    /** @var string */
+    protected $password;
+    /** @var string */
+    protected $user;
+    /** @var string */
+    protected $authType;
+    /** @var string */
+    protected $host;
+    /** @var bool */
+    protected $secure;
+    /** @var string */
+    protected $root;
+    /** @var string */
+    protected $certPath;
+    /** @var bool */
+    protected $ready;
+    /** @var Client */
+    protected $client;
+    /** @var ArrayCache */
+    protected $statCache;
+    /** @var \OCP\Http\Client\IClientService */
+    protected $httpClientService;
+
+    /**
+     * @param array $params
+     * @throws \Exception
+     */
+    public function __construct($params) {
+        $this->statCache = new ArrayCache();
+        $this->httpClientService = \OC::$server->getHTTPClientService();
+        if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
+            $host = $params['host'];
+            //remove leading http[s], will be generated in createBaseUri()
+            if (substr($host, 0, 8) == "https://") $host = substr($host, 8);
+            else if (substr($host, 0, 7) == "http://") $host = substr($host, 7);
+            $this->host = $host;
+            $this->user = $params['user'];
+            $this->password = $params['password'];
+            if (isset($params['authType'])) {
+                $this->authType = $params['authType'];
+            }
+            if (isset($params['secure'])) {
+                if (is_string($params['secure'])) {
+                    $this->secure = ($params['secure'] === 'true');
+                } else {
+                    $this->secure = (bool)$params['secure'];
+                }
+            } else {
+                $this->secure = false;
+            }
+            if ($this->secure === true) {
+                // inject mock for testing
+                $certManager = \OC::$server->getCertificateManager();
+                if (is_null($certManager)) { //no user
+                    $certManager = \OC::$server->getCertificateManager(null);
+                }
+                $certPath = $certManager->getAbsoluteBundlePath();
+                if (file_exists($certPath)) {
+                    $this->certPath = $certPath;
+                }
+            }
+            $this->root = $params['root'] ?? '/';
+            $this->root = '/' . ltrim($this->root, '/');
+            $this->root = rtrim($this->root, '/') . '/';
+        } else {
+            throw new \Exception('Invalid webdav storage configuration');
+        }
+    }
+
+    protected function init() {
+        if ($this->ready) {
+            return;
+        }
+        $this->ready = true;
+
+        $settings = [
+            'baseUri' => $this->createBaseUri(),
+            'userName' => $this->user,
+            'password' => $this->password,
+        ];
+        if (isset($this->authType)) {
+            $settings['authType'] = $this->authType;
+        }
+
+        $proxy = \OC::$server->getConfig()->getSystemValue('proxy', '');
+        if ($proxy !== '') {
+            $settings['proxy'] = $proxy;
+        }
+
+        $this->client = new Client($settings);
+        $this->client->setThrowExceptions(true);
+        if ($this->secure === true && $this->certPath) {
+            $this->client->addCurlSetting(CURLOPT_CAINFO, $this->certPath);
+        }
+    }
+
+    /**
+     * Clear the stat cache
+     */
+    public function clearStatCache() {
+        $this->statCache->clear();
+    }
+
+    /** {@inheritdoc} */
+    public function getId() {
+        return 'webdav::' . $this->user . '@' . $this->host . '/' . $this->root;
+    }
+
+    /** {@inheritdoc} */
+    public function createBaseUri() {
+        $baseUri = 'http';
+        if ($this->secure) {
+            $baseUri .= 's';
+        }
+        $baseUri .= '://' . $this->host . $this->root;
+        return $baseUri;
+    }
+
+    /** {@inheritdoc} */
+    public function mkdir($path) {
+        $this->init();
+        $path = $this->cleanPath($path);
+        $result = $this->simpleResponse('MKCOL', $path, null, 201);
+        if ($result) {
+            $this->statCache->set($path, true);
+        }
+        return $result;
+    }
+
+    /** {@inheritdoc} */
+    public function rmdir($path) {
+        $this->init();
+        $path = $this->cleanPath($path);
+        // FIXME: some WebDAV impl return 403 when trying to DELETE
+        // a non-empty folder
+        $result = $this->simpleResponse('DELETE', $path . '/', null, 204);
+        $this->statCache->clear($path . '/');
+        $this->statCache->remove($path);
+        return $result;
+    }
+
+    /** {@inheritdoc} */
+    public function opendir($path) {
+        $this->init();
+        $path = $this->cleanPath($path);
+        try {
+            $response = $this->client->propFind(
+                $this->encodePath($path),
+                ['{DAV:}href'],
+                1
+            );
+            if ($response === false) {
+                return false;
+            }
+            $content = [];
+            $files = array_keys($response);
+            array_shift($files); //the first entry is the current directory
+
+            if (!$this->statCache->hasKey($path)) {
+                $this->statCache->set($path, true);
+            }
+            foreach ($files as $file) {
+                $file = urldecode($file);
+                // do not store the real entry, we might not have all properties
+                if (!$this->statCache->hasKey($path)) {
+                    $this->statCache->set($file, true);
+                }
+                $file = basename($file);
+                $content[] = $file;
+            }
+            return IteratorDirectory::wrap($content);
+        } catch (\Exception $e) {
+            $this->convertException($e, $path);
+        }
+        return false;
+    }
+
+    /**
+     * Propfind call with cache handling.
+     *
+     * First checks if information is cached.
+     * If not, request it from the server then store to cache.
+     *
+     * @param string $path path to propfind
+     *
+     * @return array|boolean propfind response or false if the entry was not found
+     *
+     * @throws ClientHttpException
+     */
+    protected function propfind($path) {
+        $path = $this->cleanPath($path);
+        $cachedResponse = $this->statCache->get($path);
+        // we either don't know it, or we know it exists but need more details
+        if (is_null($cachedResponse) || $cachedResponse === true) {
+            $this->init();
+            try {
+                $response = $this->client->propFind(
+                    $this->encodePath($path),
+                    array(
+                        '{DAV:}getlastmodified',
+                        '{DAV:}getcontentlength',
+                        '{DAV:}getcontenttype',
+                        '{http://owncloud.org/ns}permissions',
+                        '{http://open-collaboration-services.org/ns}share-permissions',
+                        '{DAV:}resourcetype',
+                        '{DAV:}getetag',
+                    )
+                );
+                $this->statCache->set($path, $response);
+            } catch (ClientHttpException $e) {
+                if ($e->getHttpStatus() === 404) {
+                    $this->statCache->clear($path . '/');
+                    $this->statCache->set($path, false);
+                    return false;
+                }
+                $this->convertException($e, $path);
+            } catch (\Exception $e) {
+                $this->convertException($e, $path);
+            }
+        } else {
+            $response = $cachedResponse;
+        }
+        return $response;
+    }
+
+    /** {@inheritdoc} */
+    public function filetype($path) {
+        try {
+            $response = $this->propfind($path);
+            if ($response === false) {
+                return false;
+            }
+            $responseType = [];
+            if (isset($response["{DAV:}resourcetype"])) {
+                /** @var ResourceType[] $response */
+                $responseType = $response["{DAV:}resourcetype"]->getValue();
+            }
+            return (count($responseType) > 0 and $responseType[0] == "{DAV:}collection") ? 'dir' : 'file';
+        } catch (\Exception $e) {
+            $this->convertException($e, $path);
+        }
+        return false;
+    }
+
+    /** {@inheritdoc} */
+    public function file_exists($path) {
+        try {
+            $path = $this->cleanPath($path);
+            $cachedState = $this->statCache->get($path);
+            if ($cachedState === false) {
+                // we know the file doesn't exist
+                return false;
+            } else if (!is_null($cachedState)) {
+                return true;
+            }
+            // need to get from server
+            return ($this->propfind($path) !== false);
+        } catch (\Exception $e) {
+            $this->convertException($e, $path);
+        }
+        return false;
+    }
+
+    /** {@inheritdoc} */
+    public function unlink($path) {
+        $this->init();
+        $path = $this->cleanPath($path);
+        $result = $this->simpleResponse('DELETE', $path, null, 204);
+        $this->statCache->clear($path . '/');
+        $this->statCache->remove($path);
+        return $result;
+    }
+
+    /** {@inheritdoc} */
+    public function fopen($path, $mode) {
+        $this->init();
+        $path = $this->cleanPath($path);
+        switch ($mode) {
+            case 'r':
+            case 'rb':
+                try {
+                    $response = $this->httpClientService
+                        ->newClient()
+                        ->get($this->createBaseUri() . $this->encodePath($path), [
+                            'auth' => [$this->user, $this->password],
+                            'stream' => true
+                        ]);
+                } catch (\GuzzleHttp\Exception\ClientException $e) {
+                    if ($e->getResponse() instanceof ResponseInterface
+                        && $e->getResponse()->getStatusCode() === 404) {
+                        return false;
+                    } else {
+                        throw $e;
+                    }
+                }
+
+                if ($response->getStatusCode() !== Http::STATUS_OK) {
+                    if ($response->getStatusCode() === Http::STATUS_LOCKED) {
+                        throw new \OCP\Lock\LockedException($path);
+                    } else {
+                        Util::writeLog("webdav client", 'Guzzle get returned status code ' . $response->getStatusCode(), ILogger::ERROR);
+                    }
+                }
+
+                return $response->getBody();
+            case 'w':
+            case 'wb':
+            case 'a':
+            case 'ab':
+            case 'r+':
+            case 'w+':
+            case 'wb+':
+            case 'a+':
+            case 'x':
+            case 'x+':
+            case 'c':
+            case 'c+':
+                //emulate these
+                $tempManager = \OC::$server->getTempManager();
+                if (strrpos($path, '.') !== false) {
+                    $ext = substr($path, strrpos($path, '.'));
+                } else {
+                    $ext = '';
+                }
+                if ($this->file_exists($path)) {
+                    if (!$this->isUpdatable($path)) {
+                        return false;
+                    }
+                    if ($mode === 'w' or $mode === 'w+') {
+                        $tmpFile = $tempManager->getTemporaryFile($ext);
+                    } else {
+                        $tmpFile = $this->getCachedFile($path);
+                    }
+                } else {
+                    if (!$this->isCreatable(dirname($path))) {
+                        return false;
+                    }
+                    $tmpFile = $tempManager->getTemporaryFile($ext);
+                }
+                $handle = fopen($tmpFile, $mode);
+                return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+                    $this->writeBack($tmpFile, $path);
+                });
+        }
+    }
+
+    /**
+     * @param string $tmpFile
+     */
+    public function writeBack($tmpFile, $path) {
+        $this->uploadFile($tmpFile, $path);
+        unlink($tmpFile);
+    }
+
+    /** {@inheritdoc} */
+    public function free_space($path) {
+        $this->init();
+        $path = $this->cleanPath($path);
+        try {
+            // TODO: cacheable ?
+            $response = $this->client->propfind($this->encodePath($path), ['{DAV:}quota-available-bytes']);
+            if ($response === false) {
+                return FileInfo::SPACE_UNKNOWN;
+            }
+            if (isset($response['{DAV:}quota-available-bytes'])) {
+                return (int)$response['{DAV:}quota-available-bytes'];
+            } else {
+                return FileInfo::SPACE_UNKNOWN;
+            }
+        } catch (\Exception $e) {
+            return FileInfo::SPACE_UNKNOWN;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function touch($path, $mtime = null) {
+        $this->init();
+        if (is_null($mtime)) {
+            $mtime = time();
+        }
+        $path = $this->cleanPath($path);
+
+        // if file exists, update the mtime, else create a new empty file
+        if ($this->file_exists($path)) {
+            try {
+                $this->statCache->remove($path);
+                $this->client->proppatch($this->encodePath($path), ['{DAV:}lastmodified' => $mtime]);
+                // non-owncloud clients might not have accepted the property, need to recheck it
+                $response = $this->client->propfind($this->encodePath($path), ['{DAV:}getlastmodified'], 0);
+                if ($response === false) {
+                    return false;
+                }
+                if (isset($response['{DAV:}getlastmodified'])) {
+                    $remoteMtime = strtotime($response['{DAV:}getlastmodified']);
+                    if ($remoteMtime !== $mtime) {
+                        // server has not accepted the mtime
+                        return false;
+                    }
+                }
+            } catch (ClientHttpException $e) {
+                if ($e->getHttpStatus() === 501) {
+                    return false;
+                }
+                $this->convertException($e, $path);
+                return false;
+            } catch (\Exception $e) {
+                $this->convertException($e, $path);
+                return false;
+            }
+        } else {
+            $this->file_put_contents($path, '');
+        }
+        return true;
+    }
+
+    /**
+     * @param string $path
+     * @param string $data
+     * @return int
+     */
+    public function file_put_contents($path, $data) {
+        $path = $this->cleanPath($path);
+        $result = parent::file_put_contents($path, $data);
+        $this->statCache->remove($path);
+        return $result;
+    }
+
+    /**
+     * @param string $path
+     * @param string $target
+     */
+    protected function uploadFile($path, $target) {
+        $this->init();
+
+        // invalidate
+        $target = $this->cleanPath($target);
+        $this->statCache->remove($target);
+        $source = fopen($path, 'r');
+
+        $this->httpClientService
+            ->newClient()
+            ->put($this->createBaseUri() . $this->encodePath($target), [
+                'body' => $source,
+                'auth' => [$this->user, $this->password]
+            ]);
+
+        $this->removeCachedFile($target);
+    }
+
+    /** {@inheritdoc} */
+    public function rename($path1, $path2) {
+        $this->init();
+        $path1 = $this->cleanPath($path1);
+        $path2 = $this->cleanPath($path2);
+        try {
+            // overwrite directory ?
+            if ($this->is_dir($path2)) {
+                // needs trailing slash in destination
+                $path2 = rtrim($path2, '/') . '/';
+            }
+            $this->client->request(
+                'MOVE',
+                $this->encodePath($path1),
+                null,
+                [
+                    'Destination' => $this->createBaseUri() . $this->encodePath($path2),
+                ]
+            );
+            $this->statCache->clear($path1 . '/');
+            $this->statCache->clear($path2 . '/');
+            $this->statCache->set($path1, false);
+            $this->statCache->set($path2, true);
+            $this->removeCachedFile($path1);
+            $this->removeCachedFile($path2);
+            return true;
+        } catch (\Exception $e) {
+            $this->convertException($e);
+        }
+        return false;
+    }
+
+    /** {@inheritdoc} */
+    public function copy($path1, $path2) {
+        $this->init();
+        $path1 = $this->cleanPath($path1);
+        $path2 = $this->cleanPath($path2);
+        try {
+            // overwrite directory ?
+            if ($this->is_dir($path2)) {
+                // needs trailing slash in destination
+                $path2 = rtrim($path2, '/') . '/';
+            }
+            $this->client->request(
+                'COPY',
+                $this->encodePath($path1),
+                null,
+                [
+                    'Destination' => $this->createBaseUri() . $this->encodePath($path2),
+                ]
+            );
+            $this->statCache->clear($path2 . '/');
+            $this->statCache->set($path2, true);
+            $this->removeCachedFile($path2);
+            return true;
+        } catch (\Exception $e) {
+            $this->convertException($e);
+        }
+        return false;
+    }
+
+    /** {@inheritdoc} */
+    public function stat($path) {
+        try {
+            $response = $this->propfind($path);
+            if (!$response) {
+                return false;
+            }
+            return [
+                'mtime' => strtotime($response['{DAV:}getlastmodified']),
+                'size' => (int)isset($response['{DAV:}getcontentlength']) ? $response['{DAV:}getcontentlength'] : 0,
+            ];
+        } catch (\Exception $e) {
+            $this->convertException($e, $path);
+        }
+        return array();
+    }
+
+    /** {@inheritdoc} */
+    public function getMimeType($path) {
+        $remoteMimetype = $this->getMimeTypeFromRemote($path);
+        if ($remoteMimetype === 'application/octet-stream') {
+            return \OC::$server->getMimeTypeDetector()->detectPath($path);
+        } else {
+            return $remoteMimetype;
+        }
+    }
+
+    public function getMimeTypeFromRemote($path) {
+        try {
+            $response = $this->propfind($path);
+            if ($response === false) {
+                return false;
+            }
+            $responseType = [];
+            if (isset($response["{DAV:}resourcetype"])) {
+                /** @var ResourceType[] $response */
+                $responseType = $response["{DAV:}resourcetype"]->getValue();
+            }
+            $type = (count($responseType) > 0 and $responseType[0] == "{DAV:}collection") ? 'dir' : 'file';
+            if ($type == 'dir') {
+                return 'httpd/unix-directory';
+            } elseif (isset($response['{DAV:}getcontenttype'])) {
+                return $response['{DAV:}getcontenttype'];
+            } else {
+                return 'application/octet-stream';
+            }
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    public function cleanPath($path) {
+        if ($path === '') {
+            return $path;
+        }
+        $path = Filesystem::normalizePath($path);
+        // remove leading slash
+        return substr($path, 1);
+    }
+
+    /**
+     * URL encodes the given path but keeps the slashes
+     *
+     * @param string $path to encode
+     * @return string encoded path
+     */
+    protected function encodePath($path) {
+        // slashes need to stay
+        return str_replace('%2F', '/', rawurlencode($path));
+    }
+
+    /**
+     * @param string $method
+     * @param string $path
+     * @param string|resource|null $body
+     * @param int $expected
+     * @return bool
+     * @throws StorageInvalidException
+     * @throws StorageNotAvailableException
+     */
+    protected function simpleResponse($method, $path, $body, $expected) {
+        $path = $this->cleanPath($path);
+        try {
+            $response = $this->client->request($method, $this->encodePath($path), $body);
+            return $response['statusCode'] == $expected;
+        } catch (ClientHttpException $e) {
+            if ($e->getHttpStatus() === 404 && $method === 'DELETE') {
+                $this->statCache->clear($path . '/');
+                $this->statCache->set($path, false);
+                return false;
+            }
+
+            $this->convertException($e, $path);
+        } catch (\Exception $e) {
+            $this->convertException($e, $path);
+        }
+        return false;
+    }
+
+    /**
+     * check if curl is installed
+     */
+    public static function checkDependencies() {
+        return true;
+    }
+
+    /** {@inheritdoc} */
+    public function isUpdatable($path) {
+        return (bool)($this->getPermissions($path) & Constants::PERMISSION_UPDATE);
+    }
+
+    /** {@inheritdoc} */
+    public function isCreatable($path) {
+        return (bool)($this->getPermissions($path) & Constants::PERMISSION_CREATE);
+    }
+
+    /** {@inheritdoc} */
+    public function isSharable($path) {
+        return (bool)($this->getPermissions($path) & Constants::PERMISSION_SHARE);
+    }
+
+    /** {@inheritdoc} */
+    public function isDeletable($path) {
+        return (bool)($this->getPermissions($path) & Constants::PERMISSION_DELETE);
+    }
+
+    /** {@inheritdoc} */
+    public function getPermissions($path) {
+        $this->init();
+        $path = $this->cleanPath($path);
+        $response = $this->propfind($path);
+        if ($response === false) {
+            return 0;
+        }
+        if (isset($response['{http://owncloud.org/ns}permissions'])) {
+            return $this->parsePermissions($response['{http://owncloud.org/ns}permissions']);
+        } else if ($this->is_dir($path)) {
+            return Constants::PERMISSION_ALL;
+        } else if ($this->file_exists($path)) {
+            return Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE;
+        } else {
+            return 0;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function getETag($path) {
+        $this->init();
+        $path = $this->cleanPath($path);
+        $response = $this->propfind($path);
+        if ($response === false) {
+            return null;
+        }
+        if (isset($response['{DAV:}getetag'])) {
+            return trim($response['{DAV:}getetag'], '"');
+        }
+        return parent::getEtag($path);
+    }
+
+    /**
+     * @param string $permissionsString
+     * @return int
+     */
+    protected function parsePermissions($permissionsString) {
+        $permissions = Constants::PERMISSION_READ;
+        if (strpos($permissionsString, 'R') !== false) {
+            $permissions |= Constants::PERMISSION_SHARE;
+        }
+        if (strpos($permissionsString, 'D') !== false) {
+            $permissions |= Constants::PERMISSION_DELETE;
+        }
+        if (strpos($permissionsString, 'W') !== false) {
+            $permissions |= Constants::PERMISSION_UPDATE;
+        }
+        if (strpos($permissionsString, 'CK') !== false) {
+            $permissions |= Constants::PERMISSION_CREATE;
+            $permissions |= Constants::PERMISSION_UPDATE;
+        }
+        return $permissions;
+    }
+
+    /**
+     * check if a file or folder has been updated since $time
+     *
+     * @param string $path
+     * @param int $time
+     * @throws \OCP\Files\StorageNotAvailableException
+     * @return bool
+     */
+    public function hasUpdated($path, $time) {
+        $this->init();
+        $path = $this->cleanPath($path);
+        try {
+            // force refresh for $path
+            $this->statCache->remove($path);
+            $response = $this->propfind($path);
+            if ($response === false) {
+                if ($path === '') {
+                    // if root is gone it means the storage is not available
+                    throw new StorageNotAvailableException('root is gone');
+                }
+                return false;
+            }
+            if (isset($response['{DAV:}getetag'])) {
+                $cachedData = $this->getCache()->get($path);
+                $etag = null;
+                if (isset($response['{DAV:}getetag'])) {
+                    $etag = trim($response['{DAV:}getetag'], '"');
+                }
+                if (!empty($etag) && $cachedData['etag'] !== $etag) {
+                    return true;
+                } else if (isset($response['{http://open-collaboration-services.org/ns}share-permissions'])) {
+                    $sharePermissions = (int)$response['{http://open-collaboration-services.org/ns}share-permissions'];
+                    return $sharePermissions !== $cachedData['permissions'];
+                } else if (isset($response['{http://owncloud.org/ns}permissions'])) {
+                    $permissions = $this->parsePermissions($response['{http://owncloud.org/ns}permissions']);
+                    return $permissions !== $cachedData['permissions'];
+                } else {
+                    return false;
+                }
+            } else {
+                $remoteMtime = strtotime($response['{DAV:}getlastmodified']);
+                return $remoteMtime > $time;
+            }
+        } catch (ClientHttpException $e) {
+            if ($e->getHttpStatus() === 405) {
+                if ($path === '') {
+                    // if root is gone it means the storage is not available
+                    throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
+                }
+                return false;
+            }
+            $this->convertException($e, $path);
+            return false;
+        } catch (\Exception $e) {
+            $this->convertException($e, $path);
+            return false;
+        }
+    }
+
+    /**
+     * Interpret the given exception and decide whether it is due to an
+     * unavailable storage, invalid storage or other.
+     * This will either throw StorageInvalidException, StorageNotAvailableException
+     * or do nothing.
+     *
+     * @param Exception $e sabre exception
+     * @param string $path optional path from the operation
+     *
+     * @throws StorageInvalidException if the storage is invalid, for example
+     * when the authentication expired or is invalid
+     * @throws StorageNotAvailableException if the storage is not available,
+     * which might be temporary
+     */
+    protected function convertException(Exception $e, $path = '') {
+        \OC::$server->getLogger()->logException($e, ['app' => 'files_external']);
+        if ($e instanceof ClientHttpException) {
+            if ($e->getHttpStatus() === Http::STATUS_LOCKED) {
+                throw new \OCP\Lock\LockedException($path);
+            }
+            if ($e->getHttpStatus() === Http::STATUS_UNAUTHORIZED) {
+                // either password was changed or was invalid all along
+                throw new StorageInvalidException(get_class($e) . ': ' . $e->getMessage());
+            } else if ($e->getHttpStatus() === Http::STATUS_METHOD_NOT_ALLOWED) {
+                // ignore exception for MethodNotAllowed, false will be returned
+                return;
+            }
+            throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
+        } else if ($e instanceof ClientException) {
+            // connection timeout or refused, server could be temporarily down
+            throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
+        } else if ($e instanceof \InvalidArgumentException) {
+            // parse error because the server returned HTML instead of XML,
+            // possibly temporarily down
+            throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
+        } else if (($e instanceof StorageNotAvailableException) || ($e instanceof StorageInvalidException)) {
+            // rethrow
+            throw $e;
+        }
+
+        // TODO: only log for now, but in the future need to wrap/rethrow exception
+    }
 }
 

Spacing +33 added lines, -33 removed lines

@@ -103,7 +103,7 @@ 
 				if (is_string($params['secure'])) {
 					$this->secure = ($params['secure'] === 'true');
 				} else {
-					$this->secure = (bool)$params['secure'];
+					$this->secure = (bool) $params['secure'];
 				}
 			} else {
 				$this->secure = false;
@@ -120,8 +120,8 @@ 
 				}
 			}
 			$this->root = $params['root'] ?? '/';
-			$this->root = '/' . ltrim($this->root, '/');
-			$this->root = rtrim($this->root, '/') . '/';
+			$this->root = '/'.ltrim($this->root, '/');
+			$this->root = rtrim($this->root, '/').'/';
 		} else {
 			throw new \Exception('Invalid webdav storage configuration');
 		}
@@ -163,7 +163,7 @@ 
 
 	/** {@inheritdoc} */
 	public function getId() {
-		return 'webdav::' . $this->user . '@' . $this->host . '/' . $this->root;
+		return 'webdav::'.$this->user.'@'.$this->host.'/'.$this->root;
 	}
 
 	/** {@inheritdoc} */
@@ -172,7 +172,7 @@ 
 		if ($this->secure) {
 			$baseUri .= 's';
 		}
-		$baseUri .= '://' . $this->host . $this->root;
+		$baseUri .= '://'.$this->host.$this->root;
 		return $baseUri;
 	}
 
@@ -193,8 +193,8 @@ 
 		$path = $this->cleanPath($path);
 		// FIXME: some WebDAV impl return 403 when trying to DELETE
 		// a non-empty folder
-		$result = $this->simpleResponse('DELETE', $path . '/', null, 204);
-		$this->statCache->clear($path . '/');
+		$result = $this->simpleResponse('DELETE', $path.'/', null, 204);
+		$this->statCache->clear($path.'/');
 		$this->statCache->remove($path);
 		return $result;
 	}
@@ -269,7 +269,7 @@ 
 				$this->statCache->set($path, $response);
 			} catch (ClientHttpException $e) {
 				if ($e->getHttpStatus() === 404) {
-					$this->statCache->clear($path . '/');
+					$this->statCache->clear($path.'/');
 					$this->statCache->set($path, false);
 					return false;
 				}
@@ -326,7 +326,7 @@ 
 		$this->init();
 		$path = $this->cleanPath($path);
 		$result = $this->simpleResponse('DELETE', $path, null, 204);
-		$this->statCache->clear($path . '/');
+		$this->statCache->clear($path.'/');
 		$this->statCache->remove($path);
 		return $result;
 	}
@@ -341,7 +341,7 @@ 
 				try {
 					$response = $this->httpClientService
 						->newClient()
-						->get($this->createBaseUri() . $this->encodePath($path), [
+						->get($this->createBaseUri().$this->encodePath($path), [
 							'auth' => [$this->user, $this->password],
 							'stream' => true
 						]);
@@ -358,7 +358,7 @@ 
 					if ($response->getStatusCode() === Http::STATUS_LOCKED) {
 						throw new \OCP\Lock\LockedException($path);
 					} else {
-						Util::writeLog("webdav client", 'Guzzle get returned status code ' . $response->getStatusCode(), ILogger::ERROR);
+						Util::writeLog("webdav client", 'Guzzle get returned status code '.$response->getStatusCode(), ILogger::ERROR);
 					}
 				}
 
@@ -398,7 +398,7 @@ 
 					$tmpFile = $tempManager->getTemporaryFile($ext);
 				}
 				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+				return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
 					$this->writeBack($tmpFile, $path);
 				});
 		}
@@ -423,7 +423,7 @@ 
 				return FileInfo::SPACE_UNKNOWN;
 			}
 			if (isset($response['{DAV:}quota-available-bytes'])) {
-				return (int)$response['{DAV:}quota-available-bytes'];
+				return (int) $response['{DAV:}quota-available-bytes'];
 			} else {
 				return FileInfo::SPACE_UNKNOWN;
 			}
@@ -499,7 +499,7 @@ 
 
 		$this->httpClientService
 			->newClient()
-			->put($this->createBaseUri() . $this->encodePath($target), [
+			->put($this->createBaseUri().$this->encodePath($target), [
 				'body' => $source,
 				'auth' => [$this->user, $this->password]
 			]);
@@ -516,18 +516,18 @@ 
 			// overwrite directory ?
 			if ($this->is_dir($path2)) {
 				// needs trailing slash in destination
-				$path2 = rtrim($path2, '/') . '/';
+				$path2 = rtrim($path2, '/').'/';
 			}
 			$this->client->request(
 				'MOVE',
 				$this->encodePath($path1),
 				null,
 				[
-					'Destination' => $this->createBaseUri() . $this->encodePath($path2),
+					'Destination' => $this->createBaseUri().$this->encodePath($path2),
 				]
 			);
-			$this->statCache->clear($path1 . '/');
-			$this->statCache->clear($path2 . '/');
+			$this->statCache->clear($path1.'/');
+			$this->statCache->clear($path2.'/');
 			$this->statCache->set($path1, false);
 			$this->statCache->set($path2, true);
 			$this->removeCachedFile($path1);
@@ -548,17 +548,17 @@ 
 			// overwrite directory ?
 			if ($this->is_dir($path2)) {
 				// needs trailing slash in destination
-				$path2 = rtrim($path2, '/') . '/';
+				$path2 = rtrim($path2, '/').'/';
 			}
 			$this->client->request(
 				'COPY',
 				$this->encodePath($path1),
 				null,
 				[
-					'Destination' => $this->createBaseUri() . $this->encodePath($path2),
+					'Destination' => $this->createBaseUri().$this->encodePath($path2),
 				]
 			);
-			$this->statCache->clear($path2 . '/');
+			$this->statCache->clear($path2.'/');
 			$this->statCache->set($path2, true);
 			$this->removeCachedFile($path2);
 			return true;
@@ -577,7 +577,7 @@ 
 			}
 			return [
 				'mtime' => strtotime($response['{DAV:}getlastmodified']),
-				'size' => (int)isset($response['{DAV:}getcontentlength']) ? $response['{DAV:}getcontentlength'] : 0,
+				'size' => (int) isset($response['{DAV:}getcontentlength']) ? $response['{DAV:}getcontentlength'] : 0,
 			];
 		} catch (\Exception $e) {
 			$this->convertException($e, $path);
@@ -659,7 +659,7 @@ 
 			return $response['statusCode'] == $expected;
 		} catch (ClientHttpException $e) {
 			if ($e->getHttpStatus() === 404 && $method === 'DELETE') {
-				$this->statCache->clear($path . '/');
+				$this->statCache->clear($path.'/');
 				$this->statCache->set($path, false);
 				return false;
 			}
@@ -680,22 +680,22 @@ 
 
 	/** {@inheritdoc} */
 	public function isUpdatable($path) {
-		return (bool)($this->getPermissions($path) & Constants::PERMISSION_UPDATE);
+		return (bool) ($this->getPermissions($path) & Constants::PERMISSION_UPDATE);
 	}
 
 	/** {@inheritdoc} */
 	public function isCreatable($path) {
-		return (bool)($this->getPermissions($path) & Constants::PERMISSION_CREATE);
+		return (bool) ($this->getPermissions($path) & Constants::PERMISSION_CREATE);
 	}
 
 	/** {@inheritdoc} */
 	public function isSharable($path) {
-		return (bool)($this->getPermissions($path) & Constants::PERMISSION_SHARE);
+		return (bool) ($this->getPermissions($path) & Constants::PERMISSION_SHARE);
 	}
 
 	/** {@inheritdoc} */
 	public function isDeletable($path) {
-		return (bool)($this->getPermissions($path) & Constants::PERMISSION_DELETE);
+		return (bool) ($this->getPermissions($path) & Constants::PERMISSION_DELETE);
 	}
 
 	/** {@inheritdoc} */
@@ -784,7 +784,7 @@ 
 				if (!empty($etag) && $cachedData['etag'] !== $etag) {
 					return true;
 				} else if (isset($response['{http://open-collaboration-services.org/ns}share-permissions'])) {
-					$sharePermissions = (int)$response['{http://open-collaboration-services.org/ns}share-permissions'];
+					$sharePermissions = (int) $response['{http://open-collaboration-services.org/ns}share-permissions'];
 					return $sharePermissions !== $cachedData['permissions'];
 				} else if (isset($response['{http://owncloud.org/ns}permissions'])) {
 					$permissions = $this->parsePermissions($response['{http://owncloud.org/ns}permissions']);
@@ -800,7 +800,7 @@ 
 			if ($e->getHttpStatus() === 405) {
 				if ($path === '') {
 					// if root is gone it means the storage is not available
-					throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
+					throw new StorageNotAvailableException(get_class($e).': '.$e->getMessage());
 				}
 				return false;
 			}
@@ -834,19 +834,19 @@ 
 			}
 			if ($e->getHttpStatus() === Http::STATUS_UNAUTHORIZED) {
 				// either password was changed or was invalid all along
-				throw new StorageInvalidException(get_class($e) . ': ' . $e->getMessage());
+				throw new StorageInvalidException(get_class($e).': '.$e->getMessage());
 			} else if ($e->getHttpStatus() === Http::STATUS_METHOD_NOT_ALLOWED) {
 				// ignore exception for MethodNotAllowed, false will be returned
 				return;
 			}
-			throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
+			throw new StorageNotAvailableException(get_class($e).': '.$e->getMessage());
 		} else if ($e instanceof ClientException) {
 			// connection timeout or refused, server could be temporarily down
-			throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
+			throw new StorageNotAvailableException(get_class($e).': '.$e->getMessage());
 		} else if ($e instanceof \InvalidArgumentException) {
 			// parse error because the server returned HTML instead of XML,
 			// possibly temporarily down
-			throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
+			throw new StorageNotAvailableException(get_class($e).': '.$e->getMessage());
 		} else if (($e instanceof StorageNotAvailableException) || ($e instanceof StorageInvalidException)) {
 			// rethrow
 			throw $e;

lib/private/Settings/Manager.php

Unused Use Statements -1 removed lines

@@ -46,7 +46,6 @@
 use OCP\Settings\ISettings;
 use OCP\Settings\IManager;
 use OCP\Settings\ISection;
-use OCP\Util;
 
 class Manager implements IManager {
 	/** @var ILogger */

Indentation +352 added lines, -352 removed lines

@@ -49,356 +49,356 @@
 use OCP\Util;
 
 class Manager implements IManager {
-	/** @var ILogger */
-	private $log;
-	/** @var IDBConnection */
-	private $dbc;
-	/** @var IL10N */
-	private $l;
-	/** @var IConfig */
-	private $config;
-	/** @var EncryptionManager */
-	private $encryptionManager;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var ILockingProvider */
-	private $lockingProvider;
-	/** @var IRequest */
-	private $request;
-	/** @var IURLGenerator */
-	private $url;
-	/** @var AccountManager */
-	private $accountManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IFactory */
-	private $l10nFactory;
-	/** @var IAppManager */
-	private $appManager;
-
-	/**
-	 * @param ILogger $log
-	 * @param IDBConnection $dbc
-	 * @param IL10N $l
-	 * @param IConfig $config
-	 * @param EncryptionManager $encryptionManager
-	 * @param IUserManager $userManager
-	 * @param ILockingProvider $lockingProvider
-	 * @param IRequest $request
-	 * @param IURLGenerator $url
-	 * @param AccountManager $accountManager
-	 * @param IGroupManager $groupManager
-	 * @param IFactory $l10nFactory
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(
-		ILogger $log,
-		IDBConnection $dbc,
-		IL10N $l,
-		IConfig $config,
-		EncryptionManager $encryptionManager,
-		IUserManager $userManager,
-		ILockingProvider $lockingProvider,
-		IRequest $request,
-		IURLGenerator $url,
-		AccountManager $accountManager,
-		IGroupManager $groupManager,
-		IFactory $l10nFactory,
-		IAppManager $appManager
-	) {
-		$this->log = $log;
-		$this->dbc = $dbc;
-		$this->l = $l;
-		$this->config = $config;
-		$this->encryptionManager = $encryptionManager;
-		$this->userManager = $userManager;
-		$this->lockingProvider = $lockingProvider;
-		$this->request = $request;
-		$this->url = $url;
-		$this->accountManager = $accountManager;
-		$this->groupManager = $groupManager;
-		$this->l10nFactory = $l10nFactory;
-		$this->appManager = $appManager;
-	}
-
-	/** @var array */
-	protected $sectionClasses = [];
-
-	/** @var array */
-	protected $sections = [];
-
-	/**
-	 * @param string $type 'admin' or 'personal'
-	 * @param string $section Class must implement OCP\Settings\ISection
-	 * @return void
-	 */
-	public function registerSection(string $type, string $section) {
-		$this->sectionClasses[$section] = $type;
-	}
-
-	/**
-	 * @param string $type 'admin' or 'personal'
-	 * @return ISection[]
-	 */
-	protected function getSections(string $type): array {
-		if (!isset($this->sections[$type])) {
-			$this->sections[$type] = [];
-		}
-
-		foreach ($this->sectionClasses as $class => $sectionType) {
-			try {
-				/** @var ISection $section */
-				$section = \OC::$server->query($class);
-			} catch (QueryException $e) {
-				$this->log->logException($e, ['level' => ILogger::INFO]);
-				continue;
-			}
-
-			if (!$section instanceof ISection) {
-				$this->log->logException(new \InvalidArgumentException('Invalid settings section registered'), ['level' => ILogger::INFO]);
-				continue;
-			}
-
-			$this->sections[$sectionType][$section->getID()] = $section;
-
-			unset($this->sectionClasses[$class]);
-		}
-
-		return $this->sections[$type];
-	}
-
-	/** @var array */
-	protected $settingClasses = [];
-
-	/** @var array */
-	protected $settings = [];
-
-	/**
-	 * @param string $type 'admin' or 'personal'
-	 * @param string $setting Class must implement OCP\Settings\ISetting
-	 * @return void
-	 */
-	public function registerSetting(string $type, string $setting) {
-		$this->settingClasses[$setting] = $type;
-	}
-
-	/**
-	 * @param string $type 'admin' or 'personal'
-	 * @param string $section
-	 * @return ISettings[]
-	 */
-	protected function getSettings(string $type, string $section): array {
-		if (!isset($this->settings[$type])) {
-			$this->settings[$type] = [];
-		}
-		if (!isset($this->settings[$type][$section])) {
-			$this->settings[$type][$section] = [];
-		}
-
-		foreach ($this->settingClasses as $class => $settingsType) {
-			try {
-				/** @var ISettings $setting */
-				$setting = \OC::$server->query($class);
-			} catch (QueryException $e) {
-				$this->log->logException($e, ['level' => ILogger::INFO]);
-				continue;
-			}
-
-			if (!$setting instanceof ISettings) {
-				$this->log->logException(new \InvalidArgumentException('Invalid settings setting registered'), ['level' => ILogger::INFO]);
-				continue;
-			}
-
-			if (!isset($this->settings[$settingsType][$setting->getSection()])) {
-				$this->settings[$settingsType][$setting->getSection()] = [];
-			}
-			$this->settings[$settingsType][$setting->getSection()][] = $setting;
-
-			unset($this->settingClasses[$class]);
-		}
-
-		return $this->settings[$type][$section];
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAdminSections(): array {
-		// built-in sections
-		$sections = [
-			0 => [new Section('server', $this->l->t('Basic settings'), 0, $this->url->imagePath('settings', 'admin.svg'))],
-			5 => [new Section('sharing', $this->l->t('Sharing'), 0, $this->url->imagePath('core', 'actions/share.svg'))],
-			10 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('core', 'actions/password.svg'))],
-			45 => [new Section('encryption', $this->l->t('Encryption'), 0, $this->url->imagePath('core', 'actions/password.svg'))],
-			98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))],
-			99 => [new Section('tips-tricks', $this->l->t('Tips & tricks'), 0, $this->url->imagePath('settings', 'help.svg'))],
-		];
-
-		$appSections = $this->getSections('admin');
-
-		foreach ($appSections as $section) {
-			/** @var ISection $section */
-			if (!isset($sections[$section->getPriority()])) {
-				$sections[$section->getPriority()] = [];
-			}
-
-			$sections[$section->getPriority()][] = $section;
-		}
-
-		ksort($sections);
-
-		return $sections;
-	}
-
-	/**
-	 * @param string $section
-	 * @return ISection[]
-	 */
-	private function getBuiltInAdminSettings($section): array {
-		$forms = [];
-
-		if ($section === 'server') {
-			/** @var ISettings $form */
-			$form = new Admin\Server($this->dbc, $this->request, $this->config, $this->lockingProvider, $this->l);
-			$forms[$form->getPriority()] = [$form];
-			$form = new Admin\ServerDevNotice();
-			$forms[$form->getPriority()] = [$form];
-		}
-		if ($section === 'encryption') {
-			/** @var ISettings $form */
-			$form = new Admin\Encryption($this->encryptionManager, $this->userManager);
-			$forms[$form->getPriority()] = [$form];
-		}
-		if ($section === 'sharing') {
-			/** @var ISettings $form */
-			$form = new Admin\Sharing($this->config, $this->l);
-			$forms[$form->getPriority()] = [$form];
-		}
-		if ($section === 'additional') {
-			/** @var ISettings $form */
-			$form = new Admin\Additional($this->config);
-			$forms[$form->getPriority()] = [$form];
-		}
-		if ($section === 'tips-tricks') {
-			/** @var ISettings $form */
-			$form = new Admin\TipsTricks($this->config);
-			$forms[$form->getPriority()] = [$form];
-		}
-
-		return $forms;
-	}
-
-	/**
-	 * @param string $section
-	 * @return ISection[]
-	 */
-	private function getBuiltInPersonalSettings($section): array {
-		$forms = [];
-
-		if ($section === 'personal-info') {
-			/** @var ISettings $form */
-			$form = new Personal\PersonalInfo(
-				$this->config,
-				$this->userManager,
-				$this->groupManager,
-				$this->accountManager,
-				$this->appManager,
-				$this->l10nFactory,
-				$this->l
-			);
-			$forms[$form->getPriority()] = [$form];
-		}
-		if($section === 'security') {
-			/** @var ISettings $form */
-			$form = new Personal\Security();
-			$forms[$form->getPriority()] = [$form];
-		}
-		if ($section === 'additional') {
-			/** @var ISettings $form */
-			$form = new Personal\Additional();
-			$forms[$form->getPriority()] = [$form];
-		}
-
-		return $forms;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAdminSettings($section): array {
-		$settings = $this->getBuiltInAdminSettings($section);
-		$appSettings = $this->getSettings('admin', $section);
-
-		foreach ($appSettings as $setting) {
-			if (!isset($settings[$setting->getPriority()])) {
-				$settings[$setting->getPriority()] = [];
-			}
-			$settings[$setting->getPriority()][] = $setting;
-		}
-
-		ksort($settings);
-		return $settings;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPersonalSections(): array {
-		$sections = [
-			0 => [new Section('personal-info', $this->l->t('Personal info'), 0, $this->url->imagePath('core', 'actions/info.svg'))],
-			5 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('settings', 'password.svg'))],
-			15 => [new Section('sync-clients', $this->l->t('Sync clients'), 0, $this->url->imagePath('settings', 'change.svg'))],
-		];
-
-		$legacyForms = \OC_App::getForms('personal');
-		if(!empty($legacyForms) && $this->hasLegacyPersonalSettingsToRender($legacyForms)) {
-			$sections[98] = [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))];
-		}
-
-		$appSections = $this->getSections('personal');
-
-		foreach ($appSections as $section) {
-			/** @var ISection $section */
-			if (!isset($sections[$section->getPriority()])) {
-				$sections[$section->getPriority()] = [];
-			}
-
-			$sections[$section->getPriority()][] = $section;
-		}
-
-		ksort($sections);
-
-		return $sections;
-	}
-
-	/**
-	 * @param string[] $forms
-	 * @return bool
-	 */
-	private function hasLegacyPersonalSettingsToRender(array $forms): bool {
-		foreach ($forms as $form) {
-			if(trim($form) !== '') {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPersonalSettings($section): array {
-		$settings = $this->getBuiltInPersonalSettings($section);
-		$appSettings = $this->getSettings('personal', $section);
-
-		foreach ($appSettings as $setting) {
-			if (!isset($settings[$setting->getPriority()])) {
-				$settings[$setting->getPriority()] = [];
-			}
-			$settings[$setting->getPriority()][] = $setting;
-		}
-
-		ksort($settings);
-		return $settings;
-	}
+    /** @var ILogger */
+    private $log;
+    /** @var IDBConnection */
+    private $dbc;
+    /** @var IL10N */
+    private $l;
+    /** @var IConfig */
+    private $config;
+    /** @var EncryptionManager */
+    private $encryptionManager;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var ILockingProvider */
+    private $lockingProvider;
+    /** @var IRequest */
+    private $request;
+    /** @var IURLGenerator */
+    private $url;
+    /** @var AccountManager */
+    private $accountManager;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IFactory */
+    private $l10nFactory;
+    /** @var IAppManager */
+    private $appManager;
+
+    /**
+     * @param ILogger $log
+     * @param IDBConnection $dbc
+     * @param IL10N $l
+     * @param IConfig $config
+     * @param EncryptionManager $encryptionManager
+     * @param IUserManager $userManager
+     * @param ILockingProvider $lockingProvider
+     * @param IRequest $request
+     * @param IURLGenerator $url
+     * @param AccountManager $accountManager
+     * @param IGroupManager $groupManager
+     * @param IFactory $l10nFactory
+     * @param IAppManager $appManager
+     */
+    public function __construct(
+        ILogger $log,
+        IDBConnection $dbc,
+        IL10N $l,
+        IConfig $config,
+        EncryptionManager $encryptionManager,
+        IUserManager $userManager,
+        ILockingProvider $lockingProvider,
+        IRequest $request,
+        IURLGenerator $url,
+        AccountManager $accountManager,
+        IGroupManager $groupManager,
+        IFactory $l10nFactory,
+        IAppManager $appManager
+    ) {
+        $this->log = $log;
+        $this->dbc = $dbc;
+        $this->l = $l;
+        $this->config = $config;
+        $this->encryptionManager = $encryptionManager;
+        $this->userManager = $userManager;
+        $this->lockingProvider = $lockingProvider;
+        $this->request = $request;
+        $this->url = $url;
+        $this->accountManager = $accountManager;
+        $this->groupManager = $groupManager;
+        $this->l10nFactory = $l10nFactory;
+        $this->appManager = $appManager;
+    }
+
+    /** @var array */
+    protected $sectionClasses = [];
+
+    /** @var array */
+    protected $sections = [];
+
+    /**
+     * @param string $type 'admin' or 'personal'
+     * @param string $section Class must implement OCP\Settings\ISection
+     * @return void
+     */
+    public function registerSection(string $type, string $section) {
+        $this->sectionClasses[$section] = $type;
+    }
+
+    /**
+     * @param string $type 'admin' or 'personal'
+     * @return ISection[]
+     */
+    protected function getSections(string $type): array {
+        if (!isset($this->sections[$type])) {
+            $this->sections[$type] = [];
+        }
+
+        foreach ($this->sectionClasses as $class => $sectionType) {
+            try {
+                /** @var ISection $section */
+                $section = \OC::$server->query($class);
+            } catch (QueryException $e) {
+                $this->log->logException($e, ['level' => ILogger::INFO]);
+                continue;
+            }
+
+            if (!$section instanceof ISection) {
+                $this->log->logException(new \InvalidArgumentException('Invalid settings section registered'), ['level' => ILogger::INFO]);
+                continue;
+            }
+
+            $this->sections[$sectionType][$section->getID()] = $section;
+
+            unset($this->sectionClasses[$class]);
+        }
+
+        return $this->sections[$type];
+    }
+
+    /** @var array */
+    protected $settingClasses = [];
+
+    /** @var array */
+    protected $settings = [];
+
+    /**
+     * @param string $type 'admin' or 'personal'
+     * @param string $setting Class must implement OCP\Settings\ISetting
+     * @return void
+     */
+    public function registerSetting(string $type, string $setting) {
+        $this->settingClasses[$setting] = $type;
+    }
+
+    /**
+     * @param string $type 'admin' or 'personal'
+     * @param string $section
+     * @return ISettings[]
+     */
+    protected function getSettings(string $type, string $section): array {
+        if (!isset($this->settings[$type])) {
+            $this->settings[$type] = [];
+        }
+        if (!isset($this->settings[$type][$section])) {
+            $this->settings[$type][$section] = [];
+        }
+
+        foreach ($this->settingClasses as $class => $settingsType) {
+            try {
+                /** @var ISettings $setting */
+                $setting = \OC::$server->query($class);
+            } catch (QueryException $e) {
+                $this->log->logException($e, ['level' => ILogger::INFO]);
+                continue;
+            }
+
+            if (!$setting instanceof ISettings) {
+                $this->log->logException(new \InvalidArgumentException('Invalid settings setting registered'), ['level' => ILogger::INFO]);
+                continue;
+            }
+
+            if (!isset($this->settings[$settingsType][$setting->getSection()])) {
+                $this->settings[$settingsType][$setting->getSection()] = [];
+            }
+            $this->settings[$settingsType][$setting->getSection()][] = $setting;
+
+            unset($this->settingClasses[$class]);
+        }
+
+        return $this->settings[$type][$section];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAdminSections(): array {
+        // built-in sections
+        $sections = [
+            0 => [new Section('server', $this->l->t('Basic settings'), 0, $this->url->imagePath('settings', 'admin.svg'))],
+            5 => [new Section('sharing', $this->l->t('Sharing'), 0, $this->url->imagePath('core', 'actions/share.svg'))],
+            10 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('core', 'actions/password.svg'))],
+            45 => [new Section('encryption', $this->l->t('Encryption'), 0, $this->url->imagePath('core', 'actions/password.svg'))],
+            98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))],
+            99 => [new Section('tips-tricks', $this->l->t('Tips & tricks'), 0, $this->url->imagePath('settings', 'help.svg'))],
+        ];
+
+        $appSections = $this->getSections('admin');
+
+        foreach ($appSections as $section) {
+            /** @var ISection $section */
+            if (!isset($sections[$section->getPriority()])) {
+                $sections[$section->getPriority()] = [];
+            }
+
+            $sections[$section->getPriority()][] = $section;
+        }
+
+        ksort($sections);
+
+        return $sections;
+    }
+
+    /**
+     * @param string $section
+     * @return ISection[]
+     */
+    private function getBuiltInAdminSettings($section): array {
+        $forms = [];
+
+        if ($section === 'server') {
+            /** @var ISettings $form */
+            $form = new Admin\Server($this->dbc, $this->request, $this->config, $this->lockingProvider, $this->l);
+            $forms[$form->getPriority()] = [$form];
+            $form = new Admin\ServerDevNotice();
+            $forms[$form->getPriority()] = [$form];
+        }
+        if ($section === 'encryption') {
+            /** @var ISettings $form */
+            $form = new Admin\Encryption($this->encryptionManager, $this->userManager);
+            $forms[$form->getPriority()] = [$form];
+        }
+        if ($section === 'sharing') {
+            /** @var ISettings $form */
+            $form = new Admin\Sharing($this->config, $this->l);
+            $forms[$form->getPriority()] = [$form];
+        }
+        if ($section === 'additional') {
+            /** @var ISettings $form */
+            $form = new Admin\Additional($this->config);
+            $forms[$form->getPriority()] = [$form];
+        }
+        if ($section === 'tips-tricks') {
+            /** @var ISettings $form */
+            $form = new Admin\TipsTricks($this->config);
+            $forms[$form->getPriority()] = [$form];
+        }
+
+        return $forms;
+    }
+
+    /**
+     * @param string $section
+     * @return ISection[]
+     */
+    private function getBuiltInPersonalSettings($section): array {
+        $forms = [];
+
+        if ($section === 'personal-info') {
+            /** @var ISettings $form */
+            $form = new Personal\PersonalInfo(
+                $this->config,
+                $this->userManager,
+                $this->groupManager,
+                $this->accountManager,
+                $this->appManager,
+                $this->l10nFactory,
+                $this->l
+            );
+            $forms[$form->getPriority()] = [$form];
+        }
+        if($section === 'security') {
+            /** @var ISettings $form */
+            $form = new Personal\Security();
+            $forms[$form->getPriority()] = [$form];
+        }
+        if ($section === 'additional') {
+            /** @var ISettings $form */
+            $form = new Personal\Additional();
+            $forms[$form->getPriority()] = [$form];
+        }
+
+        return $forms;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAdminSettings($section): array {
+        $settings = $this->getBuiltInAdminSettings($section);
+        $appSettings = $this->getSettings('admin', $section);
+
+        foreach ($appSettings as $setting) {
+            if (!isset($settings[$setting->getPriority()])) {
+                $settings[$setting->getPriority()] = [];
+            }
+            $settings[$setting->getPriority()][] = $setting;
+        }
+
+        ksort($settings);
+        return $settings;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPersonalSections(): array {
+        $sections = [
+            0 => [new Section('personal-info', $this->l->t('Personal info'), 0, $this->url->imagePath('core', 'actions/info.svg'))],
+            5 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('settings', 'password.svg'))],
+            15 => [new Section('sync-clients', $this->l->t('Sync clients'), 0, $this->url->imagePath('settings', 'change.svg'))],
+        ];
+
+        $legacyForms = \OC_App::getForms('personal');
+        if(!empty($legacyForms) && $this->hasLegacyPersonalSettingsToRender($legacyForms)) {
+            $sections[98] = [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))];
+        }
+
+        $appSections = $this->getSections('personal');
+
+        foreach ($appSections as $section) {
+            /** @var ISection $section */
+            if (!isset($sections[$section->getPriority()])) {
+                $sections[$section->getPriority()] = [];
+            }
+
+            $sections[$section->getPriority()][] = $section;
+        }
+
+        ksort($sections);
+
+        return $sections;
+    }
+
+    /**
+     * @param string[] $forms
+     * @return bool
+     */
+    private function hasLegacyPersonalSettingsToRender(array $forms): bool {
+        foreach ($forms as $form) {
+            if(trim($form) !== '') {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPersonalSettings($section): array {
+        $settings = $this->getBuiltInPersonalSettings($section);
+        $appSettings = $this->getSettings('personal', $section);
+
+        foreach ($appSettings as $setting) {
+            if (!isset($settings[$setting->getPriority()])) {
+                $settings[$setting->getPriority()] = [];
+            }
+            $settings[$setting->getPriority()][] = $setting;
+        }
+
+        ksort($settings);
+        return $settings;
+    }
 }

core/ajax/update.php

Indentation +178 added lines, -178 removed lines

@@ -33,7 +33,7 @@ 
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-	@set_time_limit(0);
+    @set_time_limit(0);
 }
 
 require_once '../../lib/base.php';
@@ -47,188 +47,188 @@ 
 $eventSource->send('success', (string)$l->t('Preparing update'));
 
 class FeedBackHandler {
-	/** @var integer */
-	private $progressStateMax = 100;
-	/** @var integer */
-	private $progressStateStep = 0;
-	/** @var string */
-	private $currentStep;
-	/** @var \OCP\IEventSource */
-	private $eventSource;
-	/** @var \OCP\IL10N */
-	private $l10n;
-
-	public function __construct(\OCP\IEventSource $eventSource, \OCP\IL10N $l10n) {
-		$this->eventSource = $eventSource;
-		$this->l10n = $l10n;
-	}
-
-	public function handleRepairFeedback($event) {
-		if (!$event instanceof GenericEvent) {
-			return;
-		}
-
-		switch ($event->getSubject()) {
-			case '\OC\Repair::startProgress':
-				$this->progressStateMax = $event->getArgument(0);
-				$this->progressStateStep = 0;
-				$this->currentStep = $event->getArgument(1);
-				break;
-			case '\OC\Repair::advance':
-				$this->progressStateStep += $event->getArgument(0);
-				$desc = $event->getArgument(1);
-				if (empty($desc)) {
-					$desc = $this->currentStep;
-				}
-				$this->eventSource->send('success', (string)$this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $desc]));
-				break;
-			case '\OC\Repair::finishProgress':
-				$this->progressStateMax = $this->progressStateStep;
-				$this->eventSource->send('success', (string)$this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $this->currentStep]));
-				break;
-			case '\OC\Repair::step':
-				break;
-			case '\OC\Repair::info':
-				break;
-			case '\OC\Repair::warning':
-				$this->eventSource->send('notice', (string)$this->l10n->t('Repair warning: ') . $event->getArgument(0));
-				break;
-			case '\OC\Repair::error':
-				$this->eventSource->send('notice', (string)$this->l10n->t('Repair error: ') . $event->getArgument(0));
-				break;
-		}
-	}
+    /** @var integer */
+    private $progressStateMax = 100;
+    /** @var integer */
+    private $progressStateStep = 0;
+    /** @var string */
+    private $currentStep;
+    /** @var \OCP\IEventSource */
+    private $eventSource;
+    /** @var \OCP\IL10N */
+    private $l10n;
+
+    public function __construct(\OCP\IEventSource $eventSource, \OCP\IL10N $l10n) {
+        $this->eventSource = $eventSource;
+        $this->l10n = $l10n;
+    }
+
+    public function handleRepairFeedback($event) {
+        if (!$event instanceof GenericEvent) {
+            return;
+        }
+
+        switch ($event->getSubject()) {
+            case '\OC\Repair::startProgress':
+                $this->progressStateMax = $event->getArgument(0);
+                $this->progressStateStep = 0;
+                $this->currentStep = $event->getArgument(1);
+                break;
+            case '\OC\Repair::advance':
+                $this->progressStateStep += $event->getArgument(0);
+                $desc = $event->getArgument(1);
+                if (empty($desc)) {
+                    $desc = $this->currentStep;
+                }
+                $this->eventSource->send('success', (string)$this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $desc]));
+                break;
+            case '\OC\Repair::finishProgress':
+                $this->progressStateMax = $this->progressStateStep;
+                $this->eventSource->send('success', (string)$this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $this->currentStep]));
+                break;
+            case '\OC\Repair::step':
+                break;
+            case '\OC\Repair::info':
+                break;
+            case '\OC\Repair::warning':
+                $this->eventSource->send('notice', (string)$this->l10n->t('Repair warning: ') . $event->getArgument(0));
+                break;
+            case '\OC\Repair::error':
+                $this->eventSource->send('notice', (string)$this->l10n->t('Repair error: ') . $event->getArgument(0));
+                break;
+        }
+    }
 }
 
 if (\OCP\Util::needUpgrade()) {
 
-	$config = \OC::$server->getSystemConfig();
-	if ($config->getValue('upgrade.disable-web', false)) {
-		$eventSource->send('failure', (string)$l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
-		$eventSource->close();
-		exit();
-	}
-
-	// if a user is currently logged in, their session must be ignored to
-	// avoid side effects
-	\OC_User::setIncognitoMode(true);
-
-	$logger = \OC::$server->getLogger();
-	$config = \OC::$server->getConfig();
-	$updater = new \OC\Updater(
-			$config,
-			\OC::$server->getIntegrityCodeChecker(),
-			$logger,
-			\OC::$server->query(\OC\Installer::class)
-	);
-	$incompatibleApps = [];
-
-	$dispatcher = \OC::$server->getEventDispatcher();
-	$dispatcher->addListener('\OC\DB\Migrator::executeSql', function($event) use ($eventSource, $l) {
-		if ($event instanceof GenericEvent) {
-			$eventSource->send('success', (string)$l->t('[%d / %d]: %s', [$event[0], $event[1], $event->getSubject()]));
-		}
-	});
-	$dispatcher->addListener('\OC\DB\Migrator::checkTable', function($event) use ($eventSource, $l) {
-		if ($event instanceof GenericEvent) {
-			$eventSource->send('success', (string)$l->t('[%d / %d]: Checking table %s', [$event[0], $event[1], $event->getSubject()]));
-		}
-	});
-	$feedBack = new FeedBackHandler($eventSource, $l);
-	$dispatcher->addListener('\OC\Repair::startProgress', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::advance', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::finishProgress', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::step', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::info', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::warning', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::error', [$feedBack, 'handleRepairFeedback']);
-
-	$updater->listen('\OC\Updater', 'maintenanceEnabled', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Turned on maintenance mode'));
-	});
-	$updater->listen('\OC\Updater', 'maintenanceDisabled', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Turned off maintenance mode'));
-	});
-	$updater->listen('\OC\Updater', 'maintenanceActive', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Maintenance mode is kept active'));
-	});
-	$updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Updating database schema'));
-	});
-	$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Updated database'));
-	});
-	$updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checking whether the database schema can be updated (this can take a long time depending on the database size)'));
-	});
-	$updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checked database schema update'));
-	});
-	$updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checking updates of apps'));
-	});
-	$updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checking for update of app "%s" in appstore', [$app]));
-	});
-	$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Update app "%s" from appstore', [$app]));
-	});
-	$updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checked for update of app "%s" in appstore', [$app]));
-	});
-	$updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app]));
-	});
-	$updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checked database schema update for apps'));
-	});
-	$updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Updated "%s" to %s', array($app, $version)));
-	});
-	$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps) {
-		$incompatibleApps[]= $app;
-	});
-	$updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource, $config) {
-		$eventSource->send('failure', $message);
-		$eventSource->close();
-		$config->setSystemValue('maintenance', false);
-	});
-	$updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Set log level to debug'));
-	});
-	$updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Reset log level'));
-	});
-	$updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Starting code integrity check'));
-	});
-	$updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Finished code integrity check'));
-	});
-
-	try {
-		$updater->upgrade();
-	} catch (\Exception $e) {
-		\OC::$server->getLogger()->logException($e, [
-			'level' => ILogger::ERROR,
-			'app' => 'update',
-		]);
-		$eventSource->send('failure', get_class($e) . ': ' . $e->getMessage());
-		$eventSource->close();
-		exit();
-	}
-
-	$disabledApps = [];
-	foreach ($incompatibleApps as $app) {
-		$disabledApps[$app] = (string) $l->t('%s (incompatible)', [$app]);
-	}
-
-	if (!empty($disabledApps)) {
-		$eventSource->send('notice',
-			(string)$l->t('Following apps have been disabled: %s', [implode(', ', $disabledApps)]));
-	}
+    $config = \OC::$server->getSystemConfig();
+    if ($config->getValue('upgrade.disable-web', false)) {
+        $eventSource->send('failure', (string)$l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
+        $eventSource->close();
+        exit();
+    }
+
+    // if a user is currently logged in, their session must be ignored to
+    // avoid side effects
+    \OC_User::setIncognitoMode(true);
+
+    $logger = \OC::$server->getLogger();
+    $config = \OC::$server->getConfig();
+    $updater = new \OC\Updater(
+            $config,
+            \OC::$server->getIntegrityCodeChecker(),
+            $logger,
+            \OC::$server->query(\OC\Installer::class)
+    );
+    $incompatibleApps = [];
+
+    $dispatcher = \OC::$server->getEventDispatcher();
+    $dispatcher->addListener('\OC\DB\Migrator::executeSql', function($event) use ($eventSource, $l) {
+        if ($event instanceof GenericEvent) {
+            $eventSource->send('success', (string)$l->t('[%d / %d]: %s', [$event[0], $event[1], $event->getSubject()]));
+        }
+    });
+    $dispatcher->addListener('\OC\DB\Migrator::checkTable', function($event) use ($eventSource, $l) {
+        if ($event instanceof GenericEvent) {
+            $eventSource->send('success', (string)$l->t('[%d / %d]: Checking table %s', [$event[0], $event[1], $event->getSubject()]));
+        }
+    });
+    $feedBack = new FeedBackHandler($eventSource, $l);
+    $dispatcher->addListener('\OC\Repair::startProgress', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::advance', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::finishProgress', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::step', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::info', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::warning', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::error', [$feedBack, 'handleRepairFeedback']);
+
+    $updater->listen('\OC\Updater', 'maintenanceEnabled', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Turned on maintenance mode'));
+    });
+    $updater->listen('\OC\Updater', 'maintenanceDisabled', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Turned off maintenance mode'));
+    });
+    $updater->listen('\OC\Updater', 'maintenanceActive', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Maintenance mode is kept active'));
+    });
+    $updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Updating database schema'));
+    });
+    $updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Updated database'));
+    });
+    $updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checking whether the database schema can be updated (this can take a long time depending on the database size)'));
+    });
+    $updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checked database schema update'));
+    });
+    $updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checking updates of apps'));
+    });
+    $updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checking for update of app "%s" in appstore', [$app]));
+    });
+    $updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Update app "%s" from appstore', [$app]));
+    });
+    $updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checked for update of app "%s" in appstore', [$app]));
+    });
+    $updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app]));
+    });
+    $updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checked database schema update for apps'));
+    });
+    $updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Updated "%s" to %s', array($app, $version)));
+    });
+    $updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps) {
+        $incompatibleApps[]= $app;
+    });
+    $updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource, $config) {
+        $eventSource->send('failure', $message);
+        $eventSource->close();
+        $config->setSystemValue('maintenance', false);
+    });
+    $updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Set log level to debug'));
+    });
+    $updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Reset log level'));
+    });
+    $updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Starting code integrity check'));
+    });
+    $updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Finished code integrity check'));
+    });
+
+    try {
+        $updater->upgrade();
+    } catch (\Exception $e) {
+        \OC::$server->getLogger()->logException($e, [
+            'level' => ILogger::ERROR,
+            'app' => 'update',
+        ]);
+        $eventSource->send('failure', get_class($e) . ': ' . $e->getMessage());
+        $eventSource->close();
+        exit();
+    }
+
+    $disabledApps = [];
+    foreach ($incompatibleApps as $app) {
+        $disabledApps[$app] = (string) $l->t('%s (incompatible)', [$app]);
+    }
+
+    if (!empty($disabledApps)) {
+        $eventSource->send('notice',
+            (string)$l->t('Following apps have been disabled: %s', [implode(', ', $disabledApps)]));
+    }
 } else {
-	$eventSource->send('notice', (string)$l->t('Already up to date'));
+    $eventSource->send('notice', (string)$l->t('Already up to date'));
 }
 
 $eventSource->send('done', '');

Spacing +50 added lines, -50 removed lines

@@ -44,7 +44,7 @@ 
 // need to send an initial message to force-init the event source,
 // which will then trigger its own CSRF check and produces its own CSRF error
 // message
-$eventSource->send('success', (string)$l->t('Preparing update'));
+$eventSource->send('success', (string) $l->t('Preparing update'));
 
 class FeedBackHandler {
 	/** @var integer */
@@ -80,21 +80,21 @@ 
 				if (empty($desc)) {
 					$desc = $this->currentStep;
 				}
-				$this->eventSource->send('success', (string)$this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $desc]));
+				$this->eventSource->send('success', (string) $this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $desc]));
 				break;
 			case '\OC\Repair::finishProgress':
 				$this->progressStateMax = $this->progressStateStep;
-				$this->eventSource->send('success', (string)$this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $this->currentStep]));
+				$this->eventSource->send('success', (string) $this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $this->currentStep]));
 				break;
 			case '\OC\Repair::step':
 				break;
 			case '\OC\Repair::info':
 				break;
 			case '\OC\Repair::warning':
-				$this->eventSource->send('notice', (string)$this->l10n->t('Repair warning: ') . $event->getArgument(0));
+				$this->eventSource->send('notice', (string) $this->l10n->t('Repair warning: ').$event->getArgument(0));
 				break;
 			case '\OC\Repair::error':
-				$this->eventSource->send('notice', (string)$this->l10n->t('Repair error: ') . $event->getArgument(0));
+				$this->eventSource->send('notice', (string) $this->l10n->t('Repair error: ').$event->getArgument(0));
 				break;
 		}
 	}
@@ -104,7 +104,7 @@ 
 
 	$config = \OC::$server->getSystemConfig();
 	if ($config->getValue('upgrade.disable-web', false)) {
-		$eventSource->send('failure', (string)$l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
+		$eventSource->send('failure', (string) $l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
 		$eventSource->close();
 		exit();
 	}
@@ -126,12 +126,12 @@ 
 	$dispatcher = \OC::$server->getEventDispatcher();
 	$dispatcher->addListener('\OC\DB\Migrator::executeSql', function($event) use ($eventSource, $l) {
 		if ($event instanceof GenericEvent) {
-			$eventSource->send('success', (string)$l->t('[%d / %d]: %s', [$event[0], $event[1], $event->getSubject()]));
+			$eventSource->send('success', (string) $l->t('[%d / %d]: %s', [$event[0], $event[1], $event->getSubject()]));
 		}
 	});
 	$dispatcher->addListener('\OC\DB\Migrator::checkTable', function($event) use ($eventSource, $l) {
 		if ($event instanceof GenericEvent) {
-			$eventSource->send('success', (string)$l->t('[%d / %d]: Checking table %s', [$event[0], $event[1], $event->getSubject()]));
+			$eventSource->send('success', (string) $l->t('[%d / %d]: Checking table %s', [$event[0], $event[1], $event->getSubject()]));
 		}
 	});
 	$feedBack = new FeedBackHandler($eventSource, $l);
@@ -143,67 +143,67 @@ 
 	$dispatcher->addListener('\OC\Repair::warning', [$feedBack, 'handleRepairFeedback']);
 	$dispatcher->addListener('\OC\Repair::error', [$feedBack, 'handleRepairFeedback']);
 
-	$updater->listen('\OC\Updater', 'maintenanceEnabled', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Turned on maintenance mode'));
+	$updater->listen('\OC\Updater', 'maintenanceEnabled', function() use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Turned on maintenance mode'));
 	});
-	$updater->listen('\OC\Updater', 'maintenanceDisabled', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Turned off maintenance mode'));
+	$updater->listen('\OC\Updater', 'maintenanceDisabled', function() use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Turned off maintenance mode'));
 	});
-	$updater->listen('\OC\Updater', 'maintenanceActive', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Maintenance mode is kept active'));
+	$updater->listen('\OC\Updater', 'maintenanceActive', function() use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Maintenance mode is kept active'));
 	});
-	$updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Updating database schema'));
+	$updater->listen('\OC\Updater', 'dbUpgradeBefore', function() use($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Updating database schema'));
 	});
-	$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Updated database'));
+	$updater->listen('\OC\Updater', 'dbUpgrade', function() use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Updated database'));
 	});
-	$updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checking whether the database schema can be updated (this can take a long time depending on the database size)'));
+	$updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function() use($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Checking whether the database schema can be updated (this can take a long time depending on the database size)'));
 	});
-	$updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checked database schema update'));
+	$updater->listen('\OC\Updater', 'dbSimulateUpgrade', function() use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Checked database schema update'));
 	});
-	$updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checking updates of apps'));
+	$updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function() use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Checking updates of apps'));
 	});
-	$updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checking for update of app "%s" in appstore', [$app]));
+	$updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function($app) use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Checking for update of app "%s" in appstore', [$app]));
 	});
-	$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Update app "%s" from appstore', [$app]));
+	$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function($app) use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Update app "%s" from appstore', [$app]));
 	});
-	$updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checked for update of app "%s" in appstore', [$app]));
+	$updater->listen('\OC\Updater', 'checkAppStoreApp', function($app) use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Checked for update of app "%s" in appstore', [$app]));
 	});
-	$updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app]));
+	$updater->listen('\OC\Updater', 'appSimulateUpdate', function($app) use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app]));
 	});
-	$updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checked database schema update for apps'));
+	$updater->listen('\OC\Updater', 'appUpgradeCheck', function() use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Checked database schema update for apps'));
 	});
-	$updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Updated "%s" to %s', array($app, $version)));
+	$updater->listen('\OC\Updater', 'appUpgrade', function($app, $version) use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Updated "%s" to %s', array($app, $version)));
 	});
-	$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps) {
-		$incompatibleApps[]= $app;
+	$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function($app) use (&$incompatibleApps) {
+		$incompatibleApps[] = $app;
 	});
-	$updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource, $config) {
+	$updater->listen('\OC\Updater', 'failure', function($message) use ($eventSource, $config) {
 		$eventSource->send('failure', $message);
 		$eventSource->close();
 		$config->setSystemValue('maintenance', false);
 	});
-	$updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Set log level to debug'));
+	$updater->listen('\OC\Updater', 'setDebugLogLevel', function($logLevel, $logLevelName) use($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Set log level to debug'));
 	});
-	$updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Reset log level'));
+	$updater->listen('\OC\Updater', 'resetLogLevel', function($logLevel, $logLevelName) use($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Reset log level'));
 	});
-	$updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Starting code integrity check'));
+	$updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function() use($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Starting code integrity check'));
 	});
-	$updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Finished code integrity check'));
+	$updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function() use($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Finished code integrity check'));
 	});
 
 	try {
@@ -213,7 +213,7 @@ 
 			'level' => ILogger::ERROR,
 			'app' => 'update',
 		]);
-		$eventSource->send('failure', get_class($e) . ': ' . $e->getMessage());
+		$eventSource->send('failure', get_class($e).': '.$e->getMessage());
 		$eventSource->close();
 		exit();
 	}
@@ -225,10 +225,10 @@ 
 
 	if (!empty($disabledApps)) {
 		$eventSource->send('notice',
-			(string)$l->t('Following apps have been disabled: %s', [implode(', ', $disabledApps)]));
+			(string) $l->t('Following apps have been disabled: %s', [implode(', ', $disabledApps)]));
 	}
 } else {
-	$eventSource->send('notice', (string)$l->t('Already up to date'));
+	$eventSource->send('notice', (string) $l->t('Already up to date'));
 }
 
 $eventSource->send('done', '');

core/Controller/SetupController.php

Indentation +81 added lines, -81 removed lines

@@ -33,97 +33,97 @@
 use OCP\ILogger;
 
 class SetupController {
-	/** @var Setup */
-	protected $setupHelper;
-	/** @var string */
-	private $autoConfigFile;
+    /** @var Setup */
+    protected $setupHelper;
+    /** @var string */
+    private $autoConfigFile;
 
-	/**
-	 * @param Setup $setupHelper
-	 */
-	function __construct(Setup $setupHelper) {
-		$this->autoConfigFile = \OC::$configDir.'autoconfig.php';
-		$this->setupHelper = $setupHelper;
-	}
+    /**
+     * @param Setup $setupHelper
+     */
+    function __construct(Setup $setupHelper) {
+        $this->autoConfigFile = \OC::$configDir.'autoconfig.php';
+        $this->setupHelper = $setupHelper;
+    }
 
-	/**
-	 * @param $post
-	 */
-	public function run($post) {
-		// Check for autosetup:
-		$post = $this->loadAutoConfig($post);
-		$opts = $this->setupHelper->getSystemInfo();
+    /**
+     * @param $post
+     */
+    public function run($post) {
+        // Check for autosetup:
+        $post = $this->loadAutoConfig($post);
+        $opts = $this->setupHelper->getSystemInfo();
 
-		// convert 'abcpassword' to 'abcpass'
-		if (isset($post['adminpassword'])) {
-			$post['adminpass'] = $post['adminpassword'];
-		}
-		if (isset($post['dbpassword'])) {
-			$post['dbpass'] = $post['dbpassword'];
-		}
+        // convert 'abcpassword' to 'abcpass'
+        if (isset($post['adminpassword'])) {
+            $post['adminpass'] = $post['adminpassword'];
+        }
+        if (isset($post['dbpassword'])) {
+            $post['dbpass'] = $post['dbpassword'];
+        }
 
-		if(isset($post['install']) AND $post['install']=='true') {
-			// We have to launch the installation process :
-			$e = $this->setupHelper->install($post);
-			$errors = array('errors' => $e);
+        if(isset($post['install']) AND $post['install']=='true') {
+            // We have to launch the installation process :
+            $e = $this->setupHelper->install($post);
+            $errors = array('errors' => $e);
 
-			if(count($e) > 0) {
-				$options = array_merge($opts, $post, $errors);
-				$this->display($options);
-			} else {
-				$this->finishSetup();
-			}
-		} else {
-			$options = array_merge($opts, $post);
-			$this->display($options);
-		}
-	}
+            if(count($e) > 0) {
+                $options = array_merge($opts, $post, $errors);
+                $this->display($options);
+            } else {
+                $this->finishSetup();
+            }
+        } else {
+            $options = array_merge($opts, $post);
+            $this->display($options);
+        }
+    }
 
-	public function display($post) {
-		$defaults = array(
-			'adminlogin' => '',
-			'adminpass' => '',
-			'dbuser' => '',
-			'dbpass' => '',
-			'dbname' => '',
-			'dbtablespace' => '',
-			'dbhost' => 'localhost',
-			'dbtype' => '',
-		);
-		$parameters = array_merge($defaults, $post);
+    public function display($post) {
+        $defaults = array(
+            'adminlogin' => '',
+            'adminpass' => '',
+            'dbuser' => '',
+            'dbpass' => '',
+            'dbname' => '',
+            'dbtablespace' => '',
+            'dbhost' => 'localhost',
+            'dbtype' => '',
+        );
+        $parameters = array_merge($defaults, $post);
 
-		\OC_Util::addVendorScript('strengthify/jquery.strengthify');
-		\OC_Util::addVendorStyle('strengthify/strengthify');
-		\OC_Util::addScript('setup');
-		\OC_Template::printGuestPage('', 'installation', $parameters);
-	}
+        \OC_Util::addVendorScript('strengthify/jquery.strengthify');
+        \OC_Util::addVendorStyle('strengthify/strengthify');
+        \OC_Util::addScript('setup');
+        \OC_Template::printGuestPage('', 'installation', $parameters);
+    }
 
-	public function finishSetup() {
-		if( file_exists( $this->autoConfigFile )) {
-			unlink($this->autoConfigFile);
-		}
-		\OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
-		\OC_Util::redirectToDefaultPage();
-	}
+    public function finishSetup() {
+        if( file_exists( $this->autoConfigFile )) {
+            unlink($this->autoConfigFile);
+        }
+        \OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
+        \OC_Util::redirectToDefaultPage();
+    }
 
-	public function loadAutoConfig($post) {
-		if( file_exists($this->autoConfigFile)) {
-			\OCP\Util::writeLog('core', 'Autoconfig file found, setting up ownCloud…', ILogger::INFO);
-			$AUTOCONFIG = array();
-			include $this->autoConfigFile;
-			$post = array_merge ($post, $AUTOCONFIG);
-		}
+    public function loadAutoConfig($post) {
+        if( file_exists($this->autoConfigFile)) {
+            \OCP\Util::writeLog('core', 'Autoconfig file found, setting up ownCloud…', ILogger::INFO);
+            $AUTOCONFIG = array();
+            include $this->autoConfigFile;
+            $post = array_merge ($post, $AUTOCONFIG);
+        }
 
-		$dbIsSet = isset($post['dbtype']);
-		$directoryIsSet = isset($post['directory']);
-		$adminAccountIsSet = isset($post['adminlogin']);
+        $dbIsSet = isset($post['dbtype']);
+        $directoryIsSet = isset($post['directory']);
+        $adminAccountIsSet = isset($post['adminlogin']);
 
-		if ($dbIsSet AND $directoryIsSet AND $adminAccountIsSet) {
-			$post['install'] = 'true';
-		}
-		$post['dbIsSet'] = $dbIsSet;
-		$post['directoryIsSet'] = $directoryIsSet;
+        if ($dbIsSet AND $directoryIsSet AND $adminAccountIsSet) {
+            $post['install'] = 'true';
+        }
+        $post['dbIsSet'] = $dbIsSet;
+        $post['directoryIsSet'] = $directoryIsSet;
 
-		return $post;
-	}
+        return $post;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -62,12 +62,12 @@ 
 			$post['dbpass'] = $post['dbpassword'];
 		}
 
-		if(isset($post['install']) AND $post['install']=='true') {
+		if (isset($post['install']) AND $post['install'] == 'true') {
 			// We have to launch the installation process :
 			$e = $this->setupHelper->install($post);
 			$errors = array('errors' => $e);
 
-			if(count($e) > 0) {
+			if (count($e) > 0) {
 				$options = array_merge($opts, $post, $errors);
 				$this->display($options);
 			} else {
@@ -99,7 +99,7 @@ 
 	}
 
 	public function finishSetup() {
-		if( file_exists( $this->autoConfigFile )) {
+		if (file_exists($this->autoConfigFile)) {
 			unlink($this->autoConfigFile);
 		}
 		\OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
@@ -107,11 +107,11 @@ 
 	}
 
 	public function loadAutoConfig($post) {
-		if( file_exists($this->autoConfigFile)) {
+		if (file_exists($this->autoConfigFile)) {
 			\OCP\Util::writeLog('core', 'Autoconfig file found, setting up ownCloud…', ILogger::INFO);
 			$AUTOCONFIG = array();
 			include $this->autoConfigFile;
-			$post = array_merge ($post, $AUTOCONFIG);
+			$post = array_merge($post, $AUTOCONFIG);
 		}
 
 		$dbIsSet = isset($post['dbtype']);

apps/files_trashbin/lib/Storage.php

Indentation +279 added lines, -279 removed lines

@@ -40,284 +40,284 @@
 
 class Storage extends Wrapper {
 
-	private $mountPoint;
-	// remember already deleted files to avoid infinite loops if the trash bin
-	// move files across storages
-	private $deletedFiles = array();
-
-	/**
-	 * Disable trash logic
-	 *
-	 * @var bool
-	 */
-	private static $disableTrash = false;
-
-	/**
-	 * remember which file/folder was moved out of s shared folder
-	 * in this case we want to add a copy to the owners trash bin
-	 *
-	 * @var array
-	 */
-	private static $moveOutOfSharedFolder = [];
-
-	/** @var  IUserManager */
-	private $userManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var EventDispatcher */
-	private $eventDispatcher;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/**
-	 * Storage constructor.
-	 *
-	 * @param array $parameters
-	 * @param IUserManager|null $userManager
-	 * @param ILogger|null $logger
-	 * @param EventDispatcher|null $eventDispatcher
-	 * @param IRootFolder|null $rootFolder
-	 */
-	public function __construct($parameters,
-								IUserManager $userManager = null,
-								ILogger $logger = null,
-								EventDispatcher $eventDispatcher = null,
-								IRootFolder $rootFolder = null) {
-		$this->mountPoint = $parameters['mountPoint'];
-		$this->userManager = $userManager;
-		$this->logger = $logger;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->rootFolder = $rootFolder;
-		parent::__construct($parameters);
-	}
-
-	/**
-	 * @internal
-	 */
-	public static function preRenameHook($params) {
-		// in cross-storage cases, a rename is a copy + unlink,
-		// that last unlink must not go to trash, only exception:
-		// if the file was moved from a shared storage to a local folder,
-		// in this case the owner should get a copy in his trash bin so that
-		// they can restore the files again
-
-		$oldPath = $params['oldpath'];
-		$newPath = dirname($params['newpath']);
-		$currentUser = \OC::$server->getUserSession()->getUser();
-
-		$fileMovedOutOfSharedFolder = false;
-
-		try {
-			if ($currentUser) {
-				$currentUserId = $currentUser->getUID();
-
-				$view = new View($currentUserId . '/files');
-				$fileInfo = $view->getFileInfo($oldPath);
-				if ($fileInfo) {
-					$sourceStorage = $fileInfo->getStorage();
-					$sourceOwner = $view->getOwner($oldPath);
-					$targetOwner = $view->getOwner($newPath);
-
-					if ($sourceOwner !== $targetOwner
-						&& $sourceStorage->instanceOfStorage('OCA\Files_Sharing\SharedStorage')
-					) {
-						$fileMovedOutOfSharedFolder = true;
-					}
-				}
-			}
-		} catch (\Exception $e) {
-			// do nothing, in this case we just disable the trashbin and continue
-			\OC::$server->getLogger()->logException($e, [
-				'message' => 'Trashbin storage could not check if a file was moved out of a shared folder.',
-				'level' => ILogger::DEBUG,
-				'app' => 'files_trashbin',
-			]);
-		}
-
-		if($fileMovedOutOfSharedFolder) {
-			self::$moveOutOfSharedFolder['/' . $currentUserId . '/files' . $oldPath] = true;
-		} else {
-			self::$disableTrash = true;
-		}
-
-	}
-
-	/**
-	 * @internal
-	 */
-	public static function postRenameHook($params) {
-		self::$disableTrash = false;
-	}
-
-	/**
-	 * Rename path1 to path2 by calling the wrapped storage.
-	 *
-	 * @param string $path1 first path
-	 * @param string $path2 second path
-	 * @return bool
-	 */
-	public function rename($path1, $path2) {
-		$result = $this->storage->rename($path1, $path2);
-		if ($result === false) {
-			// when rename failed, the post_rename hook isn't triggered,
-			// but we still want to reenable the trash logic
-			self::$disableTrash = false;
-		}
-		return $result;
-	}
-
-	/**
-	 * Deletes the given file by moving it into the trashbin.
-	 *
-	 * @param string $path path of file or folder to delete
-	 *
-	 * @return bool true if the operation succeeded, false otherwise
-	 */
-	public function unlink($path) {
-		try {
-			if (isset(self::$moveOutOfSharedFolder[$this->mountPoint . $path])) {
-				$result = $this->doDelete($path, 'unlink', true);
-				unset(self::$moveOutOfSharedFolder[$this->mountPoint . $path]);
-			} else {
-				$result = $this->doDelete($path, 'unlink');
-			}
-		} catch (GenericEncryptionException $e) {
-			// in case of a encryption exception we delete the file right away
-			$this->logger->info(
-				"Can't move file" .  $path .
-				"to the trash bin, therefore it was deleted right away");
-
-			$result = $this->storage->unlink($path);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Deletes the given folder by moving it into the trashbin.
-	 *
-	 * @param string $path path of folder to delete
-	 *
-	 * @return bool true if the operation succeeded, false otherwise
-	 */
-	public function rmdir($path) {
-		if (isset(self::$moveOutOfSharedFolder[$this->mountPoint . $path])) {
-			$result = $this->doDelete($path, 'rmdir', true);
-			unset(self::$moveOutOfSharedFolder[$this->mountPoint . $path]);
-		} else {
-			$result = $this->doDelete($path, 'rmdir');
-		}
-
-		return $result;
-	}
-
-	/**
-	 * check if it is a file located in data/user/files only files in the
-	 * 'files' directory should be moved to the trash
-	 *
-	 * @param $path
-	 * @return bool
-	 */
-	protected function shouldMoveToTrash($path){
-
-		// check if there is a app which want to disable the trash bin for this file
-		$fileId = $this->storage->getCache()->getId($path);
-		$nodes = $this->rootFolder->getById($fileId);
-		foreach ($nodes as $node) {
-			$event = $this->createMoveToTrashEvent($node);
-			$this->eventDispatcher->dispatch('OCA\Files_Trashbin::moveToTrash', $event);
-			if ($event->shouldMoveToTrashBin() === false) {
-				return false;
-			}
-		}
-
-		$normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path);
-		$parts = explode('/', $normalized);
-		if (count($parts) < 4) {
-			return false;
-		}
-
-		if ($parts[2] === 'files' && $this->userManager->userExists($parts[1])) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * get move to trash event
-	 *
-	 * @param Node $node
-	 * @return MoveToTrashEvent
-	 */
-	protected function createMoveToTrashEvent(Node $node) {
-		return new MoveToTrashEvent($node);
-	}
-
-	/**
-	 * Run the delete operation with the given method
-	 *
-	 * @param string $path path of file or folder to delete
-	 * @param string $method either "unlink" or "rmdir"
-	 * @param bool $ownerOnly delete for owner only (if file gets moved out of a shared folder)
-	 *
-	 * @return bool true if the operation succeeded, false otherwise
-	 */
-	private function doDelete($path, $method, $ownerOnly = false) {
-		if (self::$disableTrash
-			|| !\OC::$server->getAppManager()->isEnabledForUser('files_trashbin')
-			|| (pathinfo($path, PATHINFO_EXTENSION) === 'part')
-			|| $this->shouldMoveToTrash($path) === false
-		) {
-			return call_user_func_array([$this->storage, $method], [$path]);
-		}
-
-		// check permissions before we continue, this is especially important for
-		// shared files
-		if (!$this->isDeletable($path)) {
-			return false;
-		}
-
-		$normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path, true, false, true);
-		$result = true;
-		$view = Filesystem::getView();
-		if (!isset($this->deletedFiles[$normalized]) && $view instanceof View) {
-			$this->deletedFiles[$normalized] = $normalized;
-			if ($filesPath = $view->getRelativePath($normalized)) {
-				$filesPath = trim($filesPath, '/');
-				$result = \OCA\Files_Trashbin\Trashbin::move2trash($filesPath, $ownerOnly);
-				// in cross-storage cases the file will be copied
-				// but not deleted, so we delete it here
-				if ($result) {
-					call_user_func_array([$this->storage, $method], [$path]);
-				}
-			} else {
-				$result = call_user_func_array([$this->storage, $method], [$path]);
-			}
-			unset($this->deletedFiles[$normalized]);
-		} else if ($this->storage->file_exists($path)) {
-			$result = call_user_func_array([$this->storage, $method], [$path]);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Setup the storate wrapper callback
-	 */
-	public static function setupStorage() {
-		\OC\Files\Filesystem::addStorageWrapper('oc_trashbin', function ($mountPoint, $storage) {
-			return new \OCA\Files_Trashbin\Storage(
-				array('storage' => $storage, 'mountPoint' => $mountPoint),
-				\OC::$server->getUserManager(),
-				\OC::$server->getLogger(),
-				\OC::$server->getEventDispatcher(),
-				\OC::$server->getLazyRootFolder()
-			);
-		}, 1);
-	}
+    private $mountPoint;
+    // remember already deleted files to avoid infinite loops if the trash bin
+    // move files across storages
+    private $deletedFiles = array();
+
+    /**
+     * Disable trash logic
+     *
+     * @var bool
+     */
+    private static $disableTrash = false;
+
+    /**
+     * remember which file/folder was moved out of s shared folder
+     * in this case we want to add a copy to the owners trash bin
+     *
+     * @var array
+     */
+    private static $moveOutOfSharedFolder = [];
+
+    /** @var  IUserManager */
+    private $userManager;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var EventDispatcher */
+    private $eventDispatcher;
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /**
+     * Storage constructor.
+     *
+     * @param array $parameters
+     * @param IUserManager|null $userManager
+     * @param ILogger|null $logger
+     * @param EventDispatcher|null $eventDispatcher
+     * @param IRootFolder|null $rootFolder
+     */
+    public function __construct($parameters,
+                                IUserManager $userManager = null,
+                                ILogger $logger = null,
+                                EventDispatcher $eventDispatcher = null,
+                                IRootFolder $rootFolder = null) {
+        $this->mountPoint = $parameters['mountPoint'];
+        $this->userManager = $userManager;
+        $this->logger = $logger;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->rootFolder = $rootFolder;
+        parent::__construct($parameters);
+    }
+
+    /**
+     * @internal
+     */
+    public static function preRenameHook($params) {
+        // in cross-storage cases, a rename is a copy + unlink,
+        // that last unlink must not go to trash, only exception:
+        // if the file was moved from a shared storage to a local folder,
+        // in this case the owner should get a copy in his trash bin so that
+        // they can restore the files again
+
+        $oldPath = $params['oldpath'];
+        $newPath = dirname($params['newpath']);
+        $currentUser = \OC::$server->getUserSession()->getUser();
+
+        $fileMovedOutOfSharedFolder = false;
+
+        try {
+            if ($currentUser) {
+                $currentUserId = $currentUser->getUID();
+
+                $view = new View($currentUserId . '/files');
+                $fileInfo = $view->getFileInfo($oldPath);
+                if ($fileInfo) {
+                    $sourceStorage = $fileInfo->getStorage();
+                    $sourceOwner = $view->getOwner($oldPath);
+                    $targetOwner = $view->getOwner($newPath);
+
+                    if ($sourceOwner !== $targetOwner
+                        && $sourceStorage->instanceOfStorage('OCA\Files_Sharing\SharedStorage')
+                    ) {
+                        $fileMovedOutOfSharedFolder = true;
+                    }
+                }
+            }
+        } catch (\Exception $e) {
+            // do nothing, in this case we just disable the trashbin and continue
+            \OC::$server->getLogger()->logException($e, [
+                'message' => 'Trashbin storage could not check if a file was moved out of a shared folder.',
+                'level' => ILogger::DEBUG,
+                'app' => 'files_trashbin',
+            ]);
+        }
+
+        if($fileMovedOutOfSharedFolder) {
+            self::$moveOutOfSharedFolder['/' . $currentUserId . '/files' . $oldPath] = true;
+        } else {
+            self::$disableTrash = true;
+        }
+
+    }
+
+    /**
+     * @internal
+     */
+    public static function postRenameHook($params) {
+        self::$disableTrash = false;
+    }
+
+    /**
+     * Rename path1 to path2 by calling the wrapped storage.
+     *
+     * @param string $path1 first path
+     * @param string $path2 second path
+     * @return bool
+     */
+    public function rename($path1, $path2) {
+        $result = $this->storage->rename($path1, $path2);
+        if ($result === false) {
+            // when rename failed, the post_rename hook isn't triggered,
+            // but we still want to reenable the trash logic
+            self::$disableTrash = false;
+        }
+        return $result;
+    }
+
+    /**
+     * Deletes the given file by moving it into the trashbin.
+     *
+     * @param string $path path of file or folder to delete
+     *
+     * @return bool true if the operation succeeded, false otherwise
+     */
+    public function unlink($path) {
+        try {
+            if (isset(self::$moveOutOfSharedFolder[$this->mountPoint . $path])) {
+                $result = $this->doDelete($path, 'unlink', true);
+                unset(self::$moveOutOfSharedFolder[$this->mountPoint . $path]);
+            } else {
+                $result = $this->doDelete($path, 'unlink');
+            }
+        } catch (GenericEncryptionException $e) {
+            // in case of a encryption exception we delete the file right away
+            $this->logger->info(
+                "Can't move file" .  $path .
+                "to the trash bin, therefore it was deleted right away");
+
+            $result = $this->storage->unlink($path);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Deletes the given folder by moving it into the trashbin.
+     *
+     * @param string $path path of folder to delete
+     *
+     * @return bool true if the operation succeeded, false otherwise
+     */
+    public function rmdir($path) {
+        if (isset(self::$moveOutOfSharedFolder[$this->mountPoint . $path])) {
+            $result = $this->doDelete($path, 'rmdir', true);
+            unset(self::$moveOutOfSharedFolder[$this->mountPoint . $path]);
+        } else {
+            $result = $this->doDelete($path, 'rmdir');
+        }
+
+        return $result;
+    }
+
+    /**
+     * check if it is a file located in data/user/files only files in the
+     * 'files' directory should be moved to the trash
+     *
+     * @param $path
+     * @return bool
+     */
+    protected function shouldMoveToTrash($path){
+
+        // check if there is a app which want to disable the trash bin for this file
+        $fileId = $this->storage->getCache()->getId($path);
+        $nodes = $this->rootFolder->getById($fileId);
+        foreach ($nodes as $node) {
+            $event = $this->createMoveToTrashEvent($node);
+            $this->eventDispatcher->dispatch('OCA\Files_Trashbin::moveToTrash', $event);
+            if ($event->shouldMoveToTrashBin() === false) {
+                return false;
+            }
+        }
+
+        $normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path);
+        $parts = explode('/', $normalized);
+        if (count($parts) < 4) {
+            return false;
+        }
+
+        if ($parts[2] === 'files' && $this->userManager->userExists($parts[1])) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * get move to trash event
+     *
+     * @param Node $node
+     * @return MoveToTrashEvent
+     */
+    protected function createMoveToTrashEvent(Node $node) {
+        return new MoveToTrashEvent($node);
+    }
+
+    /**
+     * Run the delete operation with the given method
+     *
+     * @param string $path path of file or folder to delete
+     * @param string $method either "unlink" or "rmdir"
+     * @param bool $ownerOnly delete for owner only (if file gets moved out of a shared folder)
+     *
+     * @return bool true if the operation succeeded, false otherwise
+     */
+    private function doDelete($path, $method, $ownerOnly = false) {
+        if (self::$disableTrash
+            || !\OC::$server->getAppManager()->isEnabledForUser('files_trashbin')
+            || (pathinfo($path, PATHINFO_EXTENSION) === 'part')
+            || $this->shouldMoveToTrash($path) === false
+        ) {
+            return call_user_func_array([$this->storage, $method], [$path]);
+        }
+
+        // check permissions before we continue, this is especially important for
+        // shared files
+        if (!$this->isDeletable($path)) {
+            return false;
+        }
+
+        $normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path, true, false, true);
+        $result = true;
+        $view = Filesystem::getView();
+        if (!isset($this->deletedFiles[$normalized]) && $view instanceof View) {
+            $this->deletedFiles[$normalized] = $normalized;
+            if ($filesPath = $view->getRelativePath($normalized)) {
+                $filesPath = trim($filesPath, '/');
+                $result = \OCA\Files_Trashbin\Trashbin::move2trash($filesPath, $ownerOnly);
+                // in cross-storage cases the file will be copied
+                // but not deleted, so we delete it here
+                if ($result) {
+                    call_user_func_array([$this->storage, $method], [$path]);
+                }
+            } else {
+                $result = call_user_func_array([$this->storage, $method], [$path]);
+            }
+            unset($this->deletedFiles[$normalized]);
+        } else if ($this->storage->file_exists($path)) {
+            $result = call_user_func_array([$this->storage, $method], [$path]);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Setup the storate wrapper callback
+     */
+    public static function setupStorage() {
+        \OC\Files\Filesystem::addStorageWrapper('oc_trashbin', function ($mountPoint, $storage) {
+            return new \OCA\Files_Trashbin\Storage(
+                array('storage' => $storage, 'mountPoint' => $mountPoint),
+                \OC::$server->getUserManager(),
+                \OC::$server->getLogger(),
+                \OC::$server->getEventDispatcher(),
+                \OC::$server->getLazyRootFolder()
+            );
+        }, 1);
+    }
 
 }

apps/files_trashbin/ajax/delete.php

Indentation +40 added lines, -40 removed lines

@@ -35,19 +35,19 @@ 
 
 // "empty trash" command
 if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true'){
-	$deleteAll = true;
-	if ($folder === '/' || $folder === '') {
-		OCA\Files_Trashbin\Trashbin::deleteAll();
-		$list = array();
-	} else {
-		$list[] = $folder;
-		$folder = dirname($folder);
-	}
+    $deleteAll = true;
+    if ($folder === '/' || $folder === '') {
+        OCA\Files_Trashbin\Trashbin::deleteAll();
+        $list = array();
+    } else {
+        $list[] = $folder;
+        $folder = dirname($folder);
+    }
 }
 else {
-	$deleteAll = false;
-	$files = (string)$_POST['files'];
-	$list = json_decode($files);
+    $deleteAll = false;
+    $files = (string)$_POST['files'];
+    $list = json_decode($files);
 }
 
 $folder = rtrim($folder, '/') . '/';
@@ -56,38 +56,38 @@ 
 
 $i = 0;
 foreach ($list as $file) {
-	if ($folder === '/') {
-		$file = ltrim($file, '/');
-		$delimiter = strrpos($file, '.d');
-		$filename = substr($file, 0, $delimiter);
-		$timestamp =  substr($file, $delimiter+2);
-	} else {
-		$filename = $folder . '/' . $file;
-		$timestamp = null;
-	}
+    if ($folder === '/') {
+        $file = ltrim($file, '/');
+        $delimiter = strrpos($file, '.d');
+        $filename = substr($file, 0, $delimiter);
+        $timestamp =  substr($file, $delimiter+2);
+    } else {
+        $filename = $folder . '/' . $file;
+        $timestamp = null;
+    }
 
-	OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp);
-	if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) {
-		$error[] = $filename;
-		\OCP\Util::writeLog('trashbin','can\'t delete ' . $filename . ' permanently.', ILogger::ERROR);
-	}
-	// only list deleted files if not deleting everything
-	else if (!$deleteAll) {
-		$success[$i]['filename'] = $file;
-		$success[$i]['timestamp'] = $timestamp;
-		$i++;
-	}
+    OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp);
+    if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) {
+        $error[] = $filename;
+        \OCP\Util::writeLog('trashbin','can\'t delete ' . $filename . ' permanently.', ILogger::ERROR);
+    }
+    // only list deleted files if not deleting everything
+    else if (!$deleteAll) {
+        $success[$i]['filename'] = $file;
+        $success[$i]['timestamp'] = $timestamp;
+        $i++;
+    }
 }
 
 if ( $error ) {
-	$filelist = '';
-	foreach ( $error as $e ) {
-		$filelist .= $e.', ';
-	}
-	$l = \OC::$server->getL10N('files_trashbin');
-	$message = $l->t("Couldn't delete %s permanently", array(rtrim($filelist, ', ')));
-	\OC_JSON::error(array("data" => array("message" => $message,
-			                               "success" => $success, "error" => $error)));
+    $filelist = '';
+    foreach ( $error as $e ) {
+        $filelist .= $e.', ';
+    }
+    $l = \OC::$server->getL10N('files_trashbin');
+    $message = $l->t("Couldn't delete %s permanently", array(rtrim($filelist, ', ')));
+    \OC_JSON::error(array("data" => array("message" => $message,
+                                            "success" => $success, "error" => $error)));
 } else {
-	\OC_JSON::success(array("data" => array("success" => $success)));
+    \OC_JSON::success(array("data" => array("success" => $success)));
 }

Spacing +8 added lines, -8 removed lines

@@ -34,7 +34,7 @@ 
 $folder = isset($_POST['dir']) ? $_POST['dir'] : '/';
 
 // "empty trash" command
-if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true'){
+if (isset($_POST['allfiles']) && (string) $_POST['allfiles'] === 'true') {
 	$deleteAll = true;
 	if ($folder === '/' || $folder === '') {
 		OCA\Files_Trashbin\Trashbin::deleteAll();
@@ -46,11 +46,11 @@ 
 }
 else {
 	$deleteAll = false;
-	$files = (string)$_POST['files'];
+	$files = (string) $_POST['files'];
 	$list = json_decode($files);
 }
 
-$folder = rtrim($folder, '/') . '/';
+$folder = rtrim($folder, '/').'/';
 $error = array();
 $success = array();
 
@@ -60,16 +60,16 @@ 
 		$file = ltrim($file, '/');
 		$delimiter = strrpos($file, '.d');
 		$filename = substr($file, 0, $delimiter);
-		$timestamp =  substr($file, $delimiter+2);
+		$timestamp = substr($file, $delimiter + 2);
 	} else {
-		$filename = $folder . '/' . $file;
+		$filename = $folder.'/'.$file;
 		$timestamp = null;
 	}
 
 	OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp);
 	if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) {
 		$error[] = $filename;
-		\OCP\Util::writeLog('trashbin','can\'t delete ' . $filename . ' permanently.', ILogger::ERROR);
+		\OCP\Util::writeLog('trashbin', 'can\'t delete '.$filename.' permanently.', ILogger::ERROR);
 	}
 	// only list deleted files if not deleting everything
 	else if (!$deleteAll) {
@@ -79,9 +79,9 @@ 
 	}
 }
 
-if ( $error ) {
+if ($error) {
 	$filelist = '';
-	foreach ( $error as $e ) {
+	foreach ($error as $e) {
 		$filelist .= $e.', ';
 	}
 	$l = \OC::$server->getL10N('files_trashbin');

apps/files_trashbin/ajax/undelete.php

Indentation +43 added lines, -43 removed lines

@@ -35,25 +35,25 @@ 
 
 $dir = '/';
 if (isset($_POST['dir'])) {
-	$dir = rtrim((string)$_POST['dir'], '/'). '/';
+    $dir = rtrim((string)$_POST['dir'], '/'). '/';
 }
 $allFiles = false;
 if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true') {
-	$allFiles = true;
-	$list = array();
-	$dirListing = true;
-	if ($dir === '' || $dir === '/') {
-		$dirListing = false;
-	}
-	foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser()) as $file) {
-		$fileName = $file['name'];
-		if (!$dirListing) {
-			$fileName .= '.d' . $file['mtime'];
-		}
-		$list[] = $fileName;
-	}
+    $allFiles = true;
+    $list = array();
+    $dirListing = true;
+    if ($dir === '' || $dir === '/') {
+        $dirListing = false;
+    }
+    foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser()) as $file) {
+        $fileName = $file['name'];
+        if (!$dirListing) {
+            $fileName .= '.d' . $file['mtime'];
+        }
+        $list[] = $fileName;
+    }
 } else {
-	$list = json_decode($_POST['files']);
+    $list = json_decode($_POST['files']);
 }
 
 $error = array();
@@ -61,38 +61,38 @@ 
 
 $i = 0;
 foreach ($list as $file) {
-	$path = $dir . '/' . $file;
-	if ($dir === '/') {
-		$file = ltrim($file, '/');
-		$delimiter = strrpos($file, '.d');
-		$filename = substr($file, 0, $delimiter);
-		$timestamp =  substr($file, $delimiter+2);
-	} else {
-		$path_parts = pathinfo($file);
-		$filename = $path_parts['basename'];
-		$timestamp = null;
-	}
+    $path = $dir . '/' . $file;
+    if ($dir === '/') {
+        $file = ltrim($file, '/');
+        $delimiter = strrpos($file, '.d');
+        $filename = substr($file, 0, $delimiter);
+        $timestamp =  substr($file, $delimiter+2);
+    } else {
+        $path_parts = pathinfo($file);
+        $filename = $path_parts['basename'];
+        $timestamp = null;
+    }
 
-	if ( !OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp) ) {
-		$error[] = $filename;
-		\OCP\Util::writeLog('trashbin', 'can\'t restore ' . $filename, ILogger::ERROR);
-	} else {
-		$success[$i]['filename'] = $file;
-		$success[$i]['timestamp'] = $timestamp;
-		$i++;
-	}
+    if ( !OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp) ) {
+        $error[] = $filename;
+        \OCP\Util::writeLog('trashbin', 'can\'t restore ' . $filename, ILogger::ERROR);
+    } else {
+        $success[$i]['filename'] = $file;
+        $success[$i]['timestamp'] = $timestamp;
+        $i++;
+    }
 
 }
 
 if ( $error ) {
-	$filelist = '';
-	foreach ( $error as $e ) {
-		$filelist .= $e.', ';
-	}
-	$l = OC::$server->getL10N('files_trashbin');
-	$message = $l->t("Couldn't restore %s", array(rtrim($filelist, ', ')));
-	\OC_JSON::error(array("data" => array("message" => $message,
-										  "success" => $success, "error" => $error)));
+    $filelist = '';
+    foreach ( $error as $e ) {
+        $filelist .= $e.', ';
+    }
+    $l = OC::$server->getL10N('files_trashbin');
+    $message = $l->t("Couldn't restore %s", array(rtrim($filelist, ', ')));
+    \OC_JSON::error(array("data" => array("message" => $message,
+                                            "success" => $success, "error" => $error)));
 } else {
-	\OC_JSON::success(array("data" => array("success" => $success)));
+    \OC_JSON::success(array("data" => array("success" => $success)));
 }

Spacing +9 added lines, -9 removed lines

@@ -35,10 +35,10 @@ 
 
 $dir = '/';
 if (isset($_POST['dir'])) {
-	$dir = rtrim((string)$_POST['dir'], '/'). '/';
+	$dir = rtrim((string) $_POST['dir'], '/').'/';
 }
 $allFiles = false;
-if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true') {
+if (isset($_POST['allfiles']) && (string) $_POST['allfiles'] === 'true') {
 	$allFiles = true;
 	$list = array();
 	$dirListing = true;
@@ -48,7 +48,7 @@ 
 	foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser()) as $file) {
 		$fileName = $file['name'];
 		if (!$dirListing) {
-			$fileName .= '.d' . $file['mtime'];
+			$fileName .= '.d'.$file['mtime'];
 		}
 		$list[] = $fileName;
 	}
@@ -61,21 +61,21 @@ 
 
 $i = 0;
 foreach ($list as $file) {
-	$path = $dir . '/' . $file;
+	$path = $dir.'/'.$file;
 	if ($dir === '/') {
 		$file = ltrim($file, '/');
 		$delimiter = strrpos($file, '.d');
 		$filename = substr($file, 0, $delimiter);
-		$timestamp =  substr($file, $delimiter+2);
+		$timestamp = substr($file, $delimiter + 2);
 	} else {
 		$path_parts = pathinfo($file);
 		$filename = $path_parts['basename'];
 		$timestamp = null;
 	}
 
-	if ( !OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp) ) {
+	if (!OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp)) {
 		$error[] = $filename;
-		\OCP\Util::writeLog('trashbin', 'can\'t restore ' . $filename, ILogger::ERROR);
+		\OCP\Util::writeLog('trashbin', 'can\'t restore '.$filename, ILogger::ERROR);
 	} else {
 		$success[$i]['filename'] = $file;
 		$success[$i]['timestamp'] = $timestamp;
@@ -84,9 +84,9 @@ 
 
 }
 
-if ( $error ) {
+if ($error) {
 	$filelist = '';
-	foreach ( $error as $e ) {
+	foreach ($error as $e) {
 		$filelist .= $e.', ';
 	}
 	$l = OC::$server->getL10N('files_trashbin');

apps/provisioning_api/lib/Controller/UsersController.php

Indentation +841 added lines, -841 removed lines

@@ -52,845 +52,845 @@
 
 class UsersController extends AUserData {
 
-	/** @var IAppManager */
-	private $appManager;
-	/** @var ILogger */
-	private $logger;
-	/** @var IFactory */
-	private $l10nFactory;
-	/** @var NewUserMailHelper */
-	private $newUserMailHelper;
-	/** @var FederatedFileSharingFactory */
-	private $federatedFileSharingFactory;
-	/** @var ISecureRandom */
-	private $secureRandom;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 * @param IAppManager $appManager
-	 * @param IGroupManager $groupManager
-	 * @param IUserSession $userSession
-	 * @param AccountManager $accountManager
-	 * @param ILogger $logger
-	 * @param IFactory $l10nFactory
-	 * @param NewUserMailHelper $newUserMailHelper
-	 * @param FederatedFileSharingFactory $federatedFileSharingFactory
-	 * @param ISecureRandom $secureRandom
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IUserManager $userManager,
-								IConfig $config,
-								IAppManager $appManager,
-								IGroupManager $groupManager,
-								IUserSession $userSession,
-								AccountManager $accountManager,
-								ILogger $logger,
-								IFactory $l10nFactory,
-								NewUserMailHelper $newUserMailHelper,
-								FederatedFileSharingFactory $federatedFileSharingFactory,
-								ISecureRandom $secureRandom) {
-		parent::__construct($appName,
-							$request,
-							$userManager,
-							$config,
-							$groupManager,
-							$userSession,
-							$accountManager);
-
-		$this->appManager = $appManager;
-		$this->logger = $logger;
-		$this->l10nFactory = $l10nFactory;
-		$this->newUserMailHelper = $newUserMailHelper;
-		$this->federatedFileSharingFactory = $federatedFileSharingFactory;
-		$this->secureRandom = $secureRandom;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * returns a list of users
-	 *
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return DataResponse
-	 */
-	public function getUsers(string $search = '', $limit = null, $offset = 0): DataResponse {
-		$user = $this->userSession->getUser();
-		$users = [];
-
-		// Admin? Or SubAdmin?
-		$uid = $user->getUID();
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if ($this->groupManager->isAdmin($uid)){
-			$users = $this->userManager->search($search, $limit, $offset);
-		} else if ($subAdminManager->isSubAdmin($user)) {
-			$subAdminOfGroups = $subAdminManager->getSubAdminsGroups($user);
-			foreach ($subAdminOfGroups as $key => $group) {
-				$subAdminOfGroups[$key] = $group->getGID();
-			}
-
-			$users = [];
-			foreach ($subAdminOfGroups as $group) {
-				$users = array_merge($users, $this->groupManager->displayNamesInGroup($group, $search, $limit, $offset));
-			}
-		}
-
-		$users = array_keys($users);
-
-		return new DataResponse([
-			'users' => $users
-		]);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * returns a list of users and their data
-	 */
-	public function getUsersDetails(string $search = '', $limit = null, $offset = 0): DataResponse {
-		$user = $this->userSession->getUser();
-		$users = [];
-
-		// Admin? Or SubAdmin?
-		$uid = $user->getUID();
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if ($this->groupManager->isAdmin($uid)){
-			$users = $this->userManager->search($search, $limit, $offset);
-		} else if ($subAdminManager->isSubAdmin($user)) {
-			$subAdminOfGroups = $subAdminManager->getSubAdminsGroups($user);
-			foreach ($subAdminOfGroups as $key => $group) {
-				$subAdminOfGroups[$key] = $group->getGID();
-			}
-
-			$users = [];
-			foreach ($subAdminOfGroups as $group) {
-				$users = array_merge($users, $this->groupManager->displayNamesInGroup($group, $search, $limit, $offset));
-			}
-		}
-
-		$users = array_keys($users);
-		$usersDetails = [];
-		foreach ($users as $key => $userId) {
-			$userData = $this->getUserData($userId);
-			// Do not insert empty entry
-			if (!empty($userData)) {
-				$usersDetails[$userId] = $userData;
-			}
-		}
-
-		return new DataResponse([
-			'users' => $usersDetails
-		]);
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userid
-	 * @param string $password
-	 * @param string $email
-	 * @param array $groups
-	 * @param array $subadmins
-	 * @param string $quota
-	 * @param string $language
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function addUser(string $userid,
-							string $password = '',
-							string $email = '',
-							array $groups = [],
-							array $subadmin = [],
-							string $quota = '',
-							string $language = ''): DataResponse {
-		$user = $this->userSession->getUser();
-		$isAdmin = $this->groupManager->isAdmin($user->getUID());
-		$subAdminManager = $this->groupManager->getSubAdmin();
-
-		if ($this->userManager->userExists($userid)) {
-			$this->logger->error('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']);
-			throw new OCSException('User already exists', 102);
-		}
-
-		if ($groups !== []) {
-			foreach ($groups as $group) {
-				if (!$this->groupManager->groupExists($group)) {
-					throw new OCSException('group '.$group.' does not exist', 104);
-				}
-				if (!$isAdmin && !$subAdminManager->isSubAdminOfGroup($user, $this->groupManager->get($group))) {
-					throw new OCSException('insufficient privileges for group '. $group, 105);
-				}
-			}
-		} else {
-			if (!$isAdmin) {
-				throw new OCSException('no group specified (required for subadmins)', 106);
-			}
-		}
-
-		$subadminGroups = [];
-		if ($subadmin !== []) {
-			foreach ($subadmin as $groupid) {
-				$group = $this->groupManager->get($groupid);
-				// Check if group exists
-				if ($group === null) {
-					throw new OCSException('Subadmin group does not exist',  102);
-				}
-				// Check if trying to make subadmin of admin group
-				if ($group->getGID() === 'admin') {
-					throw new OCSException('Cannot create subadmins for admin group', 103);
-				}
-				// Check if has permission to promote subadmins
-				if (!$subAdminManager->isSubAdminOfGroup($user, $group) && !$isAdmin) {
-					throw new OCSForbiddenException('No permissions to promote subadmins');
-				}
-				$subadminGroups[] = $group;
-			}
-		}
-
-		$generatePasswordResetToken = false;
-		if ($password === '') {
-			if ($email === '') {
-				throw new OCSException('To send a password link to the user an email address is required.', 108);
-			}
-
-			$password = $this->secureRandom->generate(10);
-			// Make sure we pass the password_policy
-			$password .= $this->secureRandom->generate(2, '$!.,;:-~+*[]{}()');
-			$generatePasswordResetToken = true;
-		}
-
-		try {
-			$newUser = $this->userManager->createUser($userid, $password);
-			$this->logger->info('Successful addUser call with userid: ' . $userid, ['app' => 'ocs_api']);
-
-			foreach ($groups as $group) {
-				$this->groupManager->get($group)->addUser($newUser);
-				$this->logger->info('Added userid ' . $userid . ' to group ' . $group, ['app' => 'ocs_api']);
-			}
-			foreach ($subadminGroups as $group) {
-				$subAdminManager->createSubAdmin($newUser, $group);
-			}
-
-			if ($quota !== '') {
-				$this->editUser($userid, 'quota', $quota);
-			}
-
-			if ($language !== '') {
-				$this->editUser($userid, 'language', $language);
-			}
-
-			// Send new user mail only if a mail is set
-			if ($email !== '') {
-				$newUser->setEMailAddress($email);
-				try {
-					$emailTemplate = $this->newUserMailHelper->generateTemplate($newUser, $generatePasswordResetToken);
-					$this->newUserMailHelper->sendMail($newUser, $emailTemplate);
-				} catch (\Exception $e) {
-					$this->logger->logException($e, [
-						'message' => "Can't send new user mail to $email",
-						'level' => ILogger::ERROR,
-						'app' => 'ocs_api',
-					]);
-					throw new OCSException('Unable to send the invitation mail', 109);
-				}
-			}
-
-			return new DataResponse();
-
-		} catch (HintException $e ) {
-			$this->logger->logException($e, [
-				'message' => 'Failed addUser attempt with hint exception.',
-				'level' => ILogger::WARN,
-				'app' => 'ocs_api',
-			]);
-			throw new OCSException($e->getHint(), 107);
-		} catch (\Exception $e) {
-			$this->logger->logException($e, [
-				'message' => 'Failed addUser attempt with exception.',
-				'level' => ILogger::ERROR,
-				'app' => 'ocs_api',
-			]);
-			throw new OCSException('Bad request', 101);
-		}
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 *
-	 * gets user info
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getUser(string $userId): DataResponse {
-		$data = $this->getUserData($userId);
-		// getUserData returns empty array if not enough permissions
-		if (empty($data)) {
-			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-		}
-		return new DataResponse($data);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 *
-	 * gets user info from the currently logged in user
-	 *
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getCurrentUser(): DataResponse {
-		$user = $this->userSession->getUser();
-		if ($user) {
-			$data =  $this->getUserData($user->getUID());
-			// rename "displayname" to "display-name" only for this call to keep
-			// the API stable.
-			$data['display-name'] = $data['displayname'];
-			unset($data['displayname']);
-			return new DataResponse($data);
-
-		}
-
-		throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 */
-	public function getEditableFields(): DataResponse {
-		$permittedFields = [];
-
-		// Editing self (display, email)
-		if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
-			$permittedFields[] = AccountManager::PROPERTY_DISPLAYNAME;
-			$permittedFields[] = AccountManager::PROPERTY_EMAIL;
-		}
-
-		if ($this->appManager->isEnabledForUser('federatedfilesharing')) {
-			$federatedFileSharing = $this->federatedFileSharingFactory->get();
-			$shareProvider = $federatedFileSharing->getFederatedShareProvider();
-			if ($shareProvider->isLookupServerUploadEnabled()) {
-				$permittedFields[] = AccountManager::PROPERTY_PHONE;
-				$permittedFields[] = AccountManager::PROPERTY_ADDRESS;
-				$permittedFields[] = AccountManager::PROPERTY_WEBSITE;
-				$permittedFields[] = AccountManager::PROPERTY_TWITTER;
-			}
-		}
-
-		return new DataResponse($permittedFields);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 * @PasswordConfirmationRequired
-	 *
-	 * edit users
-	 *
-	 * @param string $userId
-	 * @param string $key
-	 * @param string $value
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function editUser(string $userId, string $key, string $value): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null) {
-			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-		}
-
-		$permittedFields = [];
-		if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			// Editing self (display, email)
-			if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
-				$permittedFields[] = 'display';
-				$permittedFields[] = AccountManager::PROPERTY_DISPLAYNAME;
-				$permittedFields[] = AccountManager::PROPERTY_EMAIL;
-			}
-
-			$permittedFields[] = 'password';
-			if ($this->config->getSystemValue('force_language', false) === false ||
-				$this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
-				$permittedFields[] = 'language';
-			}
-
-			if ($this->appManager->isEnabledForUser('federatedfilesharing')) {
-				$federatedFileSharing = new \OCA\FederatedFileSharing\AppInfo\Application();
-				$shareProvider = $federatedFileSharing->getFederatedShareProvider();
-				if ($shareProvider->isLookupServerUploadEnabled()) {
-					$permittedFields[] = AccountManager::PROPERTY_PHONE;
-					$permittedFields[] = AccountManager::PROPERTY_ADDRESS;
-					$permittedFields[] = AccountManager::PROPERTY_WEBSITE;
-					$permittedFields[] = AccountManager::PROPERTY_TWITTER;
-				}
-			}
-
-			// If admin they can edit their own quota
-			if ($this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
-				$permittedFields[] = 'quota';
-			}
-		} else {
-			// Check if admin / subadmin
-			$subAdminManager = $this->groupManager->getSubAdmin();
-			if ($subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
-			|| $this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
-				// They have permissions over the user
-				$permittedFields[] = 'display';
-				$permittedFields[] = AccountManager::PROPERTY_DISPLAYNAME;
-				$permittedFields[] = AccountManager::PROPERTY_EMAIL;
-				$permittedFields[] = 'password';
-				$permittedFields[] = 'language';
-				$permittedFields[] = AccountManager::PROPERTY_PHONE;
-				$permittedFields[] = AccountManager::PROPERTY_ADDRESS;
-				$permittedFields[] = AccountManager::PROPERTY_WEBSITE;
-				$permittedFields[] = AccountManager::PROPERTY_TWITTER;
-				$permittedFields[] = 'quota';
-			} else {
-				// No rights
-				throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-			}
-		}
-		// Check if permitted to edit this field
-		if (!in_array($key, $permittedFields)) {
-			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-		}
-		// Process the edit
-		switch($key) {
-			case 'display':
-			case AccountManager::PROPERTY_DISPLAYNAME:
-				$targetUser->setDisplayName($value);
-				break;
-			case 'quota':
-				$quota = $value;
-				if ($quota !== 'none' && $quota !== 'default') {
-					if (is_numeric($quota)) {
-						$quota = (float) $quota;
-					} else {
-						$quota = \OCP\Util::computerFileSize($quota);
-					}
-					if ($quota === false) {
-						throw new OCSException('Invalid quota value '.$value, 103);
-					}
-					if ($quota === 0) {
-						$quota = 'default';
-					}else if ($quota === -1) {
-						$quota = 'none';
-					} else {
-						$quota = \OCP\Util::humanFileSize($quota);
-					}
-				}
-				$targetUser->setQuota($quota);
-				break;
-			case 'password':
-				$targetUser->setPassword($value);
-				break;
-			case 'language':
-				$languagesCodes = $this->l10nFactory->findAvailableLanguages();
-				if (!in_array($value, $languagesCodes, true) && $value !== 'en') {
-					throw new OCSException('Invalid language', 102);
-				}
-				$this->config->setUserValue($targetUser->getUID(), 'core', 'lang', $value);
-				break;
-			case AccountManager::PROPERTY_EMAIL:
-				if (filter_var($value, FILTER_VALIDATE_EMAIL) || $value === '') {
-					$targetUser->setEMailAddress($value);
-				} else {
-					throw new OCSException('', 102);
-				}
-				break;
-			case AccountManager::PROPERTY_PHONE:
-			case AccountManager::PROPERTY_ADDRESS:
-			case AccountManager::PROPERTY_WEBSITE:
-			case AccountManager::PROPERTY_TWITTER:
-				$userAccount = $this->accountManager->getUser($targetUser);
-				if ($userAccount[$key]['value'] !== $value) {
-					$userAccount[$key]['value'] = $value;
-					$this->accountManager->updateUser($targetUser, $userAccount);
-				}
-				break;
-			default:
-				throw new OCSException('', 103);
-		}
-		return new DataResponse();
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function deleteUser(string $userId): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-
-		if ($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			throw new OCSException('', 101);
-		}
-
-		// If not permitted
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
-			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-		}
-
-		// Go ahead with the delete
-		if ($targetUser->delete()) {
-			return new DataResponse();
-		} else {
-			throw new OCSException('', 101);
-		}
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 * @throws OCSForbiddenException
-	 */
-	public function disableUser(string $userId): DataResponse {
-		return $this->setEnabled($userId, false);
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 * @throws OCSForbiddenException
-	 */
-	public function enableUser(string $userId): DataResponse {
-		return $this->setEnabled($userId, true);
-	}
-
-	/**
-	 * @param string $userId
-	 * @param bool $value
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	private function setEnabled(string $userId, bool $value): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			throw new OCSException('', 101);
-		}
-
-		// If not permitted
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
-			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-		}
-
-		// enable/disable the user now
-		$targetUser->setEnabled($value);
-		return new DataResponse();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getUsersGroups(string $userId): DataResponse {
-		$loggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null) {
-			throw new OCSException('', \OCP\API::RESPOND_NOT_FOUND);
-		}
-
-		if ($targetUser->getUID() === $loggedInUser->getUID() || $this->groupManager->isAdmin($loggedInUser->getUID())) {
-			// Self lookup or admin lookup
-			return new DataResponse([
-				'groups' => $this->groupManager->getUserGroupIds($targetUser)
-			]);
-		} else {
-			$subAdminManager = $this->groupManager->getSubAdmin();
-
-			// Looking up someone else
-			if ($subAdminManager->isUserAccessible($loggedInUser, $targetUser)) {
-				// Return the group that the method caller is subadmin of for the user in question
-				/** @var IGroup[] $getSubAdminsGroups */
-				$getSubAdminsGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
-				foreach ($getSubAdminsGroups as $key => $group) {
-					$getSubAdminsGroups[$key] = $group->getGID();
-				}
-				$groups = array_intersect(
-					$getSubAdminsGroups,
-					$this->groupManager->getUserGroupIds($targetUser)
-				);
-				return new DataResponse(['groups' => $groups]);
-			} else {
-				// Not permitted
-				throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-			}
-		}
-
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @param string $groupid
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function addToGroup(string $userId, string $groupid = ''): DataResponse {
-		if ($groupid === '') {
-			throw new OCSException('', 101);
-		}
-
-		$group = $this->groupManager->get($groupid);
-		$targetUser = $this->userManager->get($userId);
-		if ($group === null) {
-			throw new OCSException('', 102);
-		}
-		if ($targetUser === null) {
-			throw new OCSException('', 103);
-		}
-
-		// If they're not an admin, check they are a subadmin of the group in question
-		$loggedInUser = $this->userSession->getUser();
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if (!$this->groupManager->isAdmin($loggedInUser->getUID()) && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
-			throw new OCSException('', 104);
-		}
-
-		// Add user to group
-		$group->addUser($targetUser);
-		return new DataResponse();
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @param string $groupid
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function removeFromGroup(string $userId, string $groupid): DataResponse {
-		$loggedInUser = $this->userSession->getUser();
-
-		if ($groupid === null || trim($groupid) === '') {
-			throw new OCSException('', 101);
-		}
-
-		$group = $this->groupManager->get($groupid);
-		if ($group === null) {
-			throw new OCSException('', 102);
-		}
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null) {
-			throw new OCSException('', 103);
-		}
-
-		// If they're not an admin, check they are a subadmin of the group in question
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if (!$this->groupManager->isAdmin($loggedInUser->getUID()) && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
-			throw new OCSException('', 104);
-		}
-
-		// Check they aren't removing themselves from 'admin' or their 'subadmin; group
-		if ($targetUser->getUID() === $loggedInUser->getUID()) {
-			if ($this->groupManager->isAdmin($loggedInUser->getUID())) {
-				if ($group->getGID() === 'admin') {
-					throw new OCSException('Cannot remove yourself from the admin group', 105);
-				}
-			} else {
-				// Not an admin, so the user must be a subadmin of this group, but that is not allowed.
-				throw new OCSException('Cannot remove yourself from this group as you are a SubAdmin', 105);
-			}
-
-		} else if (!$this->groupManager->isAdmin($loggedInUser->getUID())) {
-			/** @var IGroup[] $subAdminGroups */
-			$subAdminGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
-			$subAdminGroups = array_map(function (IGroup $subAdminGroup) {
-				return $subAdminGroup->getGID();
-			}, $subAdminGroups);
-			$userGroups = $this->groupManager->getUserGroupIds($targetUser);
-			$userSubAdminGroups = array_intersect($subAdminGroups, $userGroups);
-
-			if (count($userSubAdminGroups) <= 1) {
-				// Subadmin must not be able to remove a user from all their subadmin groups.
-				throw new OCSException('Cannot remove user from this group as this is the only remaining group you are a SubAdmin of', 105);
-			}
-		}
-
-		// Remove user from group
-		$group->removeUser($targetUser);
-		return new DataResponse();
-	}
-
-	/**
-	 * Creates a subadmin
-	 *
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $userId
-	 * @param string $groupid
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function addSubAdmin(string $userId, string $groupid): DataResponse {
-		$group = $this->groupManager->get($groupid);
-		$user = $this->userManager->get($userId);
-
-		// Check if the user exists
-		if ($user === null) {
-			throw new OCSException('User does not exist', 101);
-		}
-		// Check if group exists
-		if ($group === null) {
-			throw new OCSException('Group does not exist',  102);
-		}
-		// Check if trying to make subadmin of admin group
-		if ($group->getGID() === 'admin') {
-			throw new OCSException('Cannot create subadmins for admin group', 103);
-		}
-
-		$subAdminManager = $this->groupManager->getSubAdmin();
-
-		// We cannot be subadmin twice
-		if ($subAdminManager->isSubAdminOfGroup($user, $group)) {
-			return new DataResponse();
-		}
-		// Go
-		if ($subAdminManager->createSubAdmin($user, $group)) {
-			return new DataResponse();
-		} else {
-			throw new OCSException('Unknown error occurred', 103);
-		}
-	}
-
-	/**
-	 * Removes a subadmin from a group
-	 *
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $userId
-	 * @param string $groupid
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function removeSubAdmin(string $userId, string $groupid): DataResponse {
-		$group = $this->groupManager->get($groupid);
-		$user = $this->userManager->get($userId);
-		$subAdminManager = $this->groupManager->getSubAdmin();
-
-		// Check if the user exists
-		if ($user === null) {
-			throw new OCSException('User does not exist', 101);
-		}
-		// Check if the group exists
-		if ($group === null) {
-			throw new OCSException('Group does not exist', 101);
-		}
-		// Check if they are a subadmin of this said group
-		if (!$subAdminManager->isSubAdminOfGroup($user, $group)) {
-			throw new OCSException('User is not a subadmin of this group', 102);
-		}
-
-		// Go
-		if ($subAdminManager->deleteSubAdmin($user, $group)) {
-			return new DataResponse();
-		} else {
-			throw new OCSException('Unknown error occurred', 103);
-		}
-	}
-
-	/**
-	 * Get the groups a user is a subadmin of
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getUserSubAdminGroups(string $userId): DataResponse {
-		$groups = $this->getUserSubAdminGroupsData($userId);
-		return new DataResponse($groups);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @PasswordConfirmationRequired
-	 *
-	 * resend welcome message
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function resendWelcomeMessage(string $userId): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null) {
-			throw new OCSException('', \OCP\API::RESPOND_NOT_FOUND);
-		}
-
-		// Check if admin / subadmin
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if (!$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
-			&& !$this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
-			// No rights
-			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-		}
-
-		$email = $targetUser->getEMailAddress();
-		if ($email === '' || $email === null) {
-			throw new OCSException('Email address not available', 101);
-		}
-		$username = $targetUser->getUID();
-		$lang = $this->config->getUserValue($username, 'core', 'lang', 'en');
-		if (!$this->l10nFactory->languageExists('settings', $lang)) {
-			$lang = 'en';
-		}
-
-		$l10n = $this->l10nFactory->get('settings', $lang);
-
-		try {
-			$this->newUserMailHelper->setL10N($l10n);
-			$emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, false);
-			$this->newUserMailHelper->sendMail($targetUser, $emailTemplate);
-		} catch(\Exception $e) {
-			$this->logger->logException($e, [
-				'message' => "Can't send new user mail to $email",
-				'level' => ILogger::ERROR,
-				'app' => 'settings',
-			]);
-			throw new OCSException('Sending email failed', 102);
-		}
-
-		return new DataResponse();
-	}
+    /** @var IAppManager */
+    private $appManager;
+    /** @var ILogger */
+    private $logger;
+    /** @var IFactory */
+    private $l10nFactory;
+    /** @var NewUserMailHelper */
+    private $newUserMailHelper;
+    /** @var FederatedFileSharingFactory */
+    private $federatedFileSharingFactory;
+    /** @var ISecureRandom */
+    private $secureRandom;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     * @param IAppManager $appManager
+     * @param IGroupManager $groupManager
+     * @param IUserSession $userSession
+     * @param AccountManager $accountManager
+     * @param ILogger $logger
+     * @param IFactory $l10nFactory
+     * @param NewUserMailHelper $newUserMailHelper
+     * @param FederatedFileSharingFactory $federatedFileSharingFactory
+     * @param ISecureRandom $secureRandom
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IUserManager $userManager,
+                                IConfig $config,
+                                IAppManager $appManager,
+                                IGroupManager $groupManager,
+                                IUserSession $userSession,
+                                AccountManager $accountManager,
+                                ILogger $logger,
+                                IFactory $l10nFactory,
+                                NewUserMailHelper $newUserMailHelper,
+                                FederatedFileSharingFactory $federatedFileSharingFactory,
+                                ISecureRandom $secureRandom) {
+        parent::__construct($appName,
+                            $request,
+                            $userManager,
+                            $config,
+                            $groupManager,
+                            $userSession,
+                            $accountManager);
+
+        $this->appManager = $appManager;
+        $this->logger = $logger;
+        $this->l10nFactory = $l10nFactory;
+        $this->newUserMailHelper = $newUserMailHelper;
+        $this->federatedFileSharingFactory = $federatedFileSharingFactory;
+        $this->secureRandom = $secureRandom;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * returns a list of users
+     *
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return DataResponse
+     */
+    public function getUsers(string $search = '', $limit = null, $offset = 0): DataResponse {
+        $user = $this->userSession->getUser();
+        $users = [];
+
+        // Admin? Or SubAdmin?
+        $uid = $user->getUID();
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if ($this->groupManager->isAdmin($uid)){
+            $users = $this->userManager->search($search, $limit, $offset);
+        } else if ($subAdminManager->isSubAdmin($user)) {
+            $subAdminOfGroups = $subAdminManager->getSubAdminsGroups($user);
+            foreach ($subAdminOfGroups as $key => $group) {
+                $subAdminOfGroups[$key] = $group->getGID();
+            }
+
+            $users = [];
+            foreach ($subAdminOfGroups as $group) {
+                $users = array_merge($users, $this->groupManager->displayNamesInGroup($group, $search, $limit, $offset));
+            }
+        }
+
+        $users = array_keys($users);
+
+        return new DataResponse([
+            'users' => $users
+        ]);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * returns a list of users and their data
+     */
+    public function getUsersDetails(string $search = '', $limit = null, $offset = 0): DataResponse {
+        $user = $this->userSession->getUser();
+        $users = [];
+
+        // Admin? Or SubAdmin?
+        $uid = $user->getUID();
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if ($this->groupManager->isAdmin($uid)){
+            $users = $this->userManager->search($search, $limit, $offset);
+        } else if ($subAdminManager->isSubAdmin($user)) {
+            $subAdminOfGroups = $subAdminManager->getSubAdminsGroups($user);
+            foreach ($subAdminOfGroups as $key => $group) {
+                $subAdminOfGroups[$key] = $group->getGID();
+            }
+
+            $users = [];
+            foreach ($subAdminOfGroups as $group) {
+                $users = array_merge($users, $this->groupManager->displayNamesInGroup($group, $search, $limit, $offset));
+            }
+        }
+
+        $users = array_keys($users);
+        $usersDetails = [];
+        foreach ($users as $key => $userId) {
+            $userData = $this->getUserData($userId);
+            // Do not insert empty entry
+            if (!empty($userData)) {
+                $usersDetails[$userId] = $userData;
+            }
+        }
+
+        return new DataResponse([
+            'users' => $usersDetails
+        ]);
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userid
+     * @param string $password
+     * @param string $email
+     * @param array $groups
+     * @param array $subadmins
+     * @param string $quota
+     * @param string $language
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function addUser(string $userid,
+                            string $password = '',
+                            string $email = '',
+                            array $groups = [],
+                            array $subadmin = [],
+                            string $quota = '',
+                            string $language = ''): DataResponse {
+        $user = $this->userSession->getUser();
+        $isAdmin = $this->groupManager->isAdmin($user->getUID());
+        $subAdminManager = $this->groupManager->getSubAdmin();
+
+        if ($this->userManager->userExists($userid)) {
+            $this->logger->error('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']);
+            throw new OCSException('User already exists', 102);
+        }
+
+        if ($groups !== []) {
+            foreach ($groups as $group) {
+                if (!$this->groupManager->groupExists($group)) {
+                    throw new OCSException('group '.$group.' does not exist', 104);
+                }
+                if (!$isAdmin && !$subAdminManager->isSubAdminOfGroup($user, $this->groupManager->get($group))) {
+                    throw new OCSException('insufficient privileges for group '. $group, 105);
+                }
+            }
+        } else {
+            if (!$isAdmin) {
+                throw new OCSException('no group specified (required for subadmins)', 106);
+            }
+        }
+
+        $subadminGroups = [];
+        if ($subadmin !== []) {
+            foreach ($subadmin as $groupid) {
+                $group = $this->groupManager->get($groupid);
+                // Check if group exists
+                if ($group === null) {
+                    throw new OCSException('Subadmin group does not exist',  102);
+                }
+                // Check if trying to make subadmin of admin group
+                if ($group->getGID() === 'admin') {
+                    throw new OCSException('Cannot create subadmins for admin group', 103);
+                }
+                // Check if has permission to promote subadmins
+                if (!$subAdminManager->isSubAdminOfGroup($user, $group) && !$isAdmin) {
+                    throw new OCSForbiddenException('No permissions to promote subadmins');
+                }
+                $subadminGroups[] = $group;
+            }
+        }
+
+        $generatePasswordResetToken = false;
+        if ($password === '') {
+            if ($email === '') {
+                throw new OCSException('To send a password link to the user an email address is required.', 108);
+            }
+
+            $password = $this->secureRandom->generate(10);
+            // Make sure we pass the password_policy
+            $password .= $this->secureRandom->generate(2, '$!.,;:-~+*[]{}()');
+            $generatePasswordResetToken = true;
+        }
+
+        try {
+            $newUser = $this->userManager->createUser($userid, $password);
+            $this->logger->info('Successful addUser call with userid: ' . $userid, ['app' => 'ocs_api']);
+
+            foreach ($groups as $group) {
+                $this->groupManager->get($group)->addUser($newUser);
+                $this->logger->info('Added userid ' . $userid . ' to group ' . $group, ['app' => 'ocs_api']);
+            }
+            foreach ($subadminGroups as $group) {
+                $subAdminManager->createSubAdmin($newUser, $group);
+            }
+
+            if ($quota !== '') {
+                $this->editUser($userid, 'quota', $quota);
+            }
+
+            if ($language !== '') {
+                $this->editUser($userid, 'language', $language);
+            }
+
+            // Send new user mail only if a mail is set
+            if ($email !== '') {
+                $newUser->setEMailAddress($email);
+                try {
+                    $emailTemplate = $this->newUserMailHelper->generateTemplate($newUser, $generatePasswordResetToken);
+                    $this->newUserMailHelper->sendMail($newUser, $emailTemplate);
+                } catch (\Exception $e) {
+                    $this->logger->logException($e, [
+                        'message' => "Can't send new user mail to $email",
+                        'level' => ILogger::ERROR,
+                        'app' => 'ocs_api',
+                    ]);
+                    throw new OCSException('Unable to send the invitation mail', 109);
+                }
+            }
+
+            return new DataResponse();
+
+        } catch (HintException $e ) {
+            $this->logger->logException($e, [
+                'message' => 'Failed addUser attempt with hint exception.',
+                'level' => ILogger::WARN,
+                'app' => 'ocs_api',
+            ]);
+            throw new OCSException($e->getHint(), 107);
+        } catch (\Exception $e) {
+            $this->logger->logException($e, [
+                'message' => 'Failed addUser attempt with exception.',
+                'level' => ILogger::ERROR,
+                'app' => 'ocs_api',
+            ]);
+            throw new OCSException('Bad request', 101);
+        }
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     *
+     * gets user info
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getUser(string $userId): DataResponse {
+        $data = $this->getUserData($userId);
+        // getUserData returns empty array if not enough permissions
+        if (empty($data)) {
+            throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+        }
+        return new DataResponse($data);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     *
+     * gets user info from the currently logged in user
+     *
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getCurrentUser(): DataResponse {
+        $user = $this->userSession->getUser();
+        if ($user) {
+            $data =  $this->getUserData($user->getUID());
+            // rename "displayname" to "display-name" only for this call to keep
+            // the API stable.
+            $data['display-name'] = $data['displayname'];
+            unset($data['displayname']);
+            return new DataResponse($data);
+
+        }
+
+        throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     */
+    public function getEditableFields(): DataResponse {
+        $permittedFields = [];
+
+        // Editing self (display, email)
+        if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
+            $permittedFields[] = AccountManager::PROPERTY_DISPLAYNAME;
+            $permittedFields[] = AccountManager::PROPERTY_EMAIL;
+        }
+
+        if ($this->appManager->isEnabledForUser('federatedfilesharing')) {
+            $federatedFileSharing = $this->federatedFileSharingFactory->get();
+            $shareProvider = $federatedFileSharing->getFederatedShareProvider();
+            if ($shareProvider->isLookupServerUploadEnabled()) {
+                $permittedFields[] = AccountManager::PROPERTY_PHONE;
+                $permittedFields[] = AccountManager::PROPERTY_ADDRESS;
+                $permittedFields[] = AccountManager::PROPERTY_WEBSITE;
+                $permittedFields[] = AccountManager::PROPERTY_TWITTER;
+            }
+        }
+
+        return new DataResponse($permittedFields);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     * @PasswordConfirmationRequired
+     *
+     * edit users
+     *
+     * @param string $userId
+     * @param string $key
+     * @param string $value
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function editUser(string $userId, string $key, string $value): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null) {
+            throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+        }
+
+        $permittedFields = [];
+        if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
+            // Editing self (display, email)
+            if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
+                $permittedFields[] = 'display';
+                $permittedFields[] = AccountManager::PROPERTY_DISPLAYNAME;
+                $permittedFields[] = AccountManager::PROPERTY_EMAIL;
+            }
+
+            $permittedFields[] = 'password';
+            if ($this->config->getSystemValue('force_language', false) === false ||
+                $this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
+                $permittedFields[] = 'language';
+            }
+
+            if ($this->appManager->isEnabledForUser('federatedfilesharing')) {
+                $federatedFileSharing = new \OCA\FederatedFileSharing\AppInfo\Application();
+                $shareProvider = $federatedFileSharing->getFederatedShareProvider();
+                if ($shareProvider->isLookupServerUploadEnabled()) {
+                    $permittedFields[] = AccountManager::PROPERTY_PHONE;
+                    $permittedFields[] = AccountManager::PROPERTY_ADDRESS;
+                    $permittedFields[] = AccountManager::PROPERTY_WEBSITE;
+                    $permittedFields[] = AccountManager::PROPERTY_TWITTER;
+                }
+            }
+
+            // If admin they can edit their own quota
+            if ($this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
+                $permittedFields[] = 'quota';
+            }
+        } else {
+            // Check if admin / subadmin
+            $subAdminManager = $this->groupManager->getSubAdmin();
+            if ($subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
+            || $this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
+                // They have permissions over the user
+                $permittedFields[] = 'display';
+                $permittedFields[] = AccountManager::PROPERTY_DISPLAYNAME;
+                $permittedFields[] = AccountManager::PROPERTY_EMAIL;
+                $permittedFields[] = 'password';
+                $permittedFields[] = 'language';
+                $permittedFields[] = AccountManager::PROPERTY_PHONE;
+                $permittedFields[] = AccountManager::PROPERTY_ADDRESS;
+                $permittedFields[] = AccountManager::PROPERTY_WEBSITE;
+                $permittedFields[] = AccountManager::PROPERTY_TWITTER;
+                $permittedFields[] = 'quota';
+            } else {
+                // No rights
+                throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+            }
+        }
+        // Check if permitted to edit this field
+        if (!in_array($key, $permittedFields)) {
+            throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+        }
+        // Process the edit
+        switch($key) {
+            case 'display':
+            case AccountManager::PROPERTY_DISPLAYNAME:
+                $targetUser->setDisplayName($value);
+                break;
+            case 'quota':
+                $quota = $value;
+                if ($quota !== 'none' && $quota !== 'default') {
+                    if (is_numeric($quota)) {
+                        $quota = (float) $quota;
+                    } else {
+                        $quota = \OCP\Util::computerFileSize($quota);
+                    }
+                    if ($quota === false) {
+                        throw new OCSException('Invalid quota value '.$value, 103);
+                    }
+                    if ($quota === 0) {
+                        $quota = 'default';
+                    }else if ($quota === -1) {
+                        $quota = 'none';
+                    } else {
+                        $quota = \OCP\Util::humanFileSize($quota);
+                    }
+                }
+                $targetUser->setQuota($quota);
+                break;
+            case 'password':
+                $targetUser->setPassword($value);
+                break;
+            case 'language':
+                $languagesCodes = $this->l10nFactory->findAvailableLanguages();
+                if (!in_array($value, $languagesCodes, true) && $value !== 'en') {
+                    throw new OCSException('Invalid language', 102);
+                }
+                $this->config->setUserValue($targetUser->getUID(), 'core', 'lang', $value);
+                break;
+            case AccountManager::PROPERTY_EMAIL:
+                if (filter_var($value, FILTER_VALIDATE_EMAIL) || $value === '') {
+                    $targetUser->setEMailAddress($value);
+                } else {
+                    throw new OCSException('', 102);
+                }
+                break;
+            case AccountManager::PROPERTY_PHONE:
+            case AccountManager::PROPERTY_ADDRESS:
+            case AccountManager::PROPERTY_WEBSITE:
+            case AccountManager::PROPERTY_TWITTER:
+                $userAccount = $this->accountManager->getUser($targetUser);
+                if ($userAccount[$key]['value'] !== $value) {
+                    $userAccount[$key]['value'] = $value;
+                    $this->accountManager->updateUser($targetUser, $userAccount);
+                }
+                break;
+            default:
+                throw new OCSException('', 103);
+        }
+        return new DataResponse();
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function deleteUser(string $userId): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+
+        if ($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
+            throw new OCSException('', 101);
+        }
+
+        // If not permitted
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
+            throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+        }
+
+        // Go ahead with the delete
+        if ($targetUser->delete()) {
+            return new DataResponse();
+        } else {
+            throw new OCSException('', 101);
+        }
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     * @throws OCSForbiddenException
+     */
+    public function disableUser(string $userId): DataResponse {
+        return $this->setEnabled($userId, false);
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     * @throws OCSForbiddenException
+     */
+    public function enableUser(string $userId): DataResponse {
+        return $this->setEnabled($userId, true);
+    }
+
+    /**
+     * @param string $userId
+     * @param bool $value
+     * @return DataResponse
+     * @throws OCSException
+     */
+    private function setEnabled(string $userId, bool $value): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
+            throw new OCSException('', 101);
+        }
+
+        // If not permitted
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
+            throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+        }
+
+        // enable/disable the user now
+        $targetUser->setEnabled($value);
+        return new DataResponse();
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getUsersGroups(string $userId): DataResponse {
+        $loggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null) {
+            throw new OCSException('', \OCP\API::RESPOND_NOT_FOUND);
+        }
+
+        if ($targetUser->getUID() === $loggedInUser->getUID() || $this->groupManager->isAdmin($loggedInUser->getUID())) {
+            // Self lookup or admin lookup
+            return new DataResponse([
+                'groups' => $this->groupManager->getUserGroupIds($targetUser)
+            ]);
+        } else {
+            $subAdminManager = $this->groupManager->getSubAdmin();
+
+            // Looking up someone else
+            if ($subAdminManager->isUserAccessible($loggedInUser, $targetUser)) {
+                // Return the group that the method caller is subadmin of for the user in question
+                /** @var IGroup[] $getSubAdminsGroups */
+                $getSubAdminsGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
+                foreach ($getSubAdminsGroups as $key => $group) {
+                    $getSubAdminsGroups[$key] = $group->getGID();
+                }
+                $groups = array_intersect(
+                    $getSubAdminsGroups,
+                    $this->groupManager->getUserGroupIds($targetUser)
+                );
+                return new DataResponse(['groups' => $groups]);
+            } else {
+                // Not permitted
+                throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+            }
+        }
+
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @param string $groupid
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function addToGroup(string $userId, string $groupid = ''): DataResponse {
+        if ($groupid === '') {
+            throw new OCSException('', 101);
+        }
+
+        $group = $this->groupManager->get($groupid);
+        $targetUser = $this->userManager->get($userId);
+        if ($group === null) {
+            throw new OCSException('', 102);
+        }
+        if ($targetUser === null) {
+            throw new OCSException('', 103);
+        }
+
+        // If they're not an admin, check they are a subadmin of the group in question
+        $loggedInUser = $this->userSession->getUser();
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if (!$this->groupManager->isAdmin($loggedInUser->getUID()) && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
+            throw new OCSException('', 104);
+        }
+
+        // Add user to group
+        $group->addUser($targetUser);
+        return new DataResponse();
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @param string $groupid
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function removeFromGroup(string $userId, string $groupid): DataResponse {
+        $loggedInUser = $this->userSession->getUser();
+
+        if ($groupid === null || trim($groupid) === '') {
+            throw new OCSException('', 101);
+        }
+
+        $group = $this->groupManager->get($groupid);
+        if ($group === null) {
+            throw new OCSException('', 102);
+        }
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null) {
+            throw new OCSException('', 103);
+        }
+
+        // If they're not an admin, check they are a subadmin of the group in question
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if (!$this->groupManager->isAdmin($loggedInUser->getUID()) && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
+            throw new OCSException('', 104);
+        }
+
+        // Check they aren't removing themselves from 'admin' or their 'subadmin; group
+        if ($targetUser->getUID() === $loggedInUser->getUID()) {
+            if ($this->groupManager->isAdmin($loggedInUser->getUID())) {
+                if ($group->getGID() === 'admin') {
+                    throw new OCSException('Cannot remove yourself from the admin group', 105);
+                }
+            } else {
+                // Not an admin, so the user must be a subadmin of this group, but that is not allowed.
+                throw new OCSException('Cannot remove yourself from this group as you are a SubAdmin', 105);
+            }
+
+        } else if (!$this->groupManager->isAdmin($loggedInUser->getUID())) {
+            /** @var IGroup[] $subAdminGroups */
+            $subAdminGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
+            $subAdminGroups = array_map(function (IGroup $subAdminGroup) {
+                return $subAdminGroup->getGID();
+            }, $subAdminGroups);
+            $userGroups = $this->groupManager->getUserGroupIds($targetUser);
+            $userSubAdminGroups = array_intersect($subAdminGroups, $userGroups);
+
+            if (count($userSubAdminGroups) <= 1) {
+                // Subadmin must not be able to remove a user from all their subadmin groups.
+                throw new OCSException('Cannot remove user from this group as this is the only remaining group you are a SubAdmin of', 105);
+            }
+        }
+
+        // Remove user from group
+        $group->removeUser($targetUser);
+        return new DataResponse();
+    }
+
+    /**
+     * Creates a subadmin
+     *
+     * @PasswordConfirmationRequired
+     *
+     * @param string $userId
+     * @param string $groupid
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function addSubAdmin(string $userId, string $groupid): DataResponse {
+        $group = $this->groupManager->get($groupid);
+        $user = $this->userManager->get($userId);
+
+        // Check if the user exists
+        if ($user === null) {
+            throw new OCSException('User does not exist', 101);
+        }
+        // Check if group exists
+        if ($group === null) {
+            throw new OCSException('Group does not exist',  102);
+        }
+        // Check if trying to make subadmin of admin group
+        if ($group->getGID() === 'admin') {
+            throw new OCSException('Cannot create subadmins for admin group', 103);
+        }
+
+        $subAdminManager = $this->groupManager->getSubAdmin();
+
+        // We cannot be subadmin twice
+        if ($subAdminManager->isSubAdminOfGroup($user, $group)) {
+            return new DataResponse();
+        }
+        // Go
+        if ($subAdminManager->createSubAdmin($user, $group)) {
+            return new DataResponse();
+        } else {
+            throw new OCSException('Unknown error occurred', 103);
+        }
+    }
+
+    /**
+     * Removes a subadmin from a group
+     *
+     * @PasswordConfirmationRequired
+     *
+     * @param string $userId
+     * @param string $groupid
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function removeSubAdmin(string $userId, string $groupid): DataResponse {
+        $group = $this->groupManager->get($groupid);
+        $user = $this->userManager->get($userId);
+        $subAdminManager = $this->groupManager->getSubAdmin();
+
+        // Check if the user exists
+        if ($user === null) {
+            throw new OCSException('User does not exist', 101);
+        }
+        // Check if the group exists
+        if ($group === null) {
+            throw new OCSException('Group does not exist', 101);
+        }
+        // Check if they are a subadmin of this said group
+        if (!$subAdminManager->isSubAdminOfGroup($user, $group)) {
+            throw new OCSException('User is not a subadmin of this group', 102);
+        }
+
+        // Go
+        if ($subAdminManager->deleteSubAdmin($user, $group)) {
+            return new DataResponse();
+        } else {
+            throw new OCSException('Unknown error occurred', 103);
+        }
+    }
+
+    /**
+     * Get the groups a user is a subadmin of
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getUserSubAdminGroups(string $userId): DataResponse {
+        $groups = $this->getUserSubAdminGroupsData($userId);
+        return new DataResponse($groups);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @PasswordConfirmationRequired
+     *
+     * resend welcome message
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function resendWelcomeMessage(string $userId): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null) {
+            throw new OCSException('', \OCP\API::RESPOND_NOT_FOUND);
+        }
+
+        // Check if admin / subadmin
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if (!$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
+            && !$this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
+            // No rights
+            throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+        }
+
+        $email = $targetUser->getEMailAddress();
+        if ($email === '' || $email === null) {
+            throw new OCSException('Email address not available', 101);
+        }
+        $username = $targetUser->getUID();
+        $lang = $this->config->getUserValue($username, 'core', 'lang', 'en');
+        if (!$this->l10nFactory->languageExists('settings', $lang)) {
+            $lang = 'en';
+        }
+
+        $l10n = $this->l10nFactory->get('settings', $lang);
+
+        try {
+            $this->newUserMailHelper->setL10N($l10n);
+            $emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, false);
+            $this->newUserMailHelper->sendMail($targetUser, $emailTemplate);
+        } catch(\Exception $e) {
+            $this->logger->logException($e, [
+                'message' => "Can't send new user mail to $email",
+                'level' => ILogger::ERROR,
+                'app' => 'settings',
+            ]);
+            throw new OCSException('Sending email failed', 102);
+        }
+
+        return new DataResponse();
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -126,7 +126,7 @@ 
 		// Admin? Or SubAdmin?
 		$uid = $user->getUID();
 		$subAdminManager = $this->groupManager->getSubAdmin();
-		if ($this->groupManager->isAdmin($uid)){
+		if ($this->groupManager->isAdmin($uid)) {
 			$users = $this->userManager->search($search, $limit, $offset);
 		} else if ($subAdminManager->isSubAdmin($user)) {
 			$subAdminOfGroups = $subAdminManager->getSubAdminsGroups($user);
@@ -159,7 +159,7 @@ 
 		// Admin? Or SubAdmin?
 		$uid = $user->getUID();
 		$subAdminManager = $this->groupManager->getSubAdmin();
-		if ($this->groupManager->isAdmin($uid)){
+		if ($this->groupManager->isAdmin($uid)) {
 			$users = $this->userManager->search($search, $limit, $offset);
 		} else if ($subAdminManager->isSubAdmin($user)) {
 			$subAdminOfGroups = $subAdminManager->getSubAdminsGroups($user);
@@ -224,7 +224,7 @@ 
 					throw new OCSException('group '.$group.' does not exist', 104);
 				}
 				if (!$isAdmin && !$subAdminManager->isSubAdminOfGroup($user, $this->groupManager->get($group))) {
-					throw new OCSException('insufficient privileges for group '. $group, 105);
+					throw new OCSException('insufficient privileges for group '.$group, 105);
 				}
 			}
 		} else {
@@ -239,7 +239,7 @@ 
 				$group = $this->groupManager->get($groupid);
 				// Check if group exists
 				if ($group === null) {
-					throw new OCSException('Subadmin group does not exist',  102);
+					throw new OCSException('Subadmin group does not exist', 102);
 				}
 				// Check if trying to make subadmin of admin group
 				if ($group->getGID() === 'admin') {
@@ -267,11 +267,11 @@ 
 
 		try {
 			$newUser = $this->userManager->createUser($userid, $password);
-			$this->logger->info('Successful addUser call with userid: ' . $userid, ['app' => 'ocs_api']);
+			$this->logger->info('Successful addUser call with userid: '.$userid, ['app' => 'ocs_api']);
 
 			foreach ($groups as $group) {
 				$this->groupManager->get($group)->addUser($newUser);
-				$this->logger->info('Added userid ' . $userid . ' to group ' . $group, ['app' => 'ocs_api']);
+				$this->logger->info('Added userid '.$userid.' to group '.$group, ['app' => 'ocs_api']);
 			}
 			foreach ($subadminGroups as $group) {
 				$subAdminManager->createSubAdmin($newUser, $group);
@@ -303,7 +303,7 @@ 
 
 			return new DataResponse();
 
-		} catch (HintException $e ) {
+		} catch (HintException $e) {
 			$this->logger->logException($e, [
 				'message' => 'Failed addUser attempt with hint exception.',
 				'level' => ILogger::WARN,
@@ -351,7 +351,7 @@ 
 	public function getCurrentUser(): DataResponse {
 		$user = $this->userSession->getUser();
 		if ($user) {
-			$data =  $this->getUserData($user->getUID());
+			$data = $this->getUserData($user->getUID());
 			// rename "displayname" to "display-name" only for this call to keep
 			// the API stable.
 			$data['display-name'] = $data['displayname'];
@@ -467,7 +467,7 @@ 
 			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
 		}
 		// Process the edit
-		switch($key) {
+		switch ($key) {
 			case 'display':
 			case AccountManager::PROPERTY_DISPLAYNAME:
 				$targetUser->setDisplayName($value);
@@ -485,7 +485,7 @@ 
 					}
 					if ($quota === 0) {
 						$quota = 'default';
-					}else if ($quota === -1) {
+					} else if ($quota === -1) {
 						$quota = 'none';
 					} else {
 						$quota = \OCP\Util::humanFileSize($quota);
@@ -734,7 +734,7 @@ 
 		} else if (!$this->groupManager->isAdmin($loggedInUser->getUID())) {
 			/** @var IGroup[] $subAdminGroups */
 			$subAdminGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
-			$subAdminGroups = array_map(function (IGroup $subAdminGroup) {
+			$subAdminGroups = array_map(function(IGroup $subAdminGroup) {
 				return $subAdminGroup->getGID();
 			}, $subAdminGroups);
 			$userGroups = $this->groupManager->getUserGroupIds($targetUser);
@@ -771,7 +771,7 @@ 
 		}
 		// Check if group exists
 		if ($group === null) {
-			throw new OCSException('Group does not exist',  102);
+			throw new OCSException('Group does not exist', 102);
 		}
 		// Check if trying to make subadmin of admin group
 		if ($group->getGID() === 'admin') {
@@ -882,7 +882,7 @@ 
 			$this->newUserMailHelper->setL10N($l10n);
 			$emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, false);
 			$this->newUserMailHelper->sendMail($targetUser, $emailTemplate);
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			$this->logger->logException($e, [
 				'message' => "Can't send new user mail to $email",
 				'level' => ILogger::ERROR,

apps/files_external/lib/Service/LegacyStoragesService.php

Indentation +171 added lines, -171 removed lines

@@ -31,179 +31,179 @@
  * Read mount config from legacy mount.json
  */
 abstract class LegacyStoragesService {
-	/** @var BackendService */
-	protected $backendService;
+    /** @var BackendService */
+    protected $backendService;
 
-	/**
-	 * Read legacy config data
-	 *
-	 * @return array list of mount configs
-	 */
-	abstract protected function readLegacyConfig();
+    /**
+     * Read legacy config data
+     *
+     * @return array list of mount configs
+     */
+    abstract protected function readLegacyConfig();
 
-	/**
-	 * Copy legacy storage options into the given storage config object.
-	 *
-	 * @param StorageConfig $storageConfig storage config to populate
-	 * @param string $mountType mount type
-	 * @param string $applicable applicable user or group
-	 * @param array $storageOptions legacy storage options
-	 *
-	 * @return StorageConfig populated storage config
-	 */
-	protected function populateStorageConfigWithLegacyOptions(
-		&$storageConfig,
-		$mountType,
-		$applicable,
-		$storageOptions
-	) {
-		$backend = $this->backendService->getBackend($storageOptions['backend']);
-		if (!$backend) {
-			throw new \UnexpectedValueException('Invalid backend ' . $storageOptions['backend']);
-		}
-		$storageConfig->setBackend($backend);
-		if (isset($storageOptions['authMechanism']) && $storageOptions['authMechanism'] !== 'builtin::builtin') {
-			$authMechanism = $this->backendService->getAuthMechanism($storageOptions['authMechanism']);
-		} else {
-			$authMechanism = $backend->getLegacyAuthMechanism($storageOptions);
-			$storageOptions['authMechanism'] = 'null'; // to make error handling easier
-		}
-		if (!$authMechanism) {
-			throw new \UnexpectedValueException('Invalid authentication mechanism ' . $storageOptions['authMechanism']);
-		}
-		$storageConfig->setAuthMechanism($authMechanism);
-		$storageConfig->setBackendOptions($storageOptions['options']);
-		if (isset($storageOptions['mountOptions'])) {
-			$storageConfig->setMountOptions($storageOptions['mountOptions']);
-		}
-		if (!isset($storageOptions['priority'])) {
-			$storageOptions['priority'] = $backend->getPriority();
-		}
-		$storageConfig->setPriority($storageOptions['priority']);
-		if ($mountType === \OC_Mount_Config::MOUNT_TYPE_USER) {
-			$applicableUsers = $storageConfig->getApplicableUsers();
-			if ($applicable !== 'all') {
-				$applicableUsers[] = $applicable;
-				$storageConfig->setApplicableUsers($applicableUsers);
-			}
-		} else if ($mountType === \OC_Mount_Config::MOUNT_TYPE_GROUP) {
-			$applicableGroups = $storageConfig->getApplicableGroups();
-			$applicableGroups[] = $applicable;
-			$storageConfig->setApplicableGroups($applicableGroups);
-		}
-		return $storageConfig;
-	}
+    /**
+     * Copy legacy storage options into the given storage config object.
+     *
+     * @param StorageConfig $storageConfig storage config to populate
+     * @param string $mountType mount type
+     * @param string $applicable applicable user or group
+     * @param array $storageOptions legacy storage options
+     *
+     * @return StorageConfig populated storage config
+     */
+    protected function populateStorageConfigWithLegacyOptions(
+        &$storageConfig,
+        $mountType,
+        $applicable,
+        $storageOptions
+    ) {
+        $backend = $this->backendService->getBackend($storageOptions['backend']);
+        if (!$backend) {
+            throw new \UnexpectedValueException('Invalid backend ' . $storageOptions['backend']);
+        }
+        $storageConfig->setBackend($backend);
+        if (isset($storageOptions['authMechanism']) && $storageOptions['authMechanism'] !== 'builtin::builtin') {
+            $authMechanism = $this->backendService->getAuthMechanism($storageOptions['authMechanism']);
+        } else {
+            $authMechanism = $backend->getLegacyAuthMechanism($storageOptions);
+            $storageOptions['authMechanism'] = 'null'; // to make error handling easier
+        }
+        if (!$authMechanism) {
+            throw new \UnexpectedValueException('Invalid authentication mechanism ' . $storageOptions['authMechanism']);
+        }
+        $storageConfig->setAuthMechanism($authMechanism);
+        $storageConfig->setBackendOptions($storageOptions['options']);
+        if (isset($storageOptions['mountOptions'])) {
+            $storageConfig->setMountOptions($storageOptions['mountOptions']);
+        }
+        if (!isset($storageOptions['priority'])) {
+            $storageOptions['priority'] = $backend->getPriority();
+        }
+        $storageConfig->setPriority($storageOptions['priority']);
+        if ($mountType === \OC_Mount_Config::MOUNT_TYPE_USER) {
+            $applicableUsers = $storageConfig->getApplicableUsers();
+            if ($applicable !== 'all') {
+                $applicableUsers[] = $applicable;
+                $storageConfig->setApplicableUsers($applicableUsers);
+            }
+        } else if ($mountType === \OC_Mount_Config::MOUNT_TYPE_GROUP) {
+            $applicableGroups = $storageConfig->getApplicableGroups();
+            $applicableGroups[] = $applicable;
+            $storageConfig->setApplicableGroups($applicableGroups);
+        }
+        return $storageConfig;
+    }
 
-	/**
-	 * Read the external storages config
-	 *
-	 * @return StorageConfig[] map of storage id to storage config
-	 */
-	public function getAllStorages() {
-		$mountPoints = $this->readLegacyConfig();
-		/**
-		 * Here is the how the horribly messy mount point array looks like
-		 * from the mount.json file:
-		 *
-		 * $storageOptions = $mountPoints[$mountType][$applicable][$mountPath]
-		 *
-		 * - $mountType is either "user" or "group"
-		 * - $applicable is the name of a user or group (or the current user for personal mounts)
-		 * - $mountPath is the mount point path (where the storage must be mounted)
-		 * - $storageOptions is a map of storage options:
-		 *     - "priority": storage priority
-		 *     - "backend": backend identifier
-		 *     - "class": LEGACY backend class name
-		 *     - "options": backend-specific options
-		 *     - "authMechanism": authentication mechanism identifier
-		 *     - "mountOptions": mount-specific options (ex: disable previews, scanner, etc)
-		 */
-		// group by storage id
-		/** @var StorageConfig[] $storages */
-		$storages = [];
-		// for storages without id (legacy), group by config hash for
-		// later processing
-		$storagesWithConfigHash = [];
-		foreach ($mountPoints as $mountType => $applicables) {
-			foreach ($applicables as $applicable => $mountPaths) {
-				foreach ($mountPaths as $rootMountPath => $storageOptions) {
-					$currentStorage = null;
-					/**
-					 * Flag whether the config that was read already has an id.
-					 * If not, it will use a config hash instead and generate
-					 * a proper id later
-					 *
-					 * @var boolean
-					 */
-					$hasId = false;
-					// the root mount point is in the format "/$user/files/the/mount/point"
-					// we remove the "/$user/files" prefix
-					$parts = explode('/', ltrim($rootMountPath, '/'), 3);
-					if (count($parts) < 3) {
-						// something went wrong, skip
-						\OC::$server->getLogger()->error('Could not parse mount point "' . $rootMountPath . '"', ['app' => 'files_external']);
-						continue;
-					}
-					$relativeMountPath = rtrim($parts[2], '/');
-					// note: we cannot do this after the loop because the decrypted config
-					// options might be needed for the config hash
-					$storageOptions['options'] = \OC_Mount_Config::decryptPasswords($storageOptions['options']);
-					if (!isset($storageOptions['backend'])) {
-						$storageOptions['backend'] = $storageOptions['class']; // legacy compat
-					}
-					if (!isset($storageOptions['authMechanism'])) {
-						$storageOptions['authMechanism'] = null; // ensure config hash works
-					}
-					if (isset($storageOptions['id'])) {
-						$configId = (int)$storageOptions['id'];
-						if (isset($storages[$configId])) {
-							$currentStorage = $storages[$configId];
-						}
-						$hasId = true;
-					} else {
-						// missing id in legacy config, need to generate
-						// but at this point we don't know the max-id, so use
-						// first group it by config hash
-						$storageOptions['mountpoint'] = $rootMountPath;
-						$configId = \OC_Mount_Config::makeConfigHash($storageOptions);
-						if (isset($storagesWithConfigHash[$configId])) {
-							$currentStorage = $storagesWithConfigHash[$configId];
-						}
-					}
-					if (is_null($currentStorage)) {
-						// create new
-						$currentStorage = new StorageConfig($configId);
-						$currentStorage->setMountPoint($relativeMountPath);
-					}
-					try {
-						$this->populateStorageConfigWithLegacyOptions(
-							$currentStorage,
-							$mountType,
-							$applicable,
-							$storageOptions
-						);
-						if ($hasId) {
-							$storages[$configId] = $currentStorage;
-						} else {
-							$storagesWithConfigHash[$configId] = $currentStorage;
-						}
-					} catch (\UnexpectedValueException $e) {
-						// don't die if a storage backend doesn't exist
-						\OC::$server->getLogger()->logException($e, [
-							'message' => 'Could not load storage.',
-							'level' => ILogger::ERROR,
-							'app' => 'files_external',
-						]);
-					}
-				}
-			}
-		}
+    /**
+     * Read the external storages config
+     *
+     * @return StorageConfig[] map of storage id to storage config
+     */
+    public function getAllStorages() {
+        $mountPoints = $this->readLegacyConfig();
+        /**
+         * Here is the how the horribly messy mount point array looks like
+         * from the mount.json file:
+         *
+         * $storageOptions = $mountPoints[$mountType][$applicable][$mountPath]
+         *
+         * - $mountType is either "user" or "group"
+         * - $applicable is the name of a user or group (or the current user for personal mounts)
+         * - $mountPath is the mount point path (where the storage must be mounted)
+         * - $storageOptions is a map of storage options:
+         *     - "priority": storage priority
+         *     - "backend": backend identifier
+         *     - "class": LEGACY backend class name
+         *     - "options": backend-specific options
+         *     - "authMechanism": authentication mechanism identifier
+         *     - "mountOptions": mount-specific options (ex: disable previews, scanner, etc)
+         */
+        // group by storage id
+        /** @var StorageConfig[] $storages */
+        $storages = [];
+        // for storages without id (legacy), group by config hash for
+        // later processing
+        $storagesWithConfigHash = [];
+        foreach ($mountPoints as $mountType => $applicables) {
+            foreach ($applicables as $applicable => $mountPaths) {
+                foreach ($mountPaths as $rootMountPath => $storageOptions) {
+                    $currentStorage = null;
+                    /**
+                     * Flag whether the config that was read already has an id.
+                     * If not, it will use a config hash instead and generate
+                     * a proper id later
+                     *
+                     * @var boolean
+                     */
+                    $hasId = false;
+                    // the root mount point is in the format "/$user/files/the/mount/point"
+                    // we remove the "/$user/files" prefix
+                    $parts = explode('/', ltrim($rootMountPath, '/'), 3);
+                    if (count($parts) < 3) {
+                        // something went wrong, skip
+                        \OC::$server->getLogger()->error('Could not parse mount point "' . $rootMountPath . '"', ['app' => 'files_external']);
+                        continue;
+                    }
+                    $relativeMountPath = rtrim($parts[2], '/');
+                    // note: we cannot do this after the loop because the decrypted config
+                    // options might be needed for the config hash
+                    $storageOptions['options'] = \OC_Mount_Config::decryptPasswords($storageOptions['options']);
+                    if (!isset($storageOptions['backend'])) {
+                        $storageOptions['backend'] = $storageOptions['class']; // legacy compat
+                    }
+                    if (!isset($storageOptions['authMechanism'])) {
+                        $storageOptions['authMechanism'] = null; // ensure config hash works
+                    }
+                    if (isset($storageOptions['id'])) {
+                        $configId = (int)$storageOptions['id'];
+                        if (isset($storages[$configId])) {
+                            $currentStorage = $storages[$configId];
+                        }
+                        $hasId = true;
+                    } else {
+                        // missing id in legacy config, need to generate
+                        // but at this point we don't know the max-id, so use
+                        // first group it by config hash
+                        $storageOptions['mountpoint'] = $rootMountPath;
+                        $configId = \OC_Mount_Config::makeConfigHash($storageOptions);
+                        if (isset($storagesWithConfigHash[$configId])) {
+                            $currentStorage = $storagesWithConfigHash[$configId];
+                        }
+                    }
+                    if (is_null($currentStorage)) {
+                        // create new
+                        $currentStorage = new StorageConfig($configId);
+                        $currentStorage->setMountPoint($relativeMountPath);
+                    }
+                    try {
+                        $this->populateStorageConfigWithLegacyOptions(
+                            $currentStorage,
+                            $mountType,
+                            $applicable,
+                            $storageOptions
+                        );
+                        if ($hasId) {
+                            $storages[$configId] = $currentStorage;
+                        } else {
+                            $storagesWithConfigHash[$configId] = $currentStorage;
+                        }
+                    } catch (\UnexpectedValueException $e) {
+                        // don't die if a storage backend doesn't exist
+                        \OC::$server->getLogger()->logException($e, [
+                            'message' => 'Could not load storage.',
+                            'level' => ILogger::ERROR,
+                            'app' => 'files_external',
+                        ]);
+                    }
+                }
+            }
+        }
 
-		// convert parameter values
-		foreach ($storages as $storage) {
-			$storage->getBackend()->validateStorageDefinition($storage);
-			$storage->getAuthMechanism()->validateStorageDefinition($storage);
-		}
-		return $storages;
-	}
+        // convert parameter values
+        foreach ($storages as $storage) {
+            $storage->getBackend()->validateStorageDefinition($storage);
+            $storage->getAuthMechanism()->validateStorageDefinition($storage);
+        }
+        return $storages;
+    }
 }