nextcloud / server

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

Indentation +20 added lines, -20 removed lines

@@ -25,26 +25,26 @@
 
 class EnterpriseBundle extends Bundle {
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName(): string {
-		return $this->l10n->t('Enterprise bundle');
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getName(): string {
+        return $this->l10n->t('Enterprise bundle');
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getAppIdentifiers(): array {
-		return [
-			'admin_audit',
-			'user_ldap',
-			'files_retention',
-			'files_automatedtagging',
-			'user_saml',
-			'files_accesscontrol',
-			'terms_of_service',
-		];
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getAppIdentifiers(): array {
+        return [
+            'admin_audit',
+            'user_ldap',
+            'files_retention',
+            'files_automatedtagging',
+            'user_saml',
+            'files_accesscontrol',
+            'terms_of_service',
+        ];
+    }
 
 }

apps/twofactor_backupcodes/lib/Migration/Version1002Date20180821043638.php

Indentation +16 added lines, -16 removed lines

@@ -31,21 +31,21 @@
 
 class Version1002Date20180821043638 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 *
-	 * @return ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-		$table = $schema->getTable('twofactor_backupcodes');
-
-		$table->getColumn('code')->setLength(128);
-
-		return $schema;
-	}
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     *
+     * @return ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+        $table = $schema->getTable('twofactor_backupcodes');
+
+        $table->getColumn('code')->setLength(128);
+
+        return $schema;
+    }
 
 }

apps/files_sharing/lib/SharedMount.php

Spacing +10 added lines, -10 removed lines

@@ -75,7 +75,7 @@ 
 		$this->groupedShares = $arguments['groupedShares'];
 
 		$newMountPoint = $this->verifyMountPoint($this->superShare, $mountpoints, $folderExistCache);
-		$absMountPoint = '/' . $this->user . '/files' . $newMountPoint;
+		$absMountPoint = '/'.$this->user.'/files'.$newMountPoint;
 		parent::__construct($storage, $absMountPoint, $arguments, $loader);
 	}
 
@@ -102,7 +102,7 @@ 
 		}
 
 		$newMountPoint = $this->generateUniqueTarget(
-			\OC\Files\Filesystem::normalizePath($parent . '/' . $mountPoint),
+			\OC\Files\Filesystem::normalizePath($parent.'/'.$mountPoint),
 			$this->recipientView,
 			$mountpoints
 		);
