nextcloud / server

apps/files_sharing/lib/External/Scanner.php

Indentation +87 added lines, -87 removed lines

@@ -32,97 +32,97 @@
 use OCP\Files\StorageNotAvailableException;
 
 class Scanner extends \OC\Files\Cache\Scanner {
-	/** @var \OCA\Files_Sharing\External\Storage */
-	protected $storage;
+    /** @var \OCA\Files_Sharing\External\Storage */
+    protected $storage;
 
-	/** {@inheritDoc} */
-	public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) {
-		if(!$this->storage->remoteIsOwnCloud()) {
-			return parent::scan($path, $recursive, $recursive, $lock);
-		}
+    /** {@inheritDoc} */
+    public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) {
+        if(!$this->storage->remoteIsOwnCloud()) {
+            return parent::scan($path, $recursive, $recursive, $lock);
+        }
 
-		$this->scanAll();
-	}
+        $this->scanAll();
+    }
 
-	/**
-	 * Scan a single file and store it in the cache.
-	 * If an exception happened while accessing the external storage,
-	 * the storage will be checked for availability and removed
-	 * if it is not available any more.
-	 *
-	 * @param string $file file to scan
-	 * @param int $reuseExisting
-	 * @param int $parentId
-	 * @param array | null $cacheData existing data in the cache for the file to be scanned
-	 * @param bool $lock set to false to disable getting an additional read lock during scanning
-	 * @return array an array of metadata of the scanned file
-	 */
-	public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true) {
-		try {
-			return parent::scanFile($file, $reuseExisting);
-		} catch (ForbiddenException $e) {
-			$this->storage->checkStorageAvailability();
-		} catch (NotFoundException $e) {
-			// if the storage isn't found, the call to
-			// checkStorageAvailable() will verify it and remove it
-			// if appropriate
-			$this->storage->checkStorageAvailability();
-		} catch (StorageInvalidException $e) {
-			$this->storage->checkStorageAvailability();
-		} catch (StorageNotAvailableException $e) {
-			$this->storage->checkStorageAvailability();
-		}
-	}
+    /**
+     * Scan a single file and store it in the cache.
+     * If an exception happened while accessing the external storage,
+     * the storage will be checked for availability and removed
+     * if it is not available any more.
+     *
+     * @param string $file file to scan
+     * @param int $reuseExisting
+     * @param int $parentId
+     * @param array | null $cacheData existing data in the cache for the file to be scanned
+     * @param bool $lock set to false to disable getting an additional read lock during scanning
+     * @return array an array of metadata of the scanned file
+     */
+    public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true) {
+        try {
+            return parent::scanFile($file, $reuseExisting);
+        } catch (ForbiddenException $e) {
+            $this->storage->checkStorageAvailability();
+        } catch (NotFoundException $e) {
+            // if the storage isn't found, the call to
+            // checkStorageAvailable() will verify it and remove it
+            // if appropriate
+            $this->storage->checkStorageAvailability();
+        } catch (StorageInvalidException $e) {
+            $this->storage->checkStorageAvailability();
+        } catch (StorageNotAvailableException $e) {
+            $this->storage->checkStorageAvailability();
+        }
+    }
 
-	/**
-	 * Checks the remote share for changes.
-	 * If changes are available, scan them and update
-	 * the cache.
-	 * @throws NotFoundException
-	 * @throws StorageInvalidException
-	 * @throws \Exception
-	 */
-	public function scanAll() {
-		try {
-			$data = $this->storage->getShareInfo();
-		} catch (\Exception $e) {
-			$this->storage->checkStorageAvailability();
-			throw new \Exception(
-				'Error while scanning remote share: "' .
-				$this->storage->getRemote() . '" ' .
-				$e->getMessage()
-			);
-		}
-		if ($data['status'] === 'success') {
-			$this->addResult($data['data'], '');
-		} else {
-			throw new \Exception(
-				'Error while scanning remote share: "' .
-				$this->storage->getRemote() . '"'
-			);
-		}
-	}
+    /**
+     * Checks the remote share for changes.
+     * If changes are available, scan them and update
+     * the cache.
+     * @throws NotFoundException
+     * @throws StorageInvalidException
+     * @throws \Exception
+     */
+    public function scanAll() {
+        try {
+            $data = $this->storage->getShareInfo();
+        } catch (\Exception $e) {
+            $this->storage->checkStorageAvailability();
+            throw new \Exception(
+                'Error while scanning remote share: "' .
+                $this->storage->getRemote() . '" ' .
+                $e->getMessage()
+            );
+        }
+        if ($data['status'] === 'success') {
+            $this->addResult($data['data'], '');
+        } else {
+            throw new \Exception(
+                'Error while scanning remote share: "' .
+                $this->storage->getRemote() . '"'
+            );
+        }
+    }
 
