mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Inspections 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-03-26 16:35:47 +02:00
parent 7f1141f7e9
commit 003c624596
No known key found for this signature in database
GPG Key ID: F941078878347C0C
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/private/Files/Mount/Manager.php
View File

@ -48,7 +48,7 @@ class Manager implements IMountManager {
*/
public function removeMount(string $mountPoint) {
$mountPoint = Filesystem::normalizePath($mountPoint);
if (strlen($mountPoint) > 1) {
if (\strlen($mountPoint) > 1) {
$mountPoint .= '/';
}
unset($this->mounts[$mountPoint]);
@ -80,15 +80,16 @@ class Manager implements IMountManager {
$foundMountPoint = '';
$mountPoints = array_keys($this->mounts);
foreach ($mountPoints as $mountpoint) {
if (strpos($path, $mountpoint) === 0 and strlen($mountpoint) > strlen($foundMountPoint)) {
if (strpos($path, $mountpoint) === 0 && \strlen($mountpoint) > \strlen($foundMountPoint)) {
$foundMountPoint = $mountpoint;
}
}
if (isset($this->mounts[$foundMountPoint])) {
return $this->mounts[$foundMountPoint];
} else {
return null;
}
return null;
}
/**
@ -101,10 +102,10 @@ class Manager implements IMountManager {
\OC_Util::setupFS();
$path = $this->formatPath($path);
$result = [];
$pathLength = strlen($path);
$pathLength = \strlen($path);
$mountPoints = array_keys($this->mounts);
foreach ($mountPoints as $mountPoint) {
if (substr($mountPoint, 0, $pathLength) === $path and strlen($mountPoint) > $pathLength) {
if (substr($mountPoint, 0, $pathLength) === $path && \strlen($mountPoint) > $pathLength) {
$result[] = $this->mounts[$mountPoint];
}
}
@ -123,7 +124,7 @@ class Manager implements IMountManager {
*/
public function findByStorageId(string $id): array {
\OC_Util::setupFS();
if (strlen($id) > 64) {
if (\strlen($id) > 64) {
$id = md5($id);
}
$result = [];
@ -159,7 +160,7 @@ class Manager implements IMountManager {
*/
private function formatPath(string $path): string {
$path = Filesystem::normalizePath($path);
if (strlen($path) > 1) {
if (\strlen($path) > 1) {
$path .= '/';
}
return $path;