nextcloud / server

apps/files_sharing/lib/ISharedStorage.php

Spacing +1 added lines, -1 removed lines

@@ -23,6 +23,6 @@
 
 namespace OCA\Files_Sharing;
 
-interface ISharedStorage{
+interface ISharedStorage {
 
 }

apps/files_sharing/lib/AppInfo/Application.php

Spacing +9 added lines, -9 removed lines

@@ -50,7 +50,7 @@ 
 		/**
 		 * Controllers
 		 */
-		$container->registerService('ShareController', function (SimpleContainer $c) use ($server) {
+		$container->registerService('ShareController', function(SimpleContainer $c) use ($server) {
 			$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
 			return new ShareController(
 				$c->query('AppName'),
@@ -70,7 +70,7 @@ 
 				$server->getThemingDefaults()
 			);
 		});
-		$container->registerService('ExternalSharesController', function (SimpleContainer $c) {
+		$container->registerService('ExternalSharesController', function(SimpleContainer $c) {
 			return new ExternalSharesController(
 				$c->query('AppName'),
 				$c->query('Request'),
@@ -82,13 +82,13 @@ 
 		/**
 		 * Core class wrappers
 		 */
-		$container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) {
+		$container->registerService('HttpClientService', function(SimpleContainer $c) use ($server) {
 			return $server->getHTTPClientService();
 		});
-		$container->registerService(ICloudIdManager::class, function (SimpleContainer $c) use ($server) {
+		$container->registerService(ICloudIdManager::class, function(SimpleContainer $c) use ($server) {
 			return $server->getCloudIdManager();
 		});
-		$container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) {
+		$container->registerService('ExternalManager', function(SimpleContainer $c) use ($server) {
 			$user = $server->getUserSession()->getUser();
 			$uid = $user ? $user->getUID() : null;
 			$discoveryManager = new DiscoveryManager(
@@ -110,7 +110,7 @@ 
 		/**
 		 * Middleware
 		 */
-		$container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) {
+		$container->registerService('SharingCheckMiddleware', function(SimpleContainer $c) use ($server) {
 			return new SharingCheckMiddleware(
 				$c->query('AppName'),
 				$server->getConfig(),
@@ -121,7 +121,7 @@ 
 			);
 		});
 
-		$container->registerService('OCSShareAPIMiddleware', function (SimpleContainer $c) use ($server) {
+		$container->registerService('OCSShareAPIMiddleware', function(SimpleContainer $c) use ($server) {
 			return new OCSShareAPIMiddleware(
 				$server->getShareManager(),
 				$server->getL10N($c->query('AppName'))
@@ -132,7 +132,7 @@ 
 		$container->registerMiddleWare('SharingCheckMiddleware');
 		$container->registerMiddleWare('OCSShareAPIMiddleware');
 
-		$container->registerService('MountProvider', function (IContainer $c) {
+		$container->registerService('MountProvider', function(IContainer $c) {
 			/** @var \OCP\IServerContainer $server */
 			$server = $c->query('ServerContainer');
 			return new MountProvider(
@@ -142,7 +142,7 @@ 
 			);
 		});
 
-		$container->registerService('ExternalMountProvider', function (IContainer $c) {
+		$container->registerService('ExternalMountProvider', function(IContainer $c) {
 			/** @var \OCP\IServerContainer $server */
 			$server = $c->query('ServerContainer');
 			return new \OCA\Files_Sharing\External\MountProvider(

apps/files_sharing/lib/External/Scanner.php

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/Storage.php

Spacing +11 added lines, -11 removed lines

@@ -80,7 +80,7 @@ 
 			$root = '';
 		}
 		$secure = $protocol === 'https';
-		$root = rtrim($root, '/') . $discoveryManager->getWebDavEndpoint($this->cloudId->getRemote());
+		$root = rtrim($root, '/').$discoveryManager->getWebDavEndpoint($this->cloudId->getRemote());
 		$this->mountPoint = $options['mountpoint'];
 		$this->token = $options['token'];
 		parent::__construct(array(
@@ -88,7 +88,7 @@ 
 			'host' => $host,
 			'root' => $root,
 			'user' => $options['token'],
-			'password' => (string)$options['password']
+			'password' => (string) $options['password']
 		));
 	}
 
@@ -128,7 +128,7 @@ 
 	 * @return string
 	 */
 	public function getId() {
-		return 'shared::' . md5($this->token . '@' . $this->getRemote());
+		return 'shared::'.md5($this->token.'@'.$this->getRemote());
 	}
 
 	public function getCache($path = '', $storage = null) {
@@ -249,9 +249,9 @@ 
 	 */
 	protected function testRemote() {
 		try {
-			return $this->testRemoteUrl($this->getRemote() . '/ocs-provider/index.php')
-				|| $this->testRemoteUrl($this->getRemote() . '/ocs-provider/')
-				|| $this->testRemoteUrl($this->getRemote() . '/status.php');
+			return $this->testRemoteUrl($this->getRemote().'/ocs-provider/index.php')
+				|| $this->testRemoteUrl($this->getRemote().'/ocs-provider/')
+				|| $this->testRemoteUrl($this->getRemote().'/status.php');
 		} catch (\Exception $e) {
 			return false;
 		}
@@ -263,8 +263,8 @@ 
 	 */
 	private function testRemoteUrl($url) {
 		$cache = $this->memcacheFactory->create('files_sharing_remote_url');
-		if($cache->hasKey($url)) {
-			return (bool)$cache->get($url);
+		if ($cache->hasKey($url)) {
+			return (bool) $cache->get($url);
 		}
 
 		$client = $this->httpClient->newClient();
@@ -292,7 +292,7 @@ 
 	 * @return bool
 	 */
 	public function remoteIsOwnCloud() {
-		if(defined('PHPUNIT_RUN') || !$this->testRemoteUrl($this->getRemote() . '/status.php')) {
+		if (defined('PHPUNIT_RUN') || !$this->testRemoteUrl($this->getRemote().'/status.php')) {
 			return false;
 		}
 		return true;
@@ -310,11 +310,11 @@ 
 		$password = $this->getPassword();
 
 		// If remote is not an ownCloud do not try to get any share info
-		if(!$this->remoteIsOwnCloud()) {
+		if (!$this->remoteIsOwnCloud()) {
 			return ['status' => 'unsupported'];
 		}
 
-		$url = rtrim($remote, '/') . '/index.php/apps/files_sharing/shareinfo?t=' . $token;
+		$url = rtrim($remote, '/').'/index.php/apps/files_sharing/shareinfo?t='.$token;
 
 		// TODO: DI
 		$client = \OC::$server->getHTTPClientService()->newClient();

apps/files_sharing/lib/External/MountProvider.php

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/Manager.php

Spacing +15 added lines, -15 removed lines

@@ -108,18 +108,18 @@ 
 	 * @param int $remoteId
 	 * @return Mount|null
 	 */
-	public function addShare($remote, $token, $password, $name, $owner, $accepted=false, $user = null, $remoteId = -1) {
+	public function addShare($remote, $token, $password, $name, $owner, $accepted = false, $user = null, $remoteId = -1) {
 
 		$user = $user ? $user : $this->uid;
 		$accepted = $accepted ? 1 : 0;
-		$name = Filesystem::normalizePath('/' . $name);
+		$name = Filesystem::normalizePath('/'.$name);
 
 		if (!$accepted) {
 			// To avoid conflicts with the mount point generation later,
 			// we only use a temporary mount point name here. The real
 			// mount point name will be generated when accepting the share,
 			// using the original share item name.
-			$tmpMountPointName = '{{TemporaryMountPointName#' . $name . '}}';
+			$tmpMountPointName = '{{TemporaryMountPointName#'.$name.'}}';
 			$mountPoint = $tmpMountPointName;
 			$hash = md5($tmpMountPointName);
 			$data = [
@@ -138,7 +138,7 @@ 
 			$i = 1;
 			while (!$this->connection->insertIfNotExist('*PREFIX*share_external', $data, ['user', 'mountpoint_hash'])) {
 				// The external share already exists for the user
-				$data['mountpoint'] = $tmpMountPointName . '-' . $i;
+				$data['mountpoint'] = $tmpMountPointName.'-'.$i;
 				$data['mountpoint_hash'] = md5($data['mountpoint']);
 				$i++;
 			}
@@ -146,7 +146,7 @@ 
 		}
 
 		$mountPoint = Files::buildNotExistingFileName('/', $name);
-		$mountPoint = Filesystem::normalizePath('/' . $mountPoint);
+		$mountPoint = Filesystem::normalizePath('/'.$mountPoint);
 		$hash = md5($mountPoint);
 
 		$query = $this->connection->prepare('
@@ -194,7 +194,7 @@ 
 
 		if ($share) {
 			$mountPoint = Files::buildNotExistingFileName('/', $share['name']);
-			$mountPoint = Filesystem::normalizePath('/' . $mountPoint);
+			$mountPoint = Filesystem::normalizePath('/'.$mountPoint);
 			$hash = md5($mountPoint);
 
 			$acceptShare = $this->connection->prepare('
@@ -260,7 +260,7 @@ 
 	 */
 	private function sendFeedbackToRemote($remote, $token, $remoteId, $feedback) {
 
-		$url = rtrim($remote, '/') . $this->discoveryManager->getShareEndpoint($remote) . '/' . $remoteId . '/' . $feedback . '?format=' . \OCP\Share::RESPONSE_FORMAT;
+		$url = rtrim($remote, '/').$this->discoveryManager->getShareEndpoint($remote).'/'.$remoteId.'/'.$feedback.'?format='.\OCP\Share::RESPONSE_FORMAT;
 		$fields = array('token' => $token);
 
 		$client = $this->clientService->newClient();
@@ -289,13 +289,13 @@ 
 	 * @return string
 	 */
 	protected function stripPath($path) {
-		$prefix = '/' . $this->uid . '/files';
+		$prefix = '/'.$this->uid.'/files';
 		return rtrim(substr($path, strlen($prefix)), '/');
 	}
 
 	public function getMount($data) {
 		$data['manager'] = $this;
-		$mountPoint = '/' . $this->uid . '/files' . $data['mountpoint'];
+		$mountPoint = '/'.$this->uid.'/files'.$data['mountpoint'];
 		$data['mountpoint'] = $mountPoint;
 		$data['certificateManager'] = \OC::$server->getCertificateManager($this->uid);
 		return new Mount(self::STORAGE, $mountPoint, $data, $this, $this->storageLoader);
@@ -335,7 +335,7 @@ 
 			WHERE `mountpoint_hash` = ?
 			AND `user` = ?
 		');
-		$result = (bool)$query->execute(array($target, $targetHash, $sourceHash, $this->uid));
+		$result = (bool) $query->execute(array($target, $targetHash, $sourceHash, $this->uid));
 
 		return $result;
 	}
@@ -365,9 +365,9 @@ 
 			WHERE `mountpoint_hash` = ?
 			AND `user` = ?
 		');
-		$result = (bool)$query->execute(array($hash, $this->uid));
+		$result = (bool) $query->execute(array($hash, $this->uid));
 
-		if($result) {
+		if ($result) {
 			$this->removeReShares($id);
 		}
 
@@ -388,7 +388,7 @@ 
 
 
 		$query->delete('federated_reshares')
-			->where($query->expr()->in('share_id', $query->createFunction('(' . $select . ')')));
+			->where($query->expr()->in('share_id', $query->createFunction('('.$select.')')));
 		$query->execute();
 
 		$deleteReShares = $this->connection->getQueryBuilder();
@@ -412,7 +412,7 @@ 
 
 		if ($result) {
 			$shares = $getShare->fetchAll();
-			foreach($shares as $share) {
+			foreach ($shares as $share) {
 				$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
 			}
 		}
@@ -421,7 +421,7 @@ 
 			DELETE FROM `*PREFIX*share_external`
 			WHERE `user` = ?
 		');
-		return (bool)$query->execute(array($uid));
+		return (bool) $query->execute(array($uid));
 	}
 
 	/**

apps/files_sharing/lib/Updater.php

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/Helper.php

Spacing +9 added lines, -9 removed lines

@@ -87,7 +87,7 @@ 
 
 		$basePath = $path;
 
-		if ($relativePath !== null && Filesystem::isReadable($basePath . $relativePath)) {
+		if ($relativePath !== null && Filesystem::isReadable($basePath.$relativePath)) {
 			$path .= Filesystem::normalizePath($relativePath);
 		}
 
@@ -112,14 +112,14 @@ 
 		if ($password !== null) {
 			if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
 				if ($shareManager->checkPassword($share, $password)) {
-					\OC::$server->getSession()->set('public_link_authenticated', (string)$share->getId());
+					\OC::$server->getSession()->set('public_link_authenticated', (string) $share->getId());
 					return true;
 				}
 			}
 		} else {
 			// not authenticated ?
 			if (\OC::$server->getSession()->exists('public_link_authenticated')
-				&& \OC::$server->getSession()->get('public_link_authenticated') !== (string)$share->getId()) {
+				&& \OC::$server->getSession()->get('public_link_authenticated') !== (string) $share->getId()) {
 				return true;
 			}
 		}
@@ -132,7 +132,7 @@ 
 		Filesystem::initMountPoints($owner);
 		$info = Filesystem::getFileInfo($target);
 		$ownerView = new View('/'.$owner.'/files');
-		if ( $owner != User::getUser() ) {
+		if ($owner != User::getUser()) {
 			$path = $ownerView->getPath($info['fileid']);
 		} else {
 			$path = $target;
@@ -145,7 +145,7 @@ 
 			if ($info instanceof \OC\Files\FileInfo) {
 				$ids[] = $info['fileid'];
 			} else {
-				\OCP\Util::writeLog('sharing', 'No fileinfo available for: ' . $path, \OCP\Util::WARN);
+				\OCP\Util::writeLog('sharing', 'No fileinfo available for: '.$path, \OCP\Util::WARN);
 			}
 			$path = dirname($path);
 		}
@@ -155,7 +155,7 @@ 
 			$idList = array_chunk($ids, 99, true);
 
 			foreach ($idList as $subList) {
-				$statement = "SELECT `share_with`, `share_type`, `file_target` FROM `*PREFIX*share` WHERE `file_source` IN (" . implode(',', $subList) . ") AND `share_type` IN (0, 1, 2)";
+				$statement = "SELECT `share_with`, `share_type`, `file_target` FROM `*PREFIX*share` WHERE `file_source` IN (".implode(',', $subList).") AND `share_type` IN (0, 1, 2)";
 				$query = \OCP\DB::prepare($statement);
 				$r = $query->execute();
 				$result = array_merge($result, $r->fetchAll());
@@ -183,7 +183,7 @@ 
 			$uid = User::getUser();
 		}
 		Filesystem::initMountPoints($uid);
-		if ( $uid != User::getUser() ) {
+		if ($uid != User::getUser()) {
 			$info = Filesystem::getFileInfo($filename);
 			$ownerView = new View('/'.$uid.'/files');
 			try {
@@ -230,7 +230,7 @@ 
 		$dir = $pathinfo['dirname'];
 		$i = 2;
 		while ($view->file_exists($path) || in_array($path, $excludeList)) {
-			$path = Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext);
+			$path = Filesystem::normalizePath($dir.'/'.$name.' ('.$i.')'.$ext);
 			$i++;
 		}
 
@@ -254,7 +254,7 @@ 
 			$dir = '';
 			$subdirs = explode('/', $shareFolder);
 			foreach ($subdirs as $subdir) {
-				$dir = $dir . '/' . $subdir;
+				$dir = $dir.'/'.$subdir;
 				if (!$view->is_dir($dir)) {
 					$view->mkdir($dir);
 				}

apps/files_sharing/lib/DeleteOrphanedSharesJob.php

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);