-	/**
-	 * @param array $data
-	 * @param string $path
-	 */
-	private function addResult($data, $path) {
-		$id = $this->cache->put($path, $data);
-		if (isset($data['children'])) {
-			$children = [];
-			foreach ($data['children'] as $child) {
-				$children[$child['name']] = true;
-				$this->addResult($child, ltrim($path . '/' . $child['name'], '/'));
-			}
+    /**
+     * @param array $data
+     * @param string $path
+     */
+    private function addResult($data, $path) {
+        $id = $this->cache->put($path, $data);
+        if (isset($data['children'])) {
+            $children = [];
+            foreach ($data['children'] as $child) {
+                $children[$child['name']] = true;
+                $this->addResult($child, ltrim($path . '/' . $child['name'], '/'));
+            }
 
-			$existingCache = $this->cache->getFolderContentsById($id);
-			foreach ($existingCache as $existingChild) {
-				// if an existing child is not in the new data, remove it
-				if (!isset($children[$existingChild['name']])) {
-					$this->cache->remove(ltrim($path . '/' . $existingChild['name'], '/'));
-				}
-			}
-		}
-	}
+            $existingCache = $this->cache->getFolderContentsById($id);
+            foreach ($existingCache as $existingChild) {
+                // if an existing child is not in the new data, remove it
+                if (!isset($children[$existingChild['name']])) {
+                    $this->cache->remove(ltrim($path . '/' . $existingChild['name'], '/'));
+                }
+            }
+        }
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -37,7 +37,7 @@ 
 
 	/** {@inheritDoc} */
 	public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) {
-		if(!$this->storage->remoteIsOwnCloud()) {
+		if (!$this->storage->remoteIsOwnCloud()) {
 			return parent::scan($path, $recursive, $recursive, $lock);
 		}
 
@@ -88,8 +88,8 @@ 
 		} catch (\Exception $e) {
 			$this->storage->checkStorageAvailability();
 			throw new \Exception(
-				'Error while scanning remote share: "' .
-				$this->storage->getRemote() . '" ' .
+				'Error while scanning remote share: "'.
+				$this->storage->getRemote().'" '.
 				$e->getMessage()
 			);
 		}
@@ -97,8 +97,8 @@ 
 			$this->addResult($data['data'], '');
 		} else {
 			throw new \Exception(
-				'Error while scanning remote share: "' .
-				$this->storage->getRemote() . '"'
+				'Error while scanning remote share: "'.
+				$this->storage->getRemote().'"'
 			);
 		}
 	}
@@ -113,14 +113,14 @@ 
 			$children = [];
 			foreach ($data['children'] as $child) {
 				$children[$child['name']] = true;
-				$this->addResult($child, ltrim($path . '/' . $child['name'], '/'));
+				$this->addResult($child, ltrim($path.'/'.$child['name'], '/'));
 			}
 
 			$existingCache = $this->cache->getFolderContentsById($id);
 			foreach ($existingCache as $existingChild) {
 				// if an existing child is not in the new data, remove it
 				if (!isset($children[$existingChild['name']])) {
-					$this->cache->remove(ltrim($path . '/' . $existingChild['name'], '/'));
+					$this->cache->remove(ltrim($path.'/'.$existingChild['name'], '/'));
 				}
 			}
 		}

apps/files_sharing/lib/External/Cache.php

Indentation +37 added lines, -37 removed lines