@@ -139,15 +139,15 @@ 
 	 */
 	private function generateUniqueTarget($path, $view, array $mountpoints) {
 		$pathinfo = pathinfo($path);
-		$ext = isset($pathinfo['extension']) ? '.' . $pathinfo['extension'] : '';
+		$ext = isset($pathinfo['extension']) ? '.'.$pathinfo['extension'] : '';
 		$name = $pathinfo['filename'];
 		$dir = $pathinfo['dirname'];
 
 		$i = 2;
-		$absolutePath = $this->recipientView->getAbsolutePath($path) . '/';
+		$absolutePath = $this->recipientView->getAbsolutePath($path).'/';
 		while ($view->file_exists($path) || isset($mountpoints[$absolutePath])) {
-			$path = Filesystem::normalizePath($dir . '/' . $name . ' (' . $i . ')' . $ext);
-			$absolutePath = $this->recipientView->getAbsolutePath($path) . '/';
+			$path = Filesystem::normalizePath($dir.'/'.$name.' ('.$i.')'.$ext);
+			$absolutePath = $this->recipientView->getAbsolutePath($path).'/';
 			$i++;
 		}
 
@@ -167,7 +167,7 @@ 
 
 		// it is not a file relative to data/user/files
 		if (count($split) < 3 || $split[1] !== 'files') {
-			\OC::$server->getLogger()->error('Can not strip userid and "files/" from path: ' . $path, ['app' => 'files_sharing']);
+			\OC::$server->getLogger()->error('Can not strip userid and "files/" from path: '.$path, ['app' => 'files_sharing']);
 			throw new \OCA\Files_Sharing\Exceptions\BrokenPath('Path does not start with /user/files', 10);
 		}
 
@@ -175,7 +175,7 @@ 
 		$sliced = array_slice($split, 2);
 		$relPath = implode('/', $sliced);
 
-		return '/' . $relPath;
+		return '/'.$relPath;
 	}
 
 	/**
@@ -196,7 +196,7 @@ 
 			$this->setMountPoint($target);
 			$this->storage->setMountPoint($relTargetPath);
 		} catch (\Exception $e) {
-			\OC::$server->getLogger()->logException($e, ['app' => 'files_sharing', 'message' => 'Could not rename mount point for shared folder "' . $this->getMountPoint() . '" to "' . $target . '"']);
+			\OC::$server->getLogger()->logException($e, ['app' => 'files_sharing', 'message' => 'Could not rename mount point for shared folder "'.$this->getMountPoint().'" to "'.$target.'"']);
 		}
 
 		return $result;
@@ -250,7 +250,7 @@ 
 			$row = $result->fetch();
 			$result->closeCursor();
 			if ($row) {
-				return (int)$row['storage'];
+				return (int) $row['storage'];
 			}
 			return -1;
 		}

Indentation +224 added lines, -224 removed lines

@@ -41,228 +41,228 @@
  * Shared mount points can be moved by the user
  */
 class SharedMount extends MountPoint implements MoveableMount {
-	/**
-	 * @var \OCA\Files_Sharing\SharedStorage $storage
-	 */
-	protected $storage = null;
-
-	/**
-	 * @var \OC\Files\View
-	 */
-	private $recipientView;
-
-	/**
-	 * @var string
-	 */
-	private $user;
-
-	/** @var \OCP\Share\IShare */
-	private $superShare;
-
-	/** @var \OCP\Share\IShare[] */
-	private $groupedShares;
-
-	/**
-	 * @param string $storage
-	 * @param SharedMount[] $mountpoints
-	 * @param array $arguments
-	 * @param IStorageFactory $loader
-	 * @param View $recipientView
-	 */
-	public function __construct($storage, array $mountpoints, $arguments, IStorageFactory $loader, View $recipientView, CappedMemoryCache $folderExistCache) {
-		$this->user = $arguments['user'];
-		$this->recipientView = $recipientView;
-
-		$this->superShare = $arguments['superShare'];
-		$this->groupedShares = $arguments['groupedShares'];
-
-		$newMountPoint = $this->verifyMountPoint($this->superShare, $mountpoints, $folderExistCache);
-		$absMountPoint = '/' . $this->user . '/files' . $newMountPoint;
-		parent::__construct($storage, $absMountPoint, $arguments, $loader);
-	}
-
-	/**
-	 * check if the parent folder exists otherwise move the mount point up
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @param SharedMount[] $mountpoints
-	 * @return string
-	 */
-	private function verifyMountPoint(\OCP\Share\IShare $share, array $mountpoints, CappedMemoryCache $folderExistCache) {
-		$mountPoint = basename($share->getTarget());
-		$parent = dirname($share->getTarget());
-
-		$event = new VerifyMountPointEvent($share, $this->recipientView, $parent);
-		/** @var IEventDispatcher $dispatcher */
-		$dispatcher = \OC::$server->query(IEventDispatcher::class);
-		$dispatcher->dispatchTyped($event);
-		$parent = $event->getParent();
-
-		if ($folderExistCache->hasKey($parent)) {
-			$parentExists = $folderExistCache->get($parent);
-		} else {
-			$parentExists = $this->recipientView->is_dir($parent);
-			$folderExistCache->set($parent, $parentExists);
-		}
-		if (!$parentExists) {
-			$parent = Helper::getShareFolder($this->recipientView);
-		}
-
-		$newMountPoint = $this->generateUniqueTarget(
-			\OC\Files\Filesystem::normalizePath($parent . '/' . $mountPoint),
-			$this->recipientView,
-			$mountpoints
-		);
-
-		if ($newMountPoint !== $share->getTarget()) {
-			$this->updateFileTarget($newMountPoint, $share);
-		}
-
-		return $newMountPoint;
-	}
-
-	/**
-	 * update fileTarget in the database if the mount point changed
-	 *
-	 * @param string $newPath
-	 * @param \OCP\Share\IShare $share
-	 * @return bool
-	 */
-	private function updateFileTarget($newPath, &$share) {
-		$share->setTarget($newPath);
-
-		foreach ($this->groupedShares as $tmpShare) {
-			$tmpShare->setTarget($newPath);
-			\OC::$server->getShareManager()->moveShare($tmpShare, $this->user);
-		}
-	}
-
-
-	/**
-	 * @param string $path
-	 * @param View $view
-	 * @param SharedMount[] $mountpoints
-	 * @return mixed
-	 */
-	private function generateUniqueTarget($path, $view, array $mountpoints) {
-		$pathinfo = pathinfo($path);
-		$ext = isset($pathinfo['extension']) ? '.' . $pathinfo['extension'] : '';
-		$name = $pathinfo['filename'];
-		$dir = $pathinfo['dirname'];
-
-		$i = 2;
-		$absolutePath = $this->recipientView->getAbsolutePath($path) . '/';
-		while ($view->file_exists($path) || isset($mountpoints[$absolutePath])) {
-			$path = Filesystem::normalizePath($dir . '/' . $name . ' (' . $i . ')' . $ext);
-			$absolutePath = $this->recipientView->getAbsolutePath($path) . '/';
-			$i++;
-		}
-
-		return $path;
-	}
-
-	/**
-	 * Format a path to be relative to the /user/files/ directory
-	 *
-	 * @param string $path the absolute path
-	 * @return string e.g. turns '/admin/files/test.txt' into '/test.txt'
-	 * @throws \OCA\Files_Sharing\Exceptions\BrokenPath
-	 */
-	protected function stripUserFilesPath($path) {
-		$trimmed = ltrim($path, '/');
-		$split = explode('/', $trimmed);
-
-		// it is not a file relative to data/user/files
-		if (count($split) < 3 || $split[1] !== 'files') {
-			\OC::$server->getLogger()->error('Can not strip userid and "files/" from path: ' . $path, ['app' => 'files_sharing']);
-			throw new \OCA\Files_Sharing\Exceptions\BrokenPath('Path does not start with /user/files', 10);
-		}
-
-		// skip 'user' and 'files'
-		$sliced = array_slice($split, 2);
-		$relPath = implode('/', $sliced);
-
-		return '/' . $relPath;
-	}
-
-	/**
-	 * Move the mount point to $target
-	 *
-	 * @param string $target the target mount point
-	 * @return bool
-	 */
-	public function moveMount($target) {
-		$relTargetPath = $this->stripUserFilesPath($target);
-		$share = $this->storage->getShare();
-
-		$result = true;
-
-		try {
-			$this->updateFileTarget($relTargetPath, $share);
-			$this->setMountPoint($target);
-			$this->storage->setMountPoint($relTargetPath);
-		} catch (\Exception $e) {
-			\OC::$server->getLogger()->logException($e, ['app' => 'files_sharing', 'message' => 'Could not rename mount point for shared folder "' . $this->getMountPoint() . '" to "' . $target . '"']);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Remove the mount points
-	 *
-	 * @return bool
-	 */
-	public function removeMount() {
-		$mountManager = \OC\Files\Filesystem::getMountManager();
-		/** @var \OCA\Files_Sharing\SharedStorage $storage */
-		$storage = $this->getStorage();
-		$result = $storage->unshareStorage();
-		$mountManager->removeMount($this->mountPoint);
-
-		return $result;
-	}
-
-	/**
-	 * @return \OCP\Share\IShare
-	 */
-	public function getShare() {
-		return $this->superShare;
-	}
-
-	/**
-	 * Get the file id of the root of the storage
-	 *
-	 * @return int
-	 */
-	public function getStorageRootId() {
-		return $this->getShare()->getNodeId();
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getNumericStorageId() {
-		if (!is_null($this->getShare()->getNodeCacheEntry())) {
-			return $this->getShare()->getNodeCacheEntry()->getStorageId();
-		} else {
-			$builder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-
-			$query = $builder->select('storage')
-				->from('filecache')
-				->where($builder->expr()->eq('fileid', $builder->createNamedParameter($this->getStorageRootId())));
-
-			$result = $query->execute();
-			$row = $result->fetch();
-			$result->closeCursor();
-			if ($row) {
-				return (int)$row['storage'];
-			}
-			return -1;
-		}
-	}
-
-	public function getMountType() {
-		return 'shared';
-	}
+    /**
+     * @var \OCA\Files_Sharing\SharedStorage $storage
+     */
+    protected $storage = null;
+
+    /**
+     * @var \OC\Files\View
+     */
+    private $recipientView;
+
+    /**
+     * @var string
+     */
+    private $user;
+
+    /** @var \OCP\Share\IShare */
+    private $superShare;
+
+    /** @var \OCP\Share\IShare[] */
+    private $groupedShares;
+
+    /**
+     * @param string $storage
+     * @param SharedMount[] $mountpoints
+     * @param array $arguments
+     * @param IStorageFactory $loader
+     * @param View $recipientView
+     */
+    public function __construct($storage, array $mountpoints, $arguments, IStorageFactory $loader, View $recipientView, CappedMemoryCache $folderExistCache) {
+        $this->user = $arguments['user'];
+        $this->recipientView = $recipientView;
+
+        $this->superShare = $arguments['superShare'];
+        $this->groupedShares = $arguments['groupedShares'];
+
+        $newMountPoint = $this->verifyMountPoint($this->superShare, $mountpoints, $folderExistCache);
+        $absMountPoint = '/' . $this->user . '/files' . $newMountPoint;
+        parent::__construct($storage, $absMountPoint, $arguments, $loader);
+    }
+
+    /**
+     * check if the parent folder exists otherwise move the mount point up
+     *
+     * @param \OCP\Share\IShare $share
+     * @param SharedMount[] $mountpoints
+     * @return string
+     */
+    private function verifyMountPoint(\OCP\Share\IShare $share, array $mountpoints, CappedMemoryCache $folderExistCache) {
+        $mountPoint = basename($share->getTarget());
+        $parent = dirname($share->getTarget());
+
+        $event = new VerifyMountPointEvent($share, $this->recipientView, $parent);
+        /** @var IEventDispatcher $dispatcher */
+        $dispatcher = \OC::$server->query(IEventDispatcher::class);
+        $dispatcher->dispatchTyped($event);
+        $parent = $event->getParent();
+
+        if ($folderExistCache->hasKey($parent)) {
+            $parentExists = $folderExistCache->get($parent);
+        } else {
+            $parentExists = $this->recipientView->is_dir($parent);
+            $folderExistCache->set($parent, $parentExists);
+        }
+        if (!$parentExists) {
+            $parent = Helper::getShareFolder($this->recipientView);
+        }
+
+        $newMountPoint = $this->generateUniqueTarget(
+            \OC\Files\Filesystem::normalizePath($parent . '/' . $mountPoint),
+            $this->recipientView,
+            $mountpoints
+        );
+
+        if ($newMountPoint !== $share->getTarget()) {
+            $this->updateFileTarget($newMountPoint, $share);
+        }
+
+        return $newMountPoint;
+    }
+
+    /**
+     * update fileTarget in the database if the mount point changed
+     *
+     * @param string $newPath
+     * @param \OCP\Share\IShare $share
+     * @return bool
+     */
+    private function updateFileTarget($newPath, &$share) {
+        $share->setTarget($newPath);
+
+        foreach ($this->groupedShares as $tmpShare) {
+            $tmpShare->setTarget($newPath);
+            \OC::$server->getShareManager()->moveShare($tmpShare, $this->user);
+        }
+    }
+
+
+    /**
+     * @param string $path
+     * @param View $view
+     * @param SharedMount[] $mountpoints
+     * @return mixed
+     */
+    private function generateUniqueTarget($path, $view, array $mountpoints) {
+        $pathinfo = pathinfo($path);
+        $ext = isset($pathinfo['extension']) ? '.' . $pathinfo['extension'] : '';
+        $name = $pathinfo['filename'];
+        $dir = $pathinfo['dirname'];
+
+        $i = 2;
+        $absolutePath = $this->recipientView->getAbsolutePath($path) . '/';
+        while ($view->file_exists($path) || isset($mountpoints[$absolutePath])) {
+            $path = Filesystem::normalizePath($dir . '/' . $name . ' (' . $i . ')' . $ext);
+            $absolutePath = $this->recipientView->getAbsolutePath($path) . '/';
+            $i++;
+        }
+
+        return $path;
+    }
+
+    /**
+     * Format a path to be relative to the /user/files/ directory
+     *
+     * @param string $path the absolute path
+     * @return string e.g. turns '/admin/files/test.txt' into '/test.txt'
+     * @throws \OCA\Files_Sharing\Exceptions\BrokenPath
+     */
+    protected function stripUserFilesPath($path) {
+        $trimmed = ltrim($path, '/');
+        $split = explode('/', $trimmed);
+
+        // it is not a file relative to data/user/files
+        if (count($split) < 3 || $split[1] !== 'files') {
+            \OC::$server->getLogger()->error('Can not strip userid and "files/" from path: ' . $path, ['app' => 'files_sharing']);
+            throw new \OCA\Files_Sharing\Exceptions\BrokenPath('Path does not start with /user/files', 10);
+        }
+
+        // skip 'user' and 'files'
+        $sliced = array_slice($split, 2);
+        $relPath = implode('/', $sliced);
+
+        return '/' . $relPath;
+    }
+
+    /**
+     * Move the mount point to $target
+     *
+     * @param string $target the target mount point
+     * @return bool
+     */
+    public function moveMount($target) {
+        $relTargetPath = $this->stripUserFilesPath($target);
+        $share = $this->storage->getShare();
+
+        $result = true;
+
+        try {
+            $this->updateFileTarget($relTargetPath, $share);
+            $this->setMountPoint($target);
+            $this->storage->setMountPoint($relTargetPath);
+        } catch (\Exception $e) {
+            \OC::$server->getLogger()->logException($e, ['app' => 'files_sharing', 'message' => 'Could not rename mount point for shared folder "' . $this->getMountPoint() . '" to "' . $target . '"']);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Remove the mount points
+     *
+     * @return bool
+     */
+    public function removeMount() {
+        $mountManager = \OC\Files\Filesystem::getMountManager();
+        /** @var \OCA\Files_Sharing\SharedStorage $storage */
+        $storage = $this->getStorage();
+        $result = $storage->unshareStorage();
+        $mountManager->removeMount($this->mountPoint);
+
+        return $result;
+    }
+
+    /**
+     * @return \OCP\Share\IShare
+     */
+    public function getShare() {
+        return $this->superShare;
+    }
+
+    /**
+     * Get the file id of the root of the storage
+     *
+     * @return int
+     */
+    public function getStorageRootId() {
+        return $this->getShare()->getNodeId();
+    }
+
+    /**
+     * @return int
+     */
+    public function getNumericStorageId() {
+        if (!is_null($this->getShare()->getNodeCacheEntry())) {
+            return $this->getShare()->getNodeCacheEntry()->getStorageId();
+        } else {
+            $builder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+
+            $query = $builder->select('storage')
+                ->from('filecache')
+                ->where($builder->expr()->eq('fileid', $builder->createNamedParameter($this->getStorageRootId())));
+
+            $result = $query->execute();
+            $row = $result->fetch();
+            $result->closeCursor();
+            if ($row) {
+                return (int)$row['storage'];
+            }
+            return -1;
+        }
+    }
+
+    public function getMountType() {
+        return 'shared';
+    }
 }

lib/private/Files/Mount/Manager.php

Indentation +162 added lines, -162 removed lines

@@ -32,166 +32,166 @@
 use OCP\Files\Mount\IMountPoint;
 
 class Manager implements IMountManager {
-	/** @var MountPoint[] */
-	private $mounts = [];
-
-	/** @var CappedMemoryCache */
-	private $pathCache;
-
-	/** @var CappedMemoryCache */
-	private $inPathCache;
-
-	public function __construct() {
-		$this->pathCache = new CappedMemoryCache();
-		$this->inPathCache = new CappedMemoryCache();
-	}
-
-	/**
-	 * @param IMountPoint $mount
-	 */
-	public function addMount(IMountPoint $mount) {
-		$this->mounts[$mount->getMountPoint()] = $mount;
-		$this->pathCache->clear();
-		$this->inPathCache->clear();
-	}
-
-	/**
-	 * @param string $mountPoint
-	 */
-	public function removeMount(string $mountPoint) {
-		$mountPoint = Filesystem::normalizePath($mountPoint);
-		if (\strlen($mountPoint) > 1) {
-			$mountPoint .= '/';
-		}
-		unset($this->mounts[$mountPoint]);
-		$this->pathCache->clear();
-		$this->inPathCache->clear();
-	}
-
-	/**
-	 * @param string $mountPoint
-	 * @param string $target
-	 */
-	public function moveMount(string $mountPoint, string $target) {
-		$this->mounts[$target] = $this->mounts[$mountPoint];
-		unset($this->mounts[$mountPoint]);
-		$this->pathCache->clear();
-		$this->inPathCache->clear();
-	}
-
-	/**
-	 * Find the mount for $path
-	 *
-	 * @param string $path
-	 * @return MountPoint|null
-	 */
-	public function find(string $path) {
-		\OC_Util::setupFS();
-		$path = Filesystem::normalizePath($path);
-
-		if (isset($this->pathCache[$path])) {
-			return $this->pathCache[$path];
-		}
-
-		$current = $path;
-		while (true) {
-			$mountPoint = $current . '/';
-			if (isset($this->mounts[$mountPoint])) {
-				$this->pathCache[$path] = $this->mounts[$mountPoint];
-				return $this->mounts[$mountPoint];
-			}
-
-			if ($current === '') {
-				return null;
-			}
-
-			$current = dirname($current);
-			if ($current === '.' || $current === '/') {
-				$current = '';
-			}
-		}
-	}
-
-	/**
-	 * Find all mounts in $path
-	 *
-	 * @param string $path
-	 * @return MountPoint[]
-	 */
-	public function findIn(string $path): array {
-		\OC_Util::setupFS();
-		$path = $this->formatPath($path);
-
-		if (isset($this->inPathCache[$path])) {
-			return $this->inPathCache[$path];
-		}
-
-		$result = [];
-		$pathLength = \strlen($path);
-		$mountPoints = array_keys($this->mounts);
-		foreach ($mountPoints as $mountPoint) {
-			if (substr($mountPoint, 0, $pathLength) === $path && \strlen($mountPoint) > $pathLength) {
-				$result[] = $this->mounts[$mountPoint];
-			}
-		}
-
-		$this->inPathCache[$path] = $result;
-		return $result;
-	}
-
-	public function clear() {
-		$this->mounts = [];
-		$this->pathCache->clear();
-		$this->inPathCache->clear();
-	}
-
-	/**
-	 * Find mounts by storage id
-	 *
-	 * @param string $id
-	 * @return MountPoint[]
-	 */
-	public function findByStorageId(string $id): array {
-		\OC_Util::setupFS();
-		if (\strlen($id) > 64) {
-			$id = md5($id);
-		}
-		$result = [];
-		foreach ($this->mounts as $mount) {
-			if ($mount->getStorageId() === $id) {
-				$result[] = $mount;
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * @return MountPoint[]
-	 */
-	public function getAll(): array {
-		return $this->mounts;
-	}
-
-	/**
-	 * Find mounts by numeric storage id
-	 *
-	 * @param int $id
-	 * @return MountPoint[]
-	 */
-	public function findByNumericId(int $id): array {
-		$storageId = \OC\Files\Cache\Storage::getStorageId($id);
-		return $this->findByStorageId($storageId);
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	private function formatPath(string $path): string {
-		$path = Filesystem::normalizePath($path);
-		if (\strlen($path) > 1) {
-			$path .= '/';
-		}
-		return $path;
-	}
+    /** @var MountPoint[] */
+    private $mounts = [];
+
+    /** @var CappedMemoryCache */
+    private $pathCache;
+
+    /** @var CappedMemoryCache */
+    private $inPathCache;
+
+    public function __construct() {
+        $this->pathCache = new CappedMemoryCache();
+        $this->inPathCache = new CappedMemoryCache();
+    }
+
+    /**
+     * @param IMountPoint $mount
+     */
+    public function addMount(IMountPoint $mount) {
+        $this->mounts[$mount->getMountPoint()] = $mount;
+        $this->pathCache->clear();
+        $this->inPathCache->clear();
+    }
+
+    /**
+     * @param string $mountPoint
+     */
+    public function removeMount(string $mountPoint) {
+        $mountPoint = Filesystem::normalizePath($mountPoint);
+        if (\strlen($mountPoint) > 1) {
+            $mountPoint .= '/';
+        }
+        unset($this->mounts[$mountPoint]);
+        $this->pathCache->clear();
+        $this->inPathCache->clear();
+    }
+
+    /**
+     * @param string $mountPoint
+     * @param string $target
+     */
+    public function moveMount(string $mountPoint, string $target) {
+        $this->mounts[$target] = $this->mounts[$mountPoint];
+        unset($this->mounts[$mountPoint]);
+        $this->pathCache->clear();
+        $this->inPathCache->clear();
+    }
+
+    /**
+     * Find the mount for $path
+     *
+     * @param string $path
+     * @return MountPoint|null
+     */
+    public function find(string $path) {
+        \OC_Util::setupFS();
+        $path = Filesystem::normalizePath($path);
+
+        if (isset($this->pathCache[$path])) {
+            return $this->pathCache[$path];
+        }
+
+        $current = $path;
+        while (true) {
+            $mountPoint = $current . '/';
+            if (isset($this->mounts[$mountPoint])) {
+                $this->pathCache[$path] = $this->mounts[$mountPoint];
+                return $this->mounts[$mountPoint];
+            }
+
+            if ($current === '') {
+                return null;
+            }
+
+            $current = dirname($current);
+            if ($current === '.' || $current === '/') {
+                $current = '';
+            }
+        }
+    }
+
+    /**
+     * Find all mounts in $path
+     *
+     * @param string $path
+     * @return MountPoint[]
+     */
+    public function findIn(string $path): array {
+        \OC_Util::setupFS();
+        $path = $this->formatPath($path);
+
+        if (isset($this->inPathCache[$path])) {
+            return $this->inPathCache[$path];
+        }
+
+        $result = [];
+        $pathLength = \strlen($path);
+        $mountPoints = array_keys($this->mounts);
+        foreach ($mountPoints as $mountPoint) {
+            if (substr($mountPoint, 0, $pathLength) === $path && \strlen($mountPoint) > $pathLength) {
+                $result[] = $this->mounts[$mountPoint];
+            }
+        }
+
+        $this->inPathCache[$path] = $result;
+        return $result;
+    }
+
+    public function clear() {
+        $this->mounts = [];
+        $this->pathCache->clear();
+        $this->inPathCache->clear();
+    }
+
+    /**
+     * Find mounts by storage id
+     *
+     * @param string $id
+     * @return MountPoint[]
+     */
+    public function findByStorageId(string $id): array {
+        \OC_Util::setupFS();
+        if (\strlen($id) > 64) {
+            $id = md5($id);
+        }
+        $result = [];
+        foreach ($this->mounts as $mount) {
+            if ($mount->getStorageId() === $id) {
+                $result[] = $mount;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * @return MountPoint[]
+     */
+    public function getAll(): array {
+        return $this->mounts;
+    }
+
+    /**
+     * Find mounts by numeric storage id
+     *
+     * @param int $id
+     * @return MountPoint[]
+     */
+    public function findByNumericId(int $id): array {
+        $storageId = \OC\Files\Cache\Storage::getStorageId($id);
+        return $this->findByStorageId($storageId);
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    private function formatPath(string $path): string {
+        $path = Filesystem::normalizePath($path);
+        if (\strlen($path) > 1) {
+            $path .= '/';
+        }
+        return $path;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 
 		$current = $path;
 		while (true) {
-			$mountPoint = $current . '/';
+			$mountPoint = $current.'/';
 			if (isset($this->mounts[$mountPoint])) {
 				$this->pathCache[$path] = $this->mounts[$mountPoint];
 				return $this->mounts[$mountPoint];

lib/public/Support/CrashReport/ICollectBreadcrumbs.php

Indentation +10 added lines, -10 removed lines

@@ -29,15 +29,15 @@
  */
 interface ICollectBreadcrumbs extends IReporter {
 
-	/**
-	 * Collect breadcrumbs for crash reports
-	 *
-	 * @param string $message
-	 * @param string $category
-	 * @param array $context
-	 *
-	 * @since 15.0.0
-	 */
-	public function collect(string $message, string $category, array $context = []);
+    /**
+     * Collect breadcrumbs for crash reports
+     *
+     * @param string $message
+     * @param string $category
+     * @param array $context
+     *
+     * @since 15.0.0
+     */
+    public function collect(string $message, string $category, array $context = []);
 
 }

lib/public/Federation/ICloudFederationProviderManager.php

Indentation +64 added lines, -64 removed lines

@@ -32,76 +32,76 @@
  */
 interface ICloudFederationProviderManager {
 
-	/**
-	 * Registers an callback function which must return an cloud federation provider
-	 *
-	 * @param string $resourceType which resource type does the provider handles
-	 * @param string $displayName user facing name of the federated share provider
-	 * @param callable $callback
-	 * @throws Exceptions\ProviderAlreadyExistsException
-	 *
-	 * @since 14.0.0
-	 */
-	public function addCloudFederationProvider($resourceType, $displayName, callable $callback);
+    /**
+     * Registers an callback function which must return an cloud federation provider
+     *
+     * @param string $resourceType which resource type does the provider handles
+     * @param string $displayName user facing name of the federated share provider
+     * @param callable $callback
+     * @throws Exceptions\ProviderAlreadyExistsException
+     *
+     * @since 14.0.0
+     */
+    public function addCloudFederationProvider($resourceType, $displayName, callable $callback);
 
-	/**
-	 * remove cloud federation provider
-	 *
-	 * @param string $resourceType
-	 *
-	 * @since 14.0.0
-	 */
-	public function removeCloudFederationProvider($resourceType);
+    /**
+     * remove cloud federation provider
+     *
+     * @param string $resourceType
+     *
+     * @since 14.0.0
+     */
+    public function removeCloudFederationProvider($resourceType);
 
-	/**
-	 * get a list of all cloudFederationProviders
-	 *
-	 * @return array [resourceType => ['resourceType' => $resourceType, 'displayName' => $displayName, 'callback' => callback]]
-	 *
-	 * @since 14.0.0
-	 */
-	public function getAllCloudFederationProviders();
+    /**
+     * get a list of all cloudFederationProviders
+     *
+     * @return array [resourceType => ['resourceType' => $resourceType, 'displayName' => $displayName, 'callback' => callback]]
+     *
+     * @since 14.0.0
+     */
+    public function getAllCloudFederationProviders();
 
-	/**
-	 * get a specific cloud federation provider
-	 *
-	 * @param string $resourceType
-	 * @return ICloudFederationProvider
-	 * @throws Exceptions\ProviderDoesNotExistsException
-	 *
-	 * @since 14.0.0
-	 */
-	public function getCloudFederationProvider($resourceType);
+    /**
+     * get a specific cloud federation provider
+     *
+     * @param string $resourceType
+     * @return ICloudFederationProvider
+     * @throws Exceptions\ProviderDoesNotExistsException
+     *
+     * @since 14.0.0
+     */
+    public function getCloudFederationProvider($resourceType);
 
-	/**
-	 * send federated share
-	 *
-	 * @param ICloudFederationShare $share
-	 * @return mixed
-	 *
-	 * @since 14.0.0
-	 */
-	public function sendShare(ICloudFederationShare $share);
+    /**
+     * send federated share
+     *
+     * @param ICloudFederationShare $share
+     * @return mixed
+     *
+     * @since 14.0.0
+     */
+    public function sendShare(ICloudFederationShare $share);
 
-	/**
-	 * send notification about existing share
-	 *
-	 * @param string $url
-	 * @param ICloudFederationNotification $notification
-	 * @return mixed
-	 *
-	 * @since 14.0.0
-	 */
-	public function sendNotification($url, ICloudFederationNotification $notification);
+    /**
+     * send notification about existing share
+     *
+     * @param string $url
+     * @param ICloudFederationNotification $notification
+     * @return mixed
+     *
+     * @since 14.0.0
+     */
+    public function sendNotification($url, ICloudFederationNotification $notification);
 
-	/**
-	 * check if the new cloud federation API is ready to be used
-	 *
-	 * @return bool
-	 *
-	 * @since 14.0.0
-	 */
-	public function isReady();
+    /**
+     * check if the new cloud federation API is ready to be used
+     *
+     * @return bool
+     *
+     * @since 14.0.0
+     */
+    public function isReady();
 
 
 }

apps/updatenotification/lib/Notification/Notifier.php

Spacing +2 added lines, -2 removed lines

@@ -108,7 +108,7 @@ 
 			$notification->setParsedSubject($l->t('Update to %1$s is available.', [$parameters['version']]));
 
 			if ($this->isAdmin()) {
-				$notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index', ['section' => 'overview']) . '#version');
+				$notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index', ['section' => 'overview']).'#version');
 			}
 		} else {
 			$appInfo = $this->getAppInfo($notification->getObjectType());
@@ -128,7 +128,7 @@ 
 				]);
 
 			if ($this->isAdmin()) {
-				$notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps', ['category' => 'updates']) . '#app-' . $notification->getObjectType());
+				$notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps', ['category' => 'updates']).'#app-'.$notification->getObjectType());
 			}
 		}
 

Indentation +157 added lines, -157 removed lines

@@ -39,161 +39,161 @@
 
 class Notifier implements INotifier {
 
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IManager */
-	protected $notificationManager;
-
-	/** @var IFactory */
-	protected $l10NFactory;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var string[] */
-	protected $appVersions;
-
-	/**
-	 * Notifier constructor.
-	 *
-	 * @param IURLGenerator $url
-	 * @param IConfig $config
-	 * @param IManager $notificationManager
-	 * @param IFactory $l10NFactory
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IURLGenerator $url, IConfig $config, IManager $notificationManager, IFactory $l10NFactory, IUserSession $userSession, IGroupManager $groupManager) {
-		$this->url = $url;
-		$this->notificationManager = $notificationManager;
-		$this->config = $config;
-		$this->l10NFactory = $l10NFactory;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->appVersions = $this->getAppVersions();
-	}
-
-	/**
-	 * Identifier of the notifier, only use [a-z0-9_]
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getID(): string {
-		return 'updatenotification';
-	}
-
-	/**
-	 * Human readable name describing the notifier
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getName(): string {
-		return $this->l10NFactory->get('updatenotification')->t('Update notifications');
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @param string $languageCode The code of the language that should be used to prepare the notification
-	 * @return INotification
-	 * @throws \InvalidArgumentException When the notification was not prepared by a notifier
-	 * @throws AlreadyProcessedException When the notification is not needed anymore and should be deleted
-	 * @since 9.0.0
-	 */
-	public function prepare(INotification $notification, string $languageCode): INotification {
-		if ($notification->getApp() !== 'updatenotification') {
-			throw new \InvalidArgumentException('Unknown app id');
-		}
-
-		$l = $this->l10NFactory->get('updatenotification', $languageCode);
-		if ($notification->getSubject() === 'connection_error') {
-			$errors = (int) $this->config->getAppValue('updatenotification', 'update_check_errors', 0);
-			if ($errors === 0) {
-				$this->notificationManager->markProcessed($notification);
-				throw new \InvalidArgumentException('Update checked worked again');
-			}
-
-			$notification->setParsedSubject($l->t('The update server could not be reached since %d days to check for new updates.', [$errors]))
-				->setParsedMessage($l->t('Please check the Nextcloud and server log files for errors.'));
-		} elseif ($notification->getObjectType() === 'core') {
-			$this->updateAlreadyInstalledCheck($notification, $this->getCoreVersions());
-
-			$parameters = $notification->getSubjectParameters();
-			$notification->setParsedSubject($l->t('Update to %1$s is available.', [$parameters['version']]));
-
-			if ($this->isAdmin()) {
-				$notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index', ['section' => 'overview']) . '#version');
-			}
-		} else {
-			$appInfo = $this->getAppInfo($notification->getObjectType());
-			$appName = ($appInfo === null) ? $notification->getObjectType() : $appInfo['name'];
-
-			if (isset($this->appVersions[$notification->getObjectType()])) {
-				$this->updateAlreadyInstalledCheck($notification, $this->appVersions[$notification->getObjectType()]);
-			}
-
-			$notification->setParsedSubject($l->t('Update for %1$s to version %2$s is available.', [$appName, $notification->getObjectId()]))
-				->setRichSubject($l->t('Update for {app} to version %s is available.', [$notification->getObjectId()]), [
-					'app' => [
-						'type' => 'app',
-						'id' => $notification->getObjectType(),
-						'name' => $appName,
-					]
-				]);
-
-			if ($this->isAdmin()) {
-				$notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps', ['category' => 'updates']) . '#app-' . $notification->getObjectType());
-			}
-		}
-
-		$notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('updatenotification', 'notification.svg')));
-
-		return $notification;
-	}
-
-	/**
-	 * Remove the notification and prevent rendering, when the update is installed
-	 *
-	 * @param INotification $notification
-	 * @param string $installedVersion
-	 * @throws AlreadyProcessedException When the update is already installed
-	 */
-	protected function updateAlreadyInstalledCheck(INotification $notification, $installedVersion) {
-		if (version_compare($notification->getObjectId(), $installedVersion, '<=')) {
-			throw new AlreadyProcessedException();
-		}
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isAdmin(): bool {
-		$user = $this->userSession->getUser();
-
-		if ($user instanceof IUser) {
-			return $this->groupManager->isAdmin($user->getUID());
-		}
-
-		return false;
-	}
-
-	protected function getCoreVersions(): string {
-		return implode('.', Util::getVersion());
-	}
-
-	protected function getAppVersions(): array {
-		return \OC_App::getAppVersions();
-	}
-
-	protected function getAppInfo($appId) {
-		return \OC_App::getAppInfo($appId);
-	}
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IManager */
+    protected $notificationManager;
+
+    /** @var IFactory */
+    protected $l10NFactory;
+
+    /** @var IUserSession */
+    protected $userSession;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var string[] */
+    protected $appVersions;
+
+    /**
+     * Notifier constructor.
+     *
+     * @param IURLGenerator $url
+     * @param IConfig $config
+     * @param IManager $notificationManager
+     * @param IFactory $l10NFactory
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IURLGenerator $url, IConfig $config, IManager $notificationManager, IFactory $l10NFactory, IUserSession $userSession, IGroupManager $groupManager) {
+        $this->url = $url;
+        $this->notificationManager = $notificationManager;
+        $this->config = $config;
+        $this->l10NFactory = $l10NFactory;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->appVersions = $this->getAppVersions();
+    }
+
+    /**
+     * Identifier of the notifier, only use [a-z0-9_]
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getID(): string {
+        return 'updatenotification';
+    }
+
+    /**
+     * Human readable name describing the notifier
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getName(): string {
+        return $this->l10NFactory->get('updatenotification')->t('Update notifications');
+    }
+
+    /**
+     * @param INotification $notification
+     * @param string $languageCode The code of the language that should be used to prepare the notification
+     * @return INotification
+     * @throws \InvalidArgumentException When the notification was not prepared by a notifier
+     * @throws AlreadyProcessedException When the notification is not needed anymore and should be deleted
+     * @since 9.0.0
+     */
+    public function prepare(INotification $notification, string $languageCode): INotification {
+        if ($notification->getApp() !== 'updatenotification') {
+            throw new \InvalidArgumentException('Unknown app id');
+        }
+
+        $l = $this->l10NFactory->get('updatenotification', $languageCode);
+        if ($notification->getSubject() === 'connection_error') {
+            $errors = (int) $this->config->getAppValue('updatenotification', 'update_check_errors', 0);
+            if ($errors === 0) {
+                $this->notificationManager->markProcessed($notification);
+                throw new \InvalidArgumentException('Update checked worked again');
+            }
+
+            $notification->setParsedSubject($l->t('The update server could not be reached since %d days to check for new updates.', [$errors]))
+                ->setParsedMessage($l->t('Please check the Nextcloud and server log files for errors.'));
+        } elseif ($notification->getObjectType() === 'core') {
+            $this->updateAlreadyInstalledCheck($notification, $this->getCoreVersions());
+
+            $parameters = $notification->getSubjectParameters();
+            $notification->setParsedSubject($l->t('Update to %1$s is available.', [$parameters['version']]));
+
+            if ($this->isAdmin()) {
+                $notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index', ['section' => 'overview']) . '#version');
+            }
+        } else {
+            $appInfo = $this->getAppInfo($notification->getObjectType());
+            $appName = ($appInfo === null) ? $notification->getObjectType() : $appInfo['name'];
+
+            if (isset($this->appVersions[$notification->getObjectType()])) {
+                $this->updateAlreadyInstalledCheck($notification, $this->appVersions[$notification->getObjectType()]);
+            }
+
+            $notification->setParsedSubject($l->t('Update for %1$s to version %2$s is available.', [$appName, $notification->getObjectId()]))
+                ->setRichSubject($l->t('Update for {app} to version %s is available.', [$notification->getObjectId()]), [
+                    'app' => [
+                        'type' => 'app',
+                        'id' => $notification->getObjectType(),
+                        'name' => $appName,
+                    ]
+                ]);
+
+            if ($this->isAdmin()) {
+                $notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps', ['category' => 'updates']) . '#app-' . $notification->getObjectType());
+            }
+        }
+
+        $notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('updatenotification', 'notification.svg')));
+
+        return $notification;
+    }
+
+    /**
+     * Remove the notification and prevent rendering, when the update is installed
+     *
+     * @param INotification $notification
+     * @param string $installedVersion
+     * @throws AlreadyProcessedException When the update is already installed
+     */
+    protected function updateAlreadyInstalledCheck(INotification $notification, $installedVersion) {
+        if (version_compare($notification->getObjectId(), $installedVersion, '<=')) {
+            throw new AlreadyProcessedException();
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isAdmin(): bool {
+        $user = $this->userSession->getUser();
+
+        if ($user instanceof IUser) {
+            return $this->groupManager->isAdmin($user->getUID());
+        }
+
+        return false;
+    }
+
+    protected function getCoreVersions(): string {
+        return implode('.', Util::getVersion());
+    }
+
+    protected function getAppVersions(): array {
+        return \OC_App::getAppVersions();
+    }
+
+    protected function getAppInfo($appId) {
+        return \OC_App::getAppInfo($appId);
+    }
 }

lib/public/Authentication/TwoFactorAuth/IProvidesIcons.php

Indentation +16 added lines, -16 removed lines

@@ -34,22 +34,22 @@
  */
 interface IProvidesIcons extends IProvider {
 
-	/**
-	 * Get the path to the light (white) icon of this provider
-	 *
-	 * @return String
-	 *
-	 * @since 15.0.0
-	 */
-	public function getLightIcon(): String;
+    /**
+     * Get the path to the light (white) icon of this provider
+     *
+     * @return String
+     *
+     * @since 15.0.0
+     */
+    public function getLightIcon(): String;
 
-	/**
-	 * Get the path to the dark (black) icon of this provider
-	 *
-	 * @return String
-	 *
-	 * @since 15.0.0
-	 */
-	public function getDarkIcon(): String;
+    /**
+     * Get the path to the dark (black) icon of this provider
+     *
+     * @return String
+     *
+     * @since 15.0.0
+     */
+    public function getDarkIcon(): String;
 
 }

apps/twofactor_backupcodes/lib/Migration/CheckBackupCodes.php

Indentation +11 added lines, -11 removed lines

@@ -30,19 +30,19 @@
 
 class CheckBackupCodes implements IRepairStep {
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	public function __construct(IJobList $jobList) {
-		$this->jobList = $jobList;
-	}
+    public function __construct(IJobList $jobList) {
+        $this->jobList = $jobList;
+    }
 
-	public function getName(): string {
-		return 'Add background job to check for backup codes';
-	}
+    public function getName(): string {
+        return 'Add background job to check for backup codes';
+    }
 
-	public function run(IOutput $output) {
-		$this->jobList->add(\OCA\TwoFactorBackupCodes\BackgroundJob\CheckBackupCodes::class);
-	}
+    public function run(IOutput $output) {
+        $this->jobList->add(\OCA\TwoFactorBackupCodes\BackgroundJob\CheckBackupCodes::class);
+    }
 
 }