nextcloud / server

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

apps/files_sharing/lib/SharedPropagator.php

Indentation +14 added lines, -14 removed lines

@@ -26,19 +26,19 @@
 use OC\Files\Cache\Propagator;
 
 class SharedPropagator extends Propagator {
-	/**
-	 * @var \OCA\Files_Sharing\SharedStorage
-	 */
-	protected $storage;
+    /**
+     * @var \OCA\Files_Sharing\SharedStorage
+     */
+    protected $storage;
 
-	/**
-	 * @param string $internalPath
-	 * @param int $time
-	 * @param int $sizeDifference
-	 */
-	public function propagateChange($internalPath, $time, $sizeDifference = 0) {
-		/** @var \OC\Files\Storage\Storage $storage */
-		list($storage, $sourceInternalPath) = $this->storage->resolvePath($internalPath);
-		$storage->getPropagator()->propagateChange($sourceInternalPath, $time, $sizeDifference);
-	}
+    /**
+     * @param string $internalPath
+     * @param int $time
+     * @param int $sizeDifference
+     */
+    public function propagateChange($internalPath, $time, $sizeDifference = 0) {
+        /** @var \OC\Files\Storage\Storage $storage */
+        list($storage, $sourceInternalPath) = $this->storage->resolvePath($internalPath);
+        $storage->getPropagator()->propagateChange($sourceInternalPath, $time, $sizeDifference);
+    }
 }

apps/files_sharing/lib/ShareBackend/File.php

Indentation +204 added lines, -204 removed lines