@@ -27,44 +27,44 @@
 use OCP\Federation\ICloudId;
 
 class Cache extends \OC\Files\Cache\Cache {
-	/** @var ICloudId */
-	private $cloudId;
-	private $remote;
-	private $remoteUser;
-	private $storage;
+    /** @var ICloudId */
+    private $cloudId;
+    private $remote;
+    private $remoteUser;
+    private $storage;
 
-	/**
-	 * @param \OCA\Files_Sharing\External\Storage $storage
-	 * @param ICloudId $cloudId
-	 */
-	public function __construct($storage, ICloudId $cloudId) {
-		$this->cloudId = $cloudId;
-		$this->storage = $storage;
-		list(, $remote) = explode('://', $cloudId->getRemote(), 2);
-		$this->remote = $remote;
-		$this->remoteUser = $cloudId->getUser();
-		parent::__construct($storage);
-	}
+    /**
+     * @param \OCA\Files_Sharing\External\Storage $storage
+     * @param ICloudId $cloudId
+     */
+    public function __construct($storage, ICloudId $cloudId) {
+        $this->cloudId = $cloudId;
+        $this->storage = $storage;
+        list(, $remote) = explode('://', $cloudId->getRemote(), 2);
+        $this->remote = $remote;
+        $this->remoteUser = $cloudId->getUser();
+        parent::__construct($storage);
+    }
 
-	public function get($file) {
-		$result = parent::get($file);
-		if (!$result) {
-			return false;
-		}
-		$result['displayname_owner'] = $this->cloudId->getDisplayId();
-		if (!$file || $file === '') {
-			$result['is_share_mount_point'] = true;
-			$mountPoint = rtrim($this->storage->getMountPoint());
-			$result['name'] = basename($mountPoint);
-		}
-		return $result;
-	}
+    public function get($file) {
+        $result = parent::get($file);
+        if (!$result) {
+            return false;
+        }
+        $result['displayname_owner'] = $this->cloudId->getDisplayId();
+        if (!$file || $file === '') {
+            $result['is_share_mount_point'] = true;
+            $mountPoint = rtrim($this->storage->getMountPoint());
+            $result['name'] = basename($mountPoint);
+        }
+        return $result;
+    }
 
-	public function getFolderContentsById($id) {
-		$results = parent::getFolderContentsById($id);
-		foreach ($results as &$file) {
-			$file['displayname_owner'] = $this->cloudId->getDisplayId();
-		}
-		return $results;
-	}
+    public function getFolderContentsById($id) {
+        $results = parent::getFolderContentsById($id);
+        foreach ($results as &$file) {
+            $file['displayname_owner'] = $this->cloudId->getDisplayId();
+        }
+        return $results;
+    }
 }

apps/files_sharing/lib/External/MountProvider.php

Indentation +45 added lines, -45 removed lines