@@ -37,208 +37,208 @@
 
 class File implements \OCP\Share_Backend_File_Dependent {
 
-	const FORMAT_SHARED_STORAGE = 0;
-	const FORMAT_GET_FOLDER_CONTENTS = 1;
-	const FORMAT_FILE_APP_ROOT = 2;
-	const FORMAT_OPENDIR = 3;
-	const FORMAT_GET_ALL = 4;
-	const FORMAT_PERMISSIONS = 5;
-	const FORMAT_TARGET_NAMES = 6;
-
-	private $path;
-
-	/** @var FederatedShareProvider */
-	private $federatedShareProvider;
-
-	public function __construct(FederatedShareProvider $federatedShareProvider = null) {
-		if ($federatedShareProvider) {
-			$this->federatedShareProvider = $federatedShareProvider;
-		} else {
-			$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
-			$this->federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
-		}
-	}
-
-	public function isValidSource($itemSource, $uidOwner) {
-		try {
-			$path = \OC\Files\Filesystem::getPath($itemSource);
-			// FIXME: attributes should not be set here,
-			// keeping this pattern for now to avoid unexpected
-			// regressions
-			$this->path = \OC\Files\Filesystem::normalizePath(basename($path));
-			return true;
-		} catch (\OCP\Files\NotFoundException $e) {
-			return false;
-		}
-	}
-
-	public function getFilePath($itemSource, $uidOwner) {
-		if (isset($this->path)) {
-			$path = $this->path;
-			$this->path = null;
-			return $path;
-		} else {
-			try {
-				$path = \OC\Files\Filesystem::getPath($itemSource);
-				return $path;
-			} catch (\OCP\Files\NotFoundException $e) {
-				return false;
-			}
-		}
-	}
-
-	/**
-	 * create unique target
-	 * @param string $filePath
-	 * @param string $shareWith
-	 * @param array $exclude (optional)
-	 * @return string
-	 */
-	public function generateTarget($filePath, $shareWith, $exclude = null) {
-		$shareFolder = \OCA\Files_Sharing\Helper::getShareFolder();
-		$target = \OC\Files\Filesystem::normalizePath($shareFolder . '/' . basename($filePath));
-
-		// for group shares we return the target right away
-		if ($shareWith === false) {
-			return $target;
-		}
-
-		\OC\Files\Filesystem::initMountPoints($shareWith);
-		$view = new \OC\Files\View('/' . $shareWith . '/files');
-
-		if (!$view->is_dir($shareFolder)) {
-			$dir = '';
-			$subdirs = explode('/', $shareFolder);
-			foreach ($subdirs as $subdir) {
-				$dir = $dir . '/' . $subdir;
-				if (!$view->is_dir($dir)) {
-					$view->mkdir($dir);
-				}
-			}
-		}
-
-		$excludeList = (is_array($exclude)) ? $exclude : array();
-
-		return \OCA\Files_Sharing\Helper::generateUniqueTarget($target, $excludeList, $view);
-	}
-
-	public function formatItems($items, $format, $parameters = null) {
-		if ($format == self::FORMAT_SHARED_STORAGE) {
-			// Only 1 item should come through for this format call
-			$item = array_shift($items);
-			return array(
-				'parent' => $item['parent'],
-				'path' => $item['path'],
-				'storage' => $item['storage'],
-				'permissions' => $item['permissions'],
-				'uid_owner' => $item['uid_owner'],
-			);
-		} else if ($format == self::FORMAT_GET_FOLDER_CONTENTS) {
-			$files = array();
-			foreach ($items as $item) {
-				$file = array();
-				$file['fileid'] = $item['file_source'];
-				$file['storage'] = $item['storage'];
-				$file['path'] = $item['file_target'];
-				$file['parent'] = $item['file_parent'];
-				$file['name'] = basename($item['file_target']);
-				$file['mimetype'] = $item['mimetype'];
-				$file['mimepart'] = $item['mimepart'];
-				$file['mtime'] = $item['mtime'];
-				$file['encrypted'] = $item['encrypted'];
-				$file['etag'] = $item['etag'];
-				$file['uid_owner'] = $item['uid_owner'];
-				$file['displayname_owner'] = $item['displayname_owner'];
-
-				$storage = \OC\Files\Filesystem::getStorage('/');
-				$cache = $storage->getCache();
-				$file['size'] = $item['size'];
-				$files[] = $file;
-			}
-			return $files;
-		} else if ($format == self::FORMAT_OPENDIR) {
-			$files = array();
-			foreach ($items as $item) {
-				$files[] = basename($item['file_target']);
-			}
-			return $files;
-		} else if ($format == self::FORMAT_GET_ALL) {
-			$ids = array();
-			foreach ($items as $item) {
-				$ids[] = $item['file_source'];
-			}
-			return $ids;
-		} else if ($format === self::FORMAT_PERMISSIONS) {
-			$filePermissions = array();
-			foreach ($items as $item) {
-				$filePermissions[$item['file_source']] = $item['permissions'];
-			}
-			return $filePermissions;
-		} else if ($format === self::FORMAT_TARGET_NAMES) {
-			$targets = array();
-			foreach ($items as $item) {
-				$targets[] = $item['file_target'];
-			}
-			return $targets;
-		}
-		return array();
-	}
-
-	/**
-	 * check if server2server share is enabled
-	 *
-	 * @param int $shareType
-	 * @return boolean
-	 */
-	public function isShareTypeAllowed($shareType) {
-		if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) {
-			return $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
-		}
-
-		return true;
-	}
-
-	/**
-	 * resolve reshares to return the correct source item
-	 * @param array $source
-	 * @return array source item
-	 */
-	protected static function resolveReshares($source) {
-		if (isset($source['parent'])) {
-			$parent = $source['parent'];
-			while (isset($parent)) {
-				$query = \OCP\DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
-				$item = $query->execute(array($parent))->fetchRow();
-				if (isset($item['parent'])) {
-					$parent = $item['parent'];
-				} else {
-					$fileOwner = $item['uid_owner'];
-					break;
-				}
-			}
-		} else {
-			$fileOwner = $source['uid_owner'];
-		}
-		if (isset($fileOwner)) {
-			$source['fileOwner'] = $fileOwner;
-		} else {
-			\OCP\Util::writeLog('files_sharing', "No owner found for reshare", \OCP\Util::ERROR);
-		}
-
-		return $source;
-	}
-
-	/**
-	 * @param string $target
-	 * @param array $share
-	 * @return array|false source item
-	 */
-	public static function getSource($target, $share) {
-		if ($share['item_type'] === 'folder' && $target !== '') {
-			// note: in case of ext storage mount points the path might be empty
-			// which would cause a leading slash to appear
-			$share['path'] = ltrim($share['path'] . '/' . $target, '/');
-		}
-		return self::resolveReshares($share);
-	}
+    const FORMAT_SHARED_STORAGE = 0;
+    const FORMAT_GET_FOLDER_CONTENTS = 1;
+    const FORMAT_FILE_APP_ROOT = 2;
+    const FORMAT_OPENDIR = 3;
+    const FORMAT_GET_ALL = 4;
+    const FORMAT_PERMISSIONS = 5;
+    const FORMAT_TARGET_NAMES = 6;
+
+    private $path;
+
+    /** @var FederatedShareProvider */
+    private $federatedShareProvider;
+
+    public function __construct(FederatedShareProvider $federatedShareProvider = null) {
+        if ($federatedShareProvider) {
+            $this->federatedShareProvider = $federatedShareProvider;
+        } else {
+            $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
+            $this->federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
+        }
+    }
+
+    public function isValidSource($itemSource, $uidOwner) {
+        try {
+            $path = \OC\Files\Filesystem::getPath($itemSource);
+            // FIXME: attributes should not be set here,
+            // keeping this pattern for now to avoid unexpected
+            // regressions
+            $this->path = \OC\Files\Filesystem::normalizePath(basename($path));
+            return true;
+        } catch (\OCP\Files\NotFoundException $e) {
+            return false;
+        }
+    }
+
+    public function getFilePath($itemSource, $uidOwner) {
+        if (isset($this->path)) {
+            $path = $this->path;
+            $this->path = null;
+            return $path;
+        } else {
+            try {
+                $path = \OC\Files\Filesystem::getPath($itemSource);
+                return $path;
+            } catch (\OCP\Files\NotFoundException $e) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * create unique target
+     * @param string $filePath
+     * @param string $shareWith
+     * @param array $exclude (optional)
+     * @return string
+     */
+    public function generateTarget($filePath, $shareWith, $exclude = null) {
+        $shareFolder = \OCA\Files_Sharing\Helper::getShareFolder();
+        $target = \OC\Files\Filesystem::normalizePath($shareFolder . '/' . basename($filePath));
+
+        // for group shares we return the target right away
+        if ($shareWith === false) {
+            return $target;
+        }
+
+        \OC\Files\Filesystem::initMountPoints($shareWith);
+        $view = new \OC\Files\View('/' . $shareWith . '/files');
+
+        if (!$view->is_dir($shareFolder)) {
+            $dir = '';
+            $subdirs = explode('/', $shareFolder);
+            foreach ($subdirs as $subdir) {
+                $dir = $dir . '/' . $subdir;
+                if (!$view->is_dir($dir)) {
+                    $view->mkdir($dir);
+                }
+            }
+        }
+
+        $excludeList = (is_array($exclude)) ? $exclude : array();
+
+        return \OCA\Files_Sharing\Helper::generateUniqueTarget($target, $excludeList, $view);
+    }
+
+    public function formatItems($items, $format, $parameters = null) {
+        if ($format == self::FORMAT_SHARED_STORAGE) {
+            // Only 1 item should come through for this format call
+            $item = array_shift($items);
+            return array(
+                'parent' => $item['parent'],
+                'path' => $item['path'],
+                'storage' => $item['storage'],
+                'permissions' => $item['permissions'],
+                'uid_owner' => $item['uid_owner'],
+            );
+        } else if ($format == self::FORMAT_GET_FOLDER_CONTENTS) {
+            $files = array();
+            foreach ($items as $item) {
+                $file = array();
+                $file['fileid'] = $item['file_source'];
+                $file['storage'] = $item['storage'];
+                $file['path'] = $item['file_target'];
+                $file['parent'] = $item['file_parent'];
+                $file['name'] = basename($item['file_target']);
+                $file['mimetype'] = $item['mimetype'];
+                $file['mimepart'] = $item['mimepart'];
+                $file['mtime'] = $item['mtime'];
+                $file['encrypted'] = $item['encrypted'];
+                $file['etag'] = $item['etag'];
+                $file['uid_owner'] = $item['uid_owner'];
+                $file['displayname_owner'] = $item['displayname_owner'];
+
+                $storage = \OC\Files\Filesystem::getStorage('/');
+                $cache = $storage->getCache();
+                $file['size'] = $item['size'];
+                $files[] = $file;
+            }
+            return $files;
+        } else if ($format == self::FORMAT_OPENDIR) {
+            $files = array();
+            foreach ($items as $item) {
+                $files[] = basename($item['file_target']);
+            }
+            return $files;
+        } else if ($format == self::FORMAT_GET_ALL) {
+            $ids = array();
+            foreach ($items as $item) {
+                $ids[] = $item['file_source'];
+            }
+            return $ids;
+        } else if ($format === self::FORMAT_PERMISSIONS) {
+            $filePermissions = array();
+            foreach ($items as $item) {
+                $filePermissions[$item['file_source']] = $item['permissions'];
+            }
+            return $filePermissions;
+        } else if ($format === self::FORMAT_TARGET_NAMES) {
+            $targets = array();
+            foreach ($items as $item) {
+                $targets[] = $item['file_target'];
+            }
+            return $targets;
+        }
+        return array();
+    }
+
+    /**
+     * check if server2server share is enabled
+     *
+     * @param int $shareType
+     * @return boolean
+     */
+    public function isShareTypeAllowed($shareType) {
+        if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) {
+            return $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
+        }
+
+        return true;
+    }
+
+    /**
+     * resolve reshares to return the correct source item
+     * @param array $source
+     * @return array source item
+     */
+    protected static function resolveReshares($source) {
+        if (isset($source['parent'])) {
+            $parent = $source['parent'];
+            while (isset($parent)) {
+                $query = \OCP\DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
+                $item = $query->execute(array($parent))->fetchRow();
+                if (isset($item['parent'])) {
+                    $parent = $item['parent'];
+                } else {
+                    $fileOwner = $item['uid_owner'];
+                    break;
+                }
+            }
+        } else {
+            $fileOwner = $source['uid_owner'];
+        }
+        if (isset($fileOwner)) {
+            $source['fileOwner'] = $fileOwner;
+        } else {
+            \OCP\Util::writeLog('files_sharing', "No owner found for reshare", \OCP\Util::ERROR);
+        }
+
+        return $source;
+    }
+
+    /**
+     * @param string $target
+     * @param array $share
+     * @return array|false source item
+     */
+    public static function getSource($target, $share) {
+        if ($share['item_type'] === 'folder' && $target !== '') {
+            // note: in case of ext storage mount points the path might be empty
+            // which would cause a leading slash to appear
+            $share['path'] = ltrim($share['path'] . '/' . $target, '/');
+        }
+        return self::resolveReshares($share);
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
 	 */
 	public function generateTarget($filePath, $shareWith, $exclude = null) {
 		$shareFolder = \OCA\Files_Sharing\Helper::getShareFolder();
-		$target = \OC\Files\Filesystem::normalizePath($shareFolder . '/' . basename($filePath));
+		$target = \OC\Files\Filesystem::normalizePath($shareFolder.'/'.basename($filePath));
 
 		// for group shares we return the target right away
 		if ($shareWith === false) {
@@ -104,13 +104,13 @@ 
 		}
 
 		\OC\Files\Filesystem::initMountPoints($shareWith);
-		$view = new \OC\Files\View('/' . $shareWith . '/files');
+		$view = new \OC\Files\View('/'.$shareWith.'/files');
 
 		if (!$view->is_dir($shareFolder)) {
 			$dir = '';
 			$subdirs = explode('/', $shareFolder);
 			foreach ($subdirs as $subdir) {
-				$dir = $dir . '/' . $subdir;
+				$dir = $dir.'/'.$subdir;
 				if (!$view->is_dir($dir)) {
 					$view->mkdir($dir);
 				}
@@ -237,7 +237,7 @@ 
 		if ($share['item_type'] === 'folder' && $target !== '') {
 			// note: in case of ext storage mount points the path might be empty
 			// which would cause a leading slash to appear
-			$share['path'] = ltrim($share['path'] . '/' . $target, '/');
+			$share['path'] = ltrim($share['path'].'/'.$target, '/');
 		}
 		return self::resolveReshares($share);
 	}

apps/files_sharing/lib/ShareBackend/Folder.php

Indentation +69 added lines, -69 removed lines

@@ -29,79 +29,79 @@
 
 class Folder extends File implements \OCP\Share_Backend_Collection {
 
-	/**
-	 * get shared parents
-	 *
-	 * @param int $itemSource item source ID
-	 * @param string $shareWith with whom should the item be shared
-	 * @param string $owner owner of the item
-	 * @return array with shares
-	 */
-	public function getParents($itemSource, $shareWith = null, $owner = null) {
-		$result = array();
-		$parent = $this->getParentId($itemSource);
-		while ($parent) {
-			$shares = \OCP\Share::getItemSharedWithUser('folder', $parent, $shareWith, $owner);
-			if ($shares) {
-				foreach ($shares as $share) {
-					$name = basename($share['path']);
-					$share['collection']['path'] = $name;
-					$share['collection']['item_type'] = 'folder';
-					$share['file_path'] = $name;
-					$displayNameOwner = \OCP\User::getDisplayName($share['uid_owner']);
-					$displayNameShareWith = \OCP\User::getDisplayName($share['share_with']);
-					$share['displayname_owner'] = ($displayNameOwner) ? $displayNameOwner : $share['uid_owner'];
-					$share['share_with_displayname'] = ($displayNameShareWith) ? $displayNameShareWith : $share['uid_owner'];
+    /**
+     * get shared parents
+     *
+     * @param int $itemSource item source ID
+     * @param string $shareWith with whom should the item be shared
+     * @param string $owner owner of the item
+     * @return array with shares
+     */
+    public function getParents($itemSource, $shareWith = null, $owner = null) {
+        $result = array();
+        $parent = $this->getParentId($itemSource);
+        while ($parent) {
+            $shares = \OCP\Share::getItemSharedWithUser('folder', $parent, $shareWith, $owner);
+            if ($shares) {
+                foreach ($shares as $share) {
+                    $name = basename($share['path']);
+                    $share['collection']['path'] = $name;
+                    $share['collection']['item_type'] = 'folder';
+                    $share['file_path'] = $name;
+                    $displayNameOwner = \OCP\User::getDisplayName($share['uid_owner']);
+                    $displayNameShareWith = \OCP\User::getDisplayName($share['share_with']);
+                    $share['displayname_owner'] = ($displayNameOwner) ? $displayNameOwner : $share['uid_owner'];
+                    $share['share_with_displayname'] = ($displayNameShareWith) ? $displayNameShareWith : $share['uid_owner'];
 
-					$result[] = $share;
-				}
-			}
-			$parent = $this->getParentId($parent);
-		}
+                    $result[] = $share;
+                }
+            }
+            $parent = $this->getParentId($parent);
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * get file cache ID of parent
-	 *
-	 * @param int $child file cache ID of child
-	 * @return mixed parent ID or null
-	 */
-	private function getParentId($child) {
-		$query = \OCP\DB::prepare('SELECT `parent` FROM `*PREFIX*filecache` WHERE `fileid` = ?');
-		$result = $query->execute(array($child));
-		$row = $result->fetchRow();
-		$parent = ($row) ? $row['parent'] : null;
+    /**
+     * get file cache ID of parent
+     *
+     * @param int $child file cache ID of child
+     * @return mixed parent ID or null
+     */
+    private function getParentId($child) {
+        $query = \OCP\DB::prepare('SELECT `parent` FROM `*PREFIX*filecache` WHERE `fileid` = ?');
+        $result = $query->execute(array($child));
+        $row = $result->fetchRow();
+        $parent = ($row) ? $row['parent'] : null;
 
-		return $parent;
-	}
+        return $parent;
+    }
 
-	public function getChildren($itemSource) {
-		$children = array();
-		$parents = array($itemSource);
-		$query = \OCP\DB::prepare('SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?');
-		$result = $query->execute(array('httpd/unix-directory'));
-		if ($row = $result->fetchRow()) {
-			$mimetype = $row['id'];
-		} else {
-			$mimetype = -1;
-		}
-		while (!empty($parents)) {
-			$parents = "'".implode("','", $parents)."'";
-			$query = \OCP\DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache`'
-				.' WHERE `parent` IN ('.$parents.')');
-			$result = $query->execute();
-			$parents = array();
-			while ($file = $result->fetchRow()) {
-				$children[] = array('source' => $file['fileid'], 'file_path' => $file['name']);
-				// If a child folder is found look inside it
-				if ($file['mimetype'] == $mimetype) {
-					$parents[] = $file['fileid'];
-				}
-			}
-		}
-		return $children;
-	}
+    public function getChildren($itemSource) {
+        $children = array();
+        $parents = array($itemSource);
+        $query = \OCP\DB::prepare('SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?');
+        $result = $query->execute(array('httpd/unix-directory'));
+        if ($row = $result->fetchRow()) {
+            $mimetype = $row['id'];
+        } else {
+            $mimetype = -1;
+        }
+        while (!empty($parents)) {
+            $parents = "'".implode("','", $parents)."'";
+            $query = \OCP\DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache`'
+                .' WHERE `parent` IN ('.$parents.')');
+            $result = $query->execute();
+            $parents = array();
+            while ($file = $result->fetchRow()) {
+                $children[] = array('source' => $file['fileid'], 'file_path' => $file['name']);
+                // If a child folder is found look inside it
+                if ($file['mimetype'] == $mimetype) {
+                    $parents[] = $file['fileid'];
+                }
+            }
+        }
+        return $children;
+    }
 
 }

apps/files_sharing/public.php

Indentation +4 added lines, -4 removed lines

@@ -28,9 +28,9 @@
 $route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadShare' : 'files_sharing.sharecontroller.showShare';
 
 if($token !== '') {
-	OC_Response::redirect($urlGenerator->linkToRoute($route, array('token' => $token)));
+    OC_Response::redirect($urlGenerator->linkToRoute($route, array('token' => $token)));
 } else {
-	header('HTTP/1.0 404 Not Found');
-	$tmpl = new OCP\Template('', '404', 'guest');
-	print_unescaped($tmpl->fetchPage());
+    header('HTTP/1.0 404 Not Found');
+    $tmpl = new OCP\Template('', '404', 'guest');
+    print_unescaped($tmpl->fetchPage());
 }

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 $token = isset($_GET['t']) ? $_GET['t'] : '';
 $route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadShare' : 'files_sharing.sharecontroller.showShare';
 
-if($token !== '') {
+if ($token !== '') {
 	OC_Response::redirect($urlGenerator->linkToRoute($route, array('token' => $token)));
 } else {
 	header('HTTP/1.0 404 Not Found');

apps/provisioning_api/lib/Controller/AppsController.php

Spacing +4 added lines, -4 removed lines

@@ -59,11 +59,11 @@ 
 	public function getApps($filter = null) {
 		$apps = (new OC_App())->listAllApps();
 		$list = [];
-		foreach($apps as $app) {
+		foreach ($apps as $app) {
 			$list[] = $app['id'];
 		}
-		if($filter){
-			switch($filter){
+		if ($filter) {
+			switch ($filter) {
 				case 'enabled':
 					return new DataResponse(['apps' => \OC_App::getEnabledApps()]);
 					break;
@@ -88,7 +88,7 @@ 
 	 */
 	public function getAppInfo($app) {
 		$info = \OCP\App::getAppInfo($app);
-		if(!is_null($info)) {
+		if (!is_null($info)) {
 			return new DataResponse(OC_App::getAppInfo($app));
 		} else {
 			throw new OCSException('The request app was not found', \OCP\API::RESPOND_NOT_FOUND);

Indentation +79 added lines, -79 removed lines

@@ -35,91 +35,91 @@
 use OCP\IRequest;
 
 class AppsController extends OCSController {
-	/** @var \OCP\App\IAppManager */
-	private $appManager;
+    /** @var \OCP\App\IAppManager */
+    private $appManager;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(
-		$appName,
-		IRequest $request,
-		IAppManager $appManager
-	) {
-		parent::__construct($appName, $request);
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IAppManager $appManager
+     */
+    public function __construct(
+        $appName,
+        IRequest $request,
+        IAppManager $appManager
+    ) {
+        parent::__construct($appName, $request);
 
-		$this->appManager = $appManager;
-	}
+        $this->appManager = $appManager;
+    }
 
-	/**
-	 * @param string $filter
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getApps($filter = null) {
-		$apps = (new OC_App())->listAllApps();
-		$list = [];
-		foreach($apps as $app) {
-			$list[] = $app['id'];
-		}
-		if($filter){
-			switch($filter){
-				case 'enabled':
-					return new DataResponse(['apps' => \OC_App::getEnabledApps()]);
-					break;
-				case 'disabled':
-					$enabled = OC_App::getEnabledApps();
-					return new DataResponse(['apps' => array_diff($list, $enabled)]);
-					break;
-				default:
-					// Invalid filter variable
-					throw new OCSException('', 101);
-			}
+    /**
+     * @param string $filter
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getApps($filter = null) {
+        $apps = (new OC_App())->listAllApps();
+        $list = [];
+        foreach($apps as $app) {
+            $list[] = $app['id'];
+        }
+        if($filter){
+            switch($filter){
+                case 'enabled':
+                    return new DataResponse(['apps' => \OC_App::getEnabledApps()]);
+                    break;
+                case 'disabled':
+                    $enabled = OC_App::getEnabledApps();
+                    return new DataResponse(['apps' => array_diff($list, $enabled)]);
+                    break;
+                default:
+                    // Invalid filter variable
+                    throw new OCSException('', 101);
+            }
 
-		} else {
-			return new DataResponse(['apps' => $list]);
-		}
-	}
+        } else {
+            return new DataResponse(['apps' => $list]);
+        }
+    }
 
-	/**
-	 * @param string $app
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getAppInfo($app) {
-		$info = \OCP\App::getAppInfo($app);
-		if(!is_null($info)) {
-			return new DataResponse(OC_App::getAppInfo($app));
-		} else {
-			throw new OCSException('The request app was not found', \OCP\API::RESPOND_NOT_FOUND);
-		}
-	}
+    /**
+     * @param string $app
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getAppInfo($app) {
+        $info = \OCP\App::getAppInfo($app);
+        if(!is_null($info)) {
+            return new DataResponse(OC_App::getAppInfo($app));
+        } else {
+            throw new OCSException('The request app was not found', \OCP\API::RESPOND_NOT_FOUND);
+        }
+    }
 
-	/**
-	 * @PasswordConfirmationRequired
-	 * @param string $app
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function enable($app) {
-		try {
-			$this->appManager->enableApp($app);
-		} catch (AppPathNotFoundException $e) {
-			throw new OCSException('The request app was not found', \OCP\API::RESPOND_NOT_FOUND);
-		}
-		return new DataResponse();
-	}
+    /**
+     * @PasswordConfirmationRequired
+     * @param string $app
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function enable($app) {
+        try {
+            $this->appManager->enableApp($app);
+        } catch (AppPathNotFoundException $e) {
+            throw new OCSException('The request app was not found', \OCP\API::RESPOND_NOT_FOUND);
+        }
+        return new DataResponse();
+    }
 
-	/**
-	 * @PasswordConfirmationRequired
-	 * @param string $app
-	 * @return DataResponse
-	 */
-	public function disable($app) {
-		$this->appManager->disableApp($app);
-		return new DataResponse();
-	}
+    /**
+     * @PasswordConfirmationRequired
+     * @param string $app
+     * @return DataResponse
+     */
+    public function disable($app) {
+        $this->appManager->disableApp($app);
+        return new DataResponse();
+    }
 
 }