@@ -29,59 +29,59 @@
 use OCP\IUser;
 
 class MountProvider implements IMountProvider {
-	const STORAGE = '\OCA\Files_Sharing\External\Storage';
+    const STORAGE = '\OCA\Files_Sharing\External\Storage';
 
-	/**
-	 * @var \OCP\IDBConnection
-	 */
-	private $connection;
+    /**
+     * @var \OCP\IDBConnection
+     */
+    private $connection;
 
-	/**
-	 * @var callable
-	 */
-	private $managerProvider;
+    /**
+     * @var callable
+     */
+    private $managerProvider;
 
-	/**
-	 * @var ICloudIdManager
-	 */
-	private $cloudIdManager;
+    /**
+     * @var ICloudIdManager
+     */
+    private $cloudIdManager;
 
-	/**
-	 * @param \OCP\IDBConnection $connection
-	 * @param callable $managerProvider due to setup order we need a callable that return the manager instead of the manager itself
-	 * @param ICloudIdManager $cloudIdManager
-	 */
-	public function __construct(IDBConnection $connection, callable $managerProvider, ICloudIdManager $cloudIdManager) {
-		$this->connection = $connection;
-		$this->managerProvider = $managerProvider;
-		$this->cloudIdManager = $cloudIdManager;
-	}
+    /**
+     * @param \OCP\IDBConnection $connection
+     * @param callable $managerProvider due to setup order we need a callable that return the manager instead of the manager itself
+     * @param ICloudIdManager $cloudIdManager
+     */
+    public function __construct(IDBConnection $connection, callable $managerProvider, ICloudIdManager $cloudIdManager) {
+        $this->connection = $connection;
+        $this->managerProvider = $managerProvider;
+        $this->cloudIdManager = $cloudIdManager;
+    }
 
-	public function getMount(IUser $user, $data, IStorageFactory $storageFactory) {
-		$managerProvider = $this->managerProvider;
-		$manager = $managerProvider();
-		$data['manager'] = $manager;
-		$mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
-		$data['mountpoint'] = $mountPoint;
-		$data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']);
-		$data['certificateManager'] = \OC::$server->getCertificateManager($user->getUID());
-		$data['HttpClientService'] = \OC::$server->getHTTPClientService();
-		return new Mount(self::STORAGE, $mountPoint, $data, $manager, $storageFactory);
-	}
+    public function getMount(IUser $user, $data, IStorageFactory $storageFactory) {
+        $managerProvider = $this->managerProvider;
+        $manager = $managerProvider();
+        $data['manager'] = $manager;
+        $mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
+        $data['mountpoint'] = $mountPoint;
+        $data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']);
+        $data['certificateManager'] = \OC::$server->getCertificateManager($user->getUID());
+        $data['HttpClientService'] = \OC::$server->getHTTPClientService();
+        return new Mount(self::STORAGE, $mountPoint, $data, $manager, $storageFactory);
+    }
 
-	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
-		$query = $this->connection->prepare('
+    public function getMountsForUser(IUser $user, IStorageFactory $loader) {
+        $query = $this->connection->prepare('
 				SELECT `remote`, `share_token`, `password`, `mountpoint`, `owner`
 				FROM `*PREFIX*share_external`
 				WHERE `user` = ? AND `accepted` = ?
 			');
-		$query->execute([$user->getUID(), 1]);
-		$mounts = [];
-		while ($row = $query->fetch()) {
-			$row['manager'] = $this;
-			$row['token'] = $row['share_token'];
-			$mounts[] = $this->getMount($user, $row, $loader);
-		}
-		return $mounts;
-	}
+        $query->execute([$user->getUID(), 1]);
+        $mounts = [];
+        while ($row = $query->fetch()) {
+            $row['manager'] = $this;
+            $row['token'] = $row['share_token'];
+            $mounts[] = $this->getMount($user, $row, $loader);
+        }
+        return $mounts;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 		$managerProvider = $this->managerProvider;
 		$manager = $managerProvider();
 		$data['manager'] = $manager;
-		$mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
+		$mountPoint = '/'.$user->getUID().'/files/'.ltrim($data['mountpoint'], '/');
 		$data['mountpoint'] = $mountPoint;
 		$data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']);
 		$data['certificateManager'] = \OC::$server->getCertificateManager($user->getUID());

apps/files_sharing/lib/External/Watcher.php

Indentation +8 added lines, -8 removed lines

@@ -23,12 +23,12 @@
 namespace OCA\Files_Sharing\External;
 
 class Watcher extends \OC\Files\Cache\Watcher {
-	/**
-	 * remove deleted files in $path from the cache
-	 *
-	 * @param string $path
-	 */
-	public function cleanFolder($path) {
-		// not needed, the scanner takes care of this
-	}
+    /**
+     * remove deleted files in $path from the cache
+     *
+     * @param string $path
+     */
+    public function cleanFolder($path) {
+        // not needed, the scanner takes care of this
+    }
 }

apps/files_sharing/lib/External/Mount.php

Indentation +35 added lines, -35 removed lines

@@ -29,43 +29,43 @@
 
 class Mount extends MountPoint implements MoveableMount {
 
-	/**
-	 * @var \OCA\Files_Sharing\External\Manager
-	 */
-	protected $manager;
+    /**
+     * @var \OCA\Files_Sharing\External\Manager
+     */
+    protected $manager;
 
-	/**
-	 * @param string|\OC\Files\Storage\Storage $storage
-	 * @param string $mountpoint
-	 * @param array $options
-	 * @param \OCA\Files_Sharing\External\Manager $manager
-	 * @param \OC\Files\Storage\StorageFactory $loader
-	 */
-	public function __construct($storage, $mountpoint, $options, $manager, $loader = null) {
-		parent::__construct($storage, $mountpoint, $options, $loader);
-		$this->manager = $manager;
-	}
+    /**
+     * @param string|\OC\Files\Storage\Storage $storage
+     * @param string $mountpoint
+     * @param array $options
+     * @param \OCA\Files_Sharing\External\Manager $manager
+     * @param \OC\Files\Storage\StorageFactory $loader
+     */
+    public function __construct($storage, $mountpoint, $options, $manager, $loader = null) {
+        parent::__construct($storage, $mountpoint, $options, $loader);
+        $this->manager = $manager;
+    }
 
-	/**
-	 * Move the mount point to $target
-	 *
-	 * @param string $target the target mount point
-	 * @return bool
-	 */
-	public function moveMount($target) {
-		$result = $this->manager->setMountPoint($this->mountPoint, $target);
-		$this->setMountPoint($target);
+    /**
+     * Move the mount point to $target
+     *
+     * @param string $target the target mount point
+     * @return bool
+     */
+    public function moveMount($target) {
+        $result = $this->manager->setMountPoint($this->mountPoint, $target);
+        $this->setMountPoint($target);
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * Remove the mount points
-	 *
-	 * @return mixed
-	 * @return bool
-	 */
-	public function removeMount() {
-		return $this->manager->removeShare($this->mountPoint);
-	}
+    /**
+     * Remove the mount points
+     *
+     * @return mixed
+     * @return bool
+     */
+    public function removeMount() {
+        return $this->manager->removeShare($this->mountPoint);
+    }
 }

apps/files_sharing/lib/Updater.php

Indentation +76 added lines, -76 removed lines

@@ -27,81 +27,81 @@
 
 class Updater {
 
-	/**
-	 * @param array $params
-	 */
-	static public function renameHook($params) {
-		self::renameChildren($params['oldpath'], $params['newpath']);
-		self::moveShareToShare($params['newpath']);
-	}
-
-	/**
-	 * Fix for https://github.com/owncloud/core/issues/20769
-	 *
-	 * The owner is allowed to move their files (if they are shared) into a receiving folder
-	 * In this case we need to update the parent of the moved share. Since they are
-	 * effectively handing over ownership of the file the rest of the code needs to know
-	 * they need to build up the reshare tree.
-	 *
-	 * @param string $path
-	 */
-	static private function moveShareToShare($path) {
-		$userFolder = \OC::$server->getUserFolder();
-
-		// If the user folder can't be constructed (e.g. link share) just return.
-		if ($userFolder === null) {
-			return;
-		}
-
-		$src = $userFolder->get($path);
-
-		$shareManager = \OC::$server->getShareManager();
-
-		$shares = $shareManager->getSharesBy($userFolder->getOwner()->getUID(), \OCP\Share::SHARE_TYPE_USER, $src, false, -1);
-		$shares = array_merge($shares, $shareManager->getSharesBy($userFolder->getOwner()->getUID(), \OCP\Share::SHARE_TYPE_GROUP, $src, false, -1));
-
-		// If the path we move is not a share we don't care
-		if (empty($shares)) {
-			return;
-		}
-
-		// Check if the destination is inside a share
-		$mountManager = \OC::$server->getMountManager();
-		$dstMount = $mountManager->find($src->getPath());
-		if (!($dstMount instanceof \OCA\Files_Sharing\SharedMount)) {
-			return;
-		}
-
-		$newOwner = $dstMount->getShare()->getShareOwner();
-
-		//Ownership is moved over
-		foreach ($shares as $share) {
-			/** @var \OCP\Share\IShare $share */
-			$share->setShareOwner($newOwner);
-			$shareManager->updateShare($share);
-		}
-	}
-
-	/**
-	 * rename mount point from the children if the parent was renamed
-	 *
-	 * @param string $oldPath old path relative to data/user/files
-	 * @param string $newPath new path relative to data/user/files
-	 */
-	static private function renameChildren($oldPath, $newPath) {
-
-		$absNewPath =  \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $newPath);
-		$absOldPath =  \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $oldPath);
-
-		$mountManager = \OC\Files\Filesystem::getMountManager();
-		$mountedShares = $mountManager->findIn('/' . \OCP\User::getUser() . '/files/' . $oldPath);
-		foreach ($mountedShares as $mount) {
-			if ($mount->getStorage()->instanceOfStorage('OCA\Files_Sharing\ISharedStorage')) {
-				$mountPoint = $mount->getMountPoint();
-				$target = str_replace($absOldPath, $absNewPath, $mountPoint);
-				$mount->moveMount($target);
-			}
-		}
-	}
+    /**
+     * @param array $params
+     */
+    static public function renameHook($params) {
+        self::renameChildren($params['oldpath'], $params['newpath']);
+        self::moveShareToShare($params['newpath']);
+    }
+
+    /**
+     * Fix for https://github.com/owncloud/core/issues/20769
+     *
+     * The owner is allowed to move their files (if they are shared) into a receiving folder
+     * In this case we need to update the parent of the moved share. Since they are
+     * effectively handing over ownership of the file the rest of the code needs to know
+     * they need to build up the reshare tree.
+     *
+     * @param string $path
+     */
+    static private function moveShareToShare($path) {
+        $userFolder = \OC::$server->getUserFolder();
+
+        // If the user folder can't be constructed (e.g. link share) just return.
+        if ($userFolder === null) {
+            return;
+        }
+
+        $src = $userFolder->get($path);
+
+        $shareManager = \OC::$server->getShareManager();
+
+        $shares = $shareManager->getSharesBy($userFolder->getOwner()->getUID(), \OCP\Share::SHARE_TYPE_USER, $src, false, -1);
+        $shares = array_merge($shares, $shareManager->getSharesBy($userFolder->getOwner()->getUID(), \OCP\Share::SHARE_TYPE_GROUP, $src, false, -1));
+
+        // If the path we move is not a share we don't care
+        if (empty($shares)) {
+            return;
+        }
+
+        // Check if the destination is inside a share
+        $mountManager = \OC::$server->getMountManager();
+        $dstMount = $mountManager->find($src->getPath());
+        if (!($dstMount instanceof \OCA\Files_Sharing\SharedMount)) {
+            return;
+        }
+
+        $newOwner = $dstMount->getShare()->getShareOwner();
+
+        //Ownership is moved over
+        foreach ($shares as $share) {
+            /** @var \OCP\Share\IShare $share */
+            $share->setShareOwner($newOwner);
+            $shareManager->updateShare($share);
+        }
+    }
+
+    /**
+     * rename mount point from the children if the parent was renamed
+     *
+     * @param string $oldPath old path relative to data/user/files
+     * @param string $newPath new path relative to data/user/files
+     */
+    static private function renameChildren($oldPath, $newPath) {
+
+        $absNewPath =  \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $newPath);
+        $absOldPath =  \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $oldPath);
+
+        $mountManager = \OC\Files\Filesystem::getMountManager();
+        $mountedShares = $mountManager->findIn('/' . \OCP\User::getUser() . '/files/' . $oldPath);
+        foreach ($mountedShares as $mount) {
+            if ($mount->getStorage()->instanceOfStorage('OCA\Files_Sharing\ISharedStorage')) {
+                $mountPoint = $mount->getMountPoint();
+                $target = str_replace($absOldPath, $absNewPath, $mountPoint);
+                $mount->moveMount($target);
+            }
+        }
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -90,11 +90,11 @@
 	 */
 	static private function renameChildren($oldPath, $newPath) {
 
-		$absNewPath =  \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $newPath);
-		$absOldPath =  \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $oldPath);
+		$absNewPath = \OC\Files\Filesystem::normalizePath('/'.\OCP\User::getUser().'/files/'.$newPath);
+		$absOldPath = \OC\Files\Filesystem::normalizePath('/'.\OCP\User::getUser().'/files/'.$oldPath);
 
 		$mountManager = \OC\Files\Filesystem::getMountManager();
-		$mountedShares = $mountManager->findIn('/' . \OCP\User::getUser() . '/files/' . $oldPath);
+		$mountedShares = $mountManager->findIn('/'.\OCP\User::getUser().'/files/'.$oldPath);
 		foreach ($mountedShares as $mount) {
 			if ($mount->getStorage()->instanceOfStorage('OCA\Files_Sharing\ISharedStorage')) {
 				$mountPoint = $mount->getMountPoint();

apps/files_sharing/lib/DeleteOrphanedSharesJob.php

Indentation +27 added lines, -27 removed lines

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

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
 	/**
 	 * sets the correct interval for this timed job
 	 */
-	public function __construct(){
+	public function __construct() {
 		$this->interval = $this->defaultIntervalMin * 60;
 	}
 
@@ -55,8 +55,8 @@ 
 		$logger = \OC::$server->getLogger();
 
 		$sql =
-			'DELETE FROM `*PREFIX*share` ' .
-			'WHERE `item_type` in (\'file\', \'folder\') ' .
+			'DELETE FROM `*PREFIX*share` '.
+			'WHERE `item_type` in (\'file\', \'folder\') '.
 			'AND NOT EXISTS (SELECT `fileid` FROM `*PREFIX*filecache` WHERE `file_source` = `fileid`)';
 
 		$deletedEntries = $connection->executeUpdate($sql);

apps/files_sharing/lib/Middleware/OCSShareAPIMiddleware.php

Indentation +35 added lines, -35 removed lines

@@ -10,43 +10,43 @@
 use OCP\Share\IManager;
 
 class OCSShareAPIMiddleware extends Middleware {
-	/** @var IManager */
-	private $shareManager;
-	/** @var IL10N */
-	private $l;
+    /** @var IManager */
+    private $shareManager;
+    /** @var IL10N */
+    private $l;
 
-	public function __construct(IManager $shareManager,
-								IL10N $l) {
-		$this->shareManager = $shareManager;
-		$this->l = $l;
-	}
+    public function __construct(IManager $shareManager,
+                                IL10N $l) {
+        $this->shareManager = $shareManager;
+        $this->l = $l;
+    }
 
-	/**
-	 * @param \OCP\AppFramework\Controller $controller
-	 * @param string $methodName
-	 *
-	 * @throws OCSNotFoundException
-	 */
-	public function beforeController($controller, $methodName) {
-		if ($controller instanceof ShareAPIController) {
-			if (!$this->shareManager->shareApiEnabled()) {
-				throw new OCSNotFoundException($this->l->t('Share API is disabled'));
-			}
-		}
-	}
+    /**
+     * @param \OCP\AppFramework\Controller $controller
+     * @param string $methodName
+     *
+     * @throws OCSNotFoundException
+     */
+    public function beforeController($controller, $methodName) {
+        if ($controller instanceof ShareAPIController) {
+            if (!$this->shareManager->shareApiEnabled()) {
+                throw new OCSNotFoundException($this->l->t('Share API is disabled'));
+            }
+        }
+    }
 
-	/**
-	 * @param \OCP\AppFramework\Controller $controller
-	 * @param string $methodName
-	 * @param Response $response
-	 * @return Response
-	 */
-	public function afterController($controller, $methodName, Response $response) {
-		if ($controller instanceof ShareAPIController) {
-			/** @var ShareAPIController $controller */
-			$controller->cleanup();
-		}
+    /**
+     * @param \OCP\AppFramework\Controller $controller
+     * @param string $methodName
+     * @param Response $response
+     * @return Response
+     */
+    public function afterController($controller, $methodName, Response $response) {
+        if ($controller instanceof ShareAPIController) {
+            /** @var ShareAPIController $controller */
+            $controller->cleanup();
+        }
 
-		return $response;
-	}
+        return $response;
+    }
 }

apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php

Indentation +126 added lines, -126 removed lines

@@ -45,20 +45,20 @@ 
  */
 class SharingCheckMiddleware extends Middleware {
 
-	/** @var string */
-	protected $appName;
-	/** @var IConfig */
-	protected $config;
-	/** @var IAppManager */
-	protected $appManager;
-	/** @var IControllerMethodReflector */
-	protected $reflector;
-	/** @var IManager */
-	protected $shareManager;
-	/** @var IRequest */
-	protected $request;
-
-	/***
+    /** @var string */
+    protected $appName;
+    /** @var IConfig */
+    protected $config;
+    /** @var IAppManager */
+    protected $appManager;
+    /** @var IControllerMethodReflector */
+    protected $reflector;
+    /** @var IManager */
+    protected $shareManager;
+    /** @var IRequest */
+    protected $request;
+
+    /***
 	 * @param string $appName
 	 * @param IConfig $config
 	 * @param IAppManager $appManager
@@ -66,117 +66,117 @@ 
 	 * @param IManager $shareManager
 	 * @param IRequest $request
 	 */
-	public function __construct($appName,
-								IConfig $config,
-								IAppManager $appManager,
-								IControllerMethodReflector $reflector,
-								IManager $shareManager,
-								IRequest $request
-								) {
-		$this->appName = $appName;
-		$this->config = $config;
-		$this->appManager = $appManager;
-		$this->reflector = $reflector;
-		$this->shareManager = $shareManager;
-		$this->request = $request;
-	}
-
-	/**
-	 * Check if sharing is enabled before the controllers is executed
-	 *
-	 * @param \OCP\AppFramework\Controller $controller
-	 * @param string $methodName
-	 * @throws NotFoundException
-	 * @throws S2SException
-	 */
-	public function beforeController($controller, $methodName) {
-		if(!$this->isSharingEnabled()) {
-			throw new NotFoundException('Sharing is disabled.');
-		}
-
-		if ($controller instanceof ExternalSharesController &&
-			!$this->externalSharesChecks()) {
-			throw new S2SException('Federated sharing not allowed');
-		} else if ($controller instanceof ShareController) {
-			$token = $this->request->getParam('token');
-			$share = $this->shareManager->getShareByToken($token);
-			if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK
-				&& !$this->isLinkSharingEnabled()) {
-				throw new NotFoundException('Link sharing is disabled');
-			}
-		}
-	}
-
-	/**
-	 * Return 404 page in case of a not found exception
-	 *
-	 * @param \OCP\AppFramework\Controller $controller
-	 * @param string $methodName
-	 * @param \Exception $exception
-	 * @return NotFoundResponse
-	 * @throws \Exception
-	 */
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if(is_a($exception, '\OCP\Files\NotFoundException')) {
-			return new NotFoundResponse();
-		}
-
-		if (is_a($exception, '\OCA\Files_Sharing\Exceptions\S2SException')) {
-			return new JSONResponse($exception->getMessage(), 405);
-		}
-
-		throw $exception;
-	}
-
-	/**
-	 * Checks for externalshares controller
-	 * @return bool
-	 */
-	private function externalSharesChecks() {
-
-		if (!$this->reflector->hasAnnotation('NoIncomingFederatedSharingRequired') &&
-			$this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') !== 'yes') {
-			return false;
-		}
-
-		if (!$this->reflector->hasAnnotation('NoOutgoingFederatedSharingRequired') &&
-		    $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') !== 'yes') {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check whether sharing is enabled
-	 * @return bool
-	 */
-	private function isSharingEnabled() {
-		// FIXME: This check is done here since the route is globally defined and not inside the files_sharing app
-		// Check whether the sharing application is enabled
-		if(!$this->appManager->isEnabledForUser($this->appName)) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check if link sharing is allowed
-	 * @return bool
-	 */
-	private function isLinkSharingEnabled() {
-		// Check if the shareAPI is enabled
-		if ($this->config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
-			return false;
-		}
-
-		// Check whether public sharing is enabled
-		if($this->config->getAppValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
-			return false;
-		}
-
-		return true;
-	}
+    public function __construct($appName,
+                                IConfig $config,
+                                IAppManager $appManager,
+                                IControllerMethodReflector $reflector,
+                                IManager $shareManager,
+                                IRequest $request
+                                ) {
+        $this->appName = $appName;
+        $this->config = $config;
+        $this->appManager = $appManager;
+        $this->reflector = $reflector;
+        $this->shareManager = $shareManager;
+        $this->request = $request;
+    }
+
+    /**
+     * Check if sharing is enabled before the controllers is executed
+     *
+     * @param \OCP\AppFramework\Controller $controller
+     * @param string $methodName
+     * @throws NotFoundException
+     * @throws S2SException
+     */
+    public function beforeController($controller, $methodName) {
+        if(!$this->isSharingEnabled()) {
+            throw new NotFoundException('Sharing is disabled.');
+        }
+
+        if ($controller instanceof ExternalSharesController &&
+            !$this->externalSharesChecks()) {
+            throw new S2SException('Federated sharing not allowed');
+        } else if ($controller instanceof ShareController) {
+            $token = $this->request->getParam('token');
+            $share = $this->shareManager->getShareByToken($token);
+            if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK
+                && !$this->isLinkSharingEnabled()) {
+                throw new NotFoundException('Link sharing is disabled');
+            }
+        }
+    }
+
+    /**
+     * Return 404 page in case of a not found exception
+     *
+     * @param \OCP\AppFramework\Controller $controller
+     * @param string $methodName
+     * @param \Exception $exception
+     * @return NotFoundResponse
+     * @throws \Exception
+     */
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if(is_a($exception, '\OCP\Files\NotFoundException')) {
+            return new NotFoundResponse();
+        }
+
+        if (is_a($exception, '\OCA\Files_Sharing\Exceptions\S2SException')) {
+            return new JSONResponse($exception->getMessage(), 405);
+        }
+
+        throw $exception;
+    }
+
+    /**
+     * Checks for externalshares controller
+     * @return bool
+     */
+    private function externalSharesChecks() {
+
+        if (!$this->reflector->hasAnnotation('NoIncomingFederatedSharingRequired') &&
+            $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') !== 'yes') {
+            return false;
+        }
+
+        if (!$this->reflector->hasAnnotation('NoOutgoingFederatedSharingRequired') &&
+            $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') !== 'yes') {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check whether sharing is enabled
+     * @return bool
+     */
+    private function isSharingEnabled() {
+        // FIXME: This check is done here since the route is globally defined and not inside the files_sharing app
+        // Check whether the sharing application is enabled
+        if(!$this->appManager->isEnabledForUser($this->appName)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check if link sharing is allowed
+     * @return bool
+     */
+    private function isLinkSharingEnabled() {
+        // Check if the shareAPI is enabled
+        if ($this->config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
+            return false;
+        }
+
+        // Check whether public sharing is enabled
+        if($this->config->getAppValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
+            return false;
+        }
+
+        return true;
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -90,7 +90,7 @@ 
 	 * @throws S2SException
 	 */
 	public function beforeController($controller, $methodName) {
-		if(!$this->isSharingEnabled()) {
+		if (!$this->isSharingEnabled()) {
 			throw new NotFoundException('Sharing is disabled.');
 		}
 
@@ -117,7 +117,7 @@ 
 	 * @throws \Exception
 	 */
 	public function afterException($controller, $methodName, \Exception $exception) {
-		if(is_a($exception, '\OCP\Files\NotFoundException')) {
+		if (is_a($exception, '\OCP\Files\NotFoundException')) {
 			return new NotFoundResponse();
 		}
 
@@ -154,7 +154,7 @@ 
 	private function isSharingEnabled() {
 		// FIXME: This check is done here since the route is globally defined and not inside the files_sharing app
 		// Check whether the sharing application is enabled
-		if(!$this->appManager->isEnabledForUser($this->appName)) {
+		if (!$this->appManager->isEnabledForUser($this->appName)) {
 			return false;
 		}
 
@@ -172,7 +172,7 @@ 
 		}
 
 		// Check whether public sharing is enabled
-		if($this->config->getAppValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
+		if ($this->config->getAppValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
 			return false;
 		}