nextcloud / server

apps/files_sharing/appinfo/routes.php

Indentation +90 added lines, -90 removed lines

@@ -27,102 +27,102 @@
  */
 
 return [
-	'resources' => [
-		'ExternalShares' => ['url' => '/api/externalShares'],
-	],
-	'routes' => [
-		[
-			'name' => 'externalShares#testRemote',
-			'url' => '/testremote',
-			'verb' => 'GET'
-		],
-		[
-			'name' => 'PublicPreview#getPreview',
-			'url' => '/publicpreview',
-			'verb' => 'GET',
-		],
+    'resources' => [
+        'ExternalShares' => ['url' => '/api/externalShares'],
+    ],
+    'routes' => [
+        [
+            'name' => 'externalShares#testRemote',
+            'url' => '/testremote',
+            'verb' => 'GET'
+        ],
+        [
+            'name' => 'PublicPreview#getPreview',
+            'url' => '/publicpreview',
+            'verb' => 'GET',
+        ],
 
-		[
-			'name' => 'PublicPreview#getPreview',
-			'url' => '/ajax/publicpreview.php',
-			'verb' => 'GET',
-		],
+        [
+            'name' => 'PublicPreview#getPreview',
+            'url' => '/ajax/publicpreview.php',
+            'verb' => 'GET',
+        ],
 
-		[
-			'name' => 'ShareInfo#info',
-			'url' => '/shareinfo',
-			'verb' => 'POST',
-		],
-	],
-	'ocs' => [
-		/*
+        [
+            'name' => 'ShareInfo#info',
+            'url' => '/shareinfo',
+            'verb' => 'POST',
+        ],
+    ],
+    'ocs' => [
+        /*
 		 * OCS Share API
 		 */
-		[
-			'name' => 'ShareAPI#getShares',
-			'url'  => '/api/v1/shares',
-			'verb' => 'GET',
-		],
-		[
-			'name' => 'ShareAPI#createShare',
-			'url'  => '/api/v1/shares',
-			'verb' => 'POST',
-		],
-		[
-			'name' => 'ShareAPI#getShare',
-			'url'  => '/api/v1/shares/{id}',
-			'verb' => 'GET',
-		],
-		[
-			'name' => 'ShareAPI#updateShare',
-			'url'  => '/api/v1/shares/{id}',
-			'verb' => 'PUT',
-		],
-		[
-			'name' => 'ShareAPI#deleteShare',
-			'url'  => '/api/v1/shares/{id}',
-			'verb' => 'DELETE',
-		],
-		/*
+        [
+            'name' => 'ShareAPI#getShares',
+            'url'  => '/api/v1/shares',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'ShareAPI#createShare',
+            'url'  => '/api/v1/shares',
+            'verb' => 'POST',
+        ],
+        [
+            'name' => 'ShareAPI#getShare',
+            'url'  => '/api/v1/shares/{id}',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'ShareAPI#updateShare',
+            'url'  => '/api/v1/shares/{id}',
+            'verb' => 'PUT',
+        ],
+        [
+            'name' => 'ShareAPI#deleteShare',
+            'url'  => '/api/v1/shares/{id}',
+            'verb' => 'DELETE',
+        ],
+        /*
 		 * OCS Sharee API
 		 */
-		[
-			'name' => 'ShareesAPI#search',
-			'url' => '/api/v1/sharees',
-			'verb' => 'GET',
-		],
-		/*
+        [
+            'name' => 'ShareesAPI#search',
+            'url' => '/api/v1/sharees',
+            'verb' => 'GET',
+        ],
+        /*
 		 * Remote Shares
 		 */
-		[
-			'name' => 'Remote#getShares',
-			'url' => '/api/v1/remote_shares',
-			'verb' => 'GET',
-		],
-		[
-			'name' => 'Remote#getOpenShares',
-			'url' => '/api/v1/remote_shares/pending',
-			'verb' => 'GET',
-		],
-		[
-			'name' => 'Remote#acceptShare',
-			'url' => '/api/v1/remote_shares/pending/{id}',
-			'verb' => 'POST',
-		],
-		[
-			'name' => 'Remote#declineShare',
-			'url' => '/api/v1/remote_shares/pending/{id}',
-			'verb' => 'DELETE',
-		],
-		[
-			'name' => 'Remote#getShare',
-			'url' => '/api/v1/remote_shares/{id}',
-			'verb' => 'GET',
-		],
-		[
-			'name' => 'Remote#unshare',
-			'url' => '/api/v1/remote_shares/{id}',
-			'verb' => 'DELETE',
-		],
-	],
+        [
+            'name' => 'Remote#getShares',
+            'url' => '/api/v1/remote_shares',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'Remote#getOpenShares',
+            'url' => '/api/v1/remote_shares/pending',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'Remote#acceptShare',
+            'url' => '/api/v1/remote_shares/pending/{id}',
+            'verb' => 'POST',
+        ],
+        [
+            'name' => 'Remote#declineShare',
+            'url' => '/api/v1/remote_shares/pending/{id}',
+            'verb' => 'DELETE',
+        ],
+        [
+            'name' => 'Remote#getShare',
+            'url' => '/api/v1/remote_shares/{id}',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'Remote#unshare',
+            'url' => '/api/v1/remote_shares/{id}',
+            'verb' => 'DELETE',
+        ],
+    ],
 ];

apps/files_sharing/lib/AppInfo/Application.php

Indentation +117 added lines, -117 removed lines

@@ -41,134 +41,134 @@
 use OCP\IServerContainer;
 
 class Application extends App {
-	public function __construct(array $urlParams = array()) {
-		parent::__construct('files_sharing', $urlParams);
+    public function __construct(array $urlParams = array()) {
+        parent::__construct('files_sharing', $urlParams);
 
-		$container = $this->getContainer();
-		/** @var IServerContainer $server */
-		$server = $container->getServer();
+        $container = $this->getContainer();
+        /** @var IServerContainer $server */
+        $server = $container->getServer();
 
-		/**
-		 * Controllers
-		 */
-		$container->registerService('ShareController', function (SimpleContainer $c) use ($server) {
-			$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
-			return new ShareController(
-				$c->query('AppName'),
-				$c->query('Request'),
-				$server->getConfig(),
-				$server->getURLGenerator(),
-				$server->getUserManager(),
-				$server->getLogger(),
-				$server->getActivityManager(),
-				$server->getShareManager(),
-				$server->getSession(),
-				$server->getPreviewManager(),
-				$server->getRootFolder(),
-				$federatedSharingApp->getFederatedShareProvider(),
-				$server->getEventDispatcher(),
-				$server->getL10N($c->query('AppName')),
-				$server->query(Defaults::class)
-			);
-		});
-		$container->registerService('ExternalSharesController', function (SimpleContainer $c) {
-			return new ExternalSharesController(
-				$c->query('AppName'),
-				$c->query('Request'),
-				$c->query('ExternalManager'),
-				$c->query('HttpClientService')
-			);
-		});
+        /**
+         * Controllers
+         */
+        $container->registerService('ShareController', function (SimpleContainer $c) use ($server) {
+            $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
+            return new ShareController(
+                $c->query('AppName'),
+                $c->query('Request'),
+                $server->getConfig(),
+                $server->getURLGenerator(),
+                $server->getUserManager(),
+                $server->getLogger(),
+                $server->getActivityManager(),
+                $server->getShareManager(),
+                $server->getSession(),
+                $server->getPreviewManager(),
+                $server->getRootFolder(),
+                $federatedSharingApp->getFederatedShareProvider(),
+                $server->getEventDispatcher(),
+                $server->getL10N($c->query('AppName')),
+                $server->query(Defaults::class)
+            );
+        });
+        $container->registerService('ExternalSharesController', function (SimpleContainer $c) {
+            return new ExternalSharesController(
+                $c->query('AppName'),
+                $c->query('Request'),
+                $c->query('ExternalManager'),
+                $c->query('HttpClientService')
+            );
+        });
 
-		/**
-		 * Core class wrappers
-		 */
-		$container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) {
-			return $server->getHTTPClientService();
-		});
-		$container->registerService(ICloudIdManager::class, function (SimpleContainer $c) use ($server) {
-			return $server->getCloudIdManager();
-		});
-		$container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) {
-			$user = $server->getUserSession()->getUser();
-			$uid = $user ? $user->getUID() : null;
-			return new \OCA\Files_Sharing\External\Manager(
-				$server->getDatabaseConnection(),
-				\OC\Files\Filesystem::getMountManager(),
-				\OC\Files\Filesystem::getLoader(),
-				$server->getHTTPClientService(),
-				$server->getNotificationManager(),
-				$server->query(\OCP\OCS\IDiscoveryService::class),
-				$uid
-			);
-		});
-		$container->registerAlias('OCA\Files_Sharing\External\Manager', 'ExternalManager');
+        /**
+         * Core class wrappers
+         */
+        $container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) {
+            return $server->getHTTPClientService();
+        });
+        $container->registerService(ICloudIdManager::class, function (SimpleContainer $c) use ($server) {
+            return $server->getCloudIdManager();
+        });
+        $container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) {
+            $user = $server->getUserSession()->getUser();
+            $uid = $user ? $user->getUID() : null;
+            return new \OCA\Files_Sharing\External\Manager(
+                $server->getDatabaseConnection(),
+                \OC\Files\Filesystem::getMountManager(),
+                \OC\Files\Filesystem::getLoader(),
+                $server->getHTTPClientService(),
+                $server->getNotificationManager(),
+                $server->query(\OCP\OCS\IDiscoveryService::class),
+                $uid
+            );
+        });
+        $container->registerAlias('OCA\Files_Sharing\External\Manager', 'ExternalManager');
 
-		/**
-		 * Middleware
-		 */
-		$container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) {
-			return new SharingCheckMiddleware(
-				$c->query('AppName'),
-				$server->getConfig(),
-				$server->getAppManager(),
-				$c['ControllerMethodReflector'],
-				$server->getShareManager(),
-				$server->getRequest()
-			);
-		});
+        /**
+         * Middleware
+         */
+        $container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) {
+            return new SharingCheckMiddleware(
+                $c->query('AppName'),
+                $server->getConfig(),
+                $server->getAppManager(),
+                $c['ControllerMethodReflector'],
+                $server->getShareManager(),
+                $server->getRequest()
+            );
+        });
 
-		$container->registerService('OCSShareAPIMiddleware', function (SimpleContainer $c) use ($server) {
-			return new OCSShareAPIMiddleware(
-				$server->getShareManager(),
-				$server->getL10N($c->query('AppName'))
-			);
-		});
+        $container->registerService('OCSShareAPIMiddleware', function (SimpleContainer $c) use ($server) {
+            return new OCSShareAPIMiddleware(
+                $server->getShareManager(),
+                $server->getL10N($c->query('AppName'))
+            );
+        });
 
-		$container->registerService(ShareInfoMiddleware::class, function () use ($server) {
-			return new ShareInfoMiddleware(
-				$server->getShareManager()
-			);
-		});
+        $container->registerService(ShareInfoMiddleware::class, function () use ($server) {
+            return new ShareInfoMiddleware(
+                $server->getShareManager()
+            );
+        });
 
-		// Execute middlewares
-		$container->registerMiddleWare('SharingCheckMiddleware');
-		$container->registerMiddleWare('OCSShareAPIMiddleware');
-		$container->registerMiddleWare(ShareInfoMiddleware::class);
+        // Execute middlewares
+        $container->registerMiddleWare('SharingCheckMiddleware');
+        $container->registerMiddleWare('OCSShareAPIMiddleware');
+        $container->registerMiddleWare(ShareInfoMiddleware::class);
 
-		$container->registerService('MountProvider', function (IContainer $c) {
-			/** @var \OCP\IServerContainer $server */
-			$server = $c->query('ServerContainer');
-			return new MountProvider(
-				$server->getConfig(),
-				$server->getShareManager(),
-				$server->getLogger()
-			);
-		});
+        $container->registerService('MountProvider', function (IContainer $c) {
+            /** @var \OCP\IServerContainer $server */
+            $server = $c->query('ServerContainer');
+            return new MountProvider(
+                $server->getConfig(),
+                $server->getShareManager(),
+                $server->getLogger()
+            );
+        });
 
-		$container->registerService('ExternalMountProvider', function (IContainer $c) {
-			/** @var \OCP\IServerContainer $server */
-			$server = $c->query('ServerContainer');
-			return new \OCA\Files_Sharing\External\MountProvider(
-				$server->getDatabaseConnection(),
-				function() use ($c) {
-					return $c->query('ExternalManager');
-				},
-				$server->getCloudIdManager()
-			);
-		});
+        $container->registerService('ExternalMountProvider', function (IContainer $c) {
+            /** @var \OCP\IServerContainer $server */
+            $server = $c->query('ServerContainer');
+            return new \OCA\Files_Sharing\External\MountProvider(
+                $server->getDatabaseConnection(),
+                function() use ($c) {
+                    return $c->query('ExternalManager');
+                },
+                $server->getCloudIdManager()
+            );
+        });
 
-		/*
+        /*
 		 * Register capabilities
 		 */
-		$container->registerCapability('OCA\Files_Sharing\Capabilities');
-	}
+        $container->registerCapability('OCA\Files_Sharing\Capabilities');
+    }
 
-	public function registerMountProviders() {
-		/** @var \OCP\IServerContainer $server */
-		$server = $this->getContainer()->query('ServerContainer');
-		$mountProviderCollection = $server->getMountProviderCollection();
-		$mountProviderCollection->registerProvider($this->getContainer()->query('MountProvider'));
-		$mountProviderCollection->registerProvider($this->getContainer()->query('ExternalMountProvider'));
-	}
+    public function registerMountProviders() {
+        /** @var \OCP\IServerContainer $server */
+        $server = $this->getContainer()->query('ServerContainer');
+        $mountProviderCollection = $server->getMountProviderCollection();
+        $mountProviderCollection->registerProvider($this->getContainer()->query('MountProvider'));
+        $mountProviderCollection->registerProvider($this->getContainer()->query('ExternalMountProvider'));
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -51,7 +51,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'),
@@ -71,7 +71,7 @@ 
 				$server->query(Defaults::class)
 			);
 		});
-		$container->registerService('ExternalSharesController', function (SimpleContainer $c) {
+		$container->registerService('ExternalSharesController', function(SimpleContainer $c) {
 			return new ExternalSharesController(
 				$c->query('AppName'),
 				$c->query('Request'),
@@ -83,13 +83,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;
 			return new \OCA\Files_Sharing\External\Manager(
@@ -107,7 +107,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(),
@@ -118,14 +118,14 @@ 
 			);
 		});
 
-		$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'))
 			);
 		});
 
-		$container->registerService(ShareInfoMiddleware::class, function () use ($server) {
+		$container->registerService(ShareInfoMiddleware::class, function() use ($server) {
 			return new ShareInfoMiddleware(
 				$server->getShareManager()
 			);
@@ -136,7 +136,7 @@ 
 		$container->registerMiddleWare('OCSShareAPIMiddleware');
 		$container->registerMiddleWare(ShareInfoMiddleware::class);
 
-		$container->registerService('MountProvider', function (IContainer $c) {
+		$container->registerService('MountProvider', function(IContainer $c) {
 			/** @var \OCP\IServerContainer $server */
 			$server = $c->query('ServerContainer');
 			return new MountProvider(
@@ -146,7 +146,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/Controller/ShareInfoController.php

Unused Use Statements -1 removed lines

@@ -10,7 +10,6 @@
 use OCP\Files\File;
 use OCP\Files\Folder;
 use OCP\Files\Node;
-use OCP\ILogger;
 use OCP\IRequest;
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;

Indentation +110 added lines, -110 removed lines

@@ -17,114 +17,114 @@
 
 class ShareInfoController extends ApiController {
 
-	/** @var IManager */
-	private $shareManager;
-
-	/**
-	 * ShareInfoController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IManager $shareManager
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IManager $shareManager) {
-		parent::__construct($appName, $request);
-
-		$this->shareManager = $shareManager;
-	}
-
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param string $t
-	 * @param null $password
-	 * @param null $dir
-	 * @return JSONResponse
-	 * @throws ShareNotFound
-	 */
-	public function info($t, $password = null, $dir = null) {
-		try {
-			$share = $this->shareManager->getShareByToken($t);
-		} catch (ShareNotFound $e) {
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		if ($share->getPassword() && !$this->shareManager->checkPassword($share, $password)) {
-			return new JSONResponse([], Http::STATUS_FORBIDDEN);
-		}
-
-		if (!($share->getPermissions() & Constants::PERMISSION_READ)) {
-			return new JSONResponse([], Http::STATUS_FORBIDDEN);
-		}
-
-		$isWritable = $share->getPermissions() & (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_CREATE);
-		if (!$isWritable) {
-			$this->addROWrapper();
-		}
-
-		$node = $share->getNode();
-
-		if ($dir !== null && $node instanceof Folder) {
-			try {
-				$node = $node->get($dir);
-			} catch (NotFoundException $e) {
-
-			}
-		}
-
-		return new JSONResponse($this->parseNode($node));
-	}
-
-	private function parseNode(Node $node) {
-		if ($node instanceof File) {
-			return $this->parseFile($node);
-		}
-		return $this->parseFolder($node);
-	}
-
-	private function parseFile(File $file) {
-		return $this->format($file);
-	}
-
-	private function parseFolder(Folder $folder) {
-		$data = $this->format($folder);
-
-		$data['children'] = [];
-
-		$nodes = $folder->getDirectoryListing();
-		foreach ($nodes as $node) {
-			$data['children'][] = $this->parseNode($node);
-		}
-
-		return $data;
-	}
-
-	private function format(Node $node) {
-		$entry = [];
-
-		$entry['id'] = $node->getId();
-		$entry['parentId'] = $node->getParent()->getId();
-		$entry['mtime'] = $node->getMTime();
-
-		$entry['name'] = $node->getName();
-		$entry['permissions'] = $node->getPermissions();
-		$entry['mimetype'] = $node->getMimetype();
-		$entry['size'] = $node->getSize();
-		$entry['type'] = $node->getType();
-		$entry['etag'] = $node->getEtag();
-
-		return $entry;
-	}
-
-	protected function addROWrapper() {
-		// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
-		$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
-		\OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
-			return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
-		});
-		\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
-	}
+    /** @var IManager */
+    private $shareManager;
+
+    /**
+     * ShareInfoController constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IManager $shareManager
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IManager $shareManager) {
+        parent::__construct($appName, $request);
+
+        $this->shareManager = $shareManager;
+    }
+
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param string $t
+     * @param null $password
+     * @param null $dir
+     * @return JSONResponse
+     * @throws ShareNotFound
+     */
+    public function info($t, $password = null, $dir = null) {
+        try {
+            $share = $this->shareManager->getShareByToken($t);
+        } catch (ShareNotFound $e) {
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        if ($share->getPassword() && !$this->shareManager->checkPassword($share, $password)) {
+            return new JSONResponse([], Http::STATUS_FORBIDDEN);
+        }
+
+        if (!($share->getPermissions() & Constants::PERMISSION_READ)) {
+            return new JSONResponse([], Http::STATUS_FORBIDDEN);
+        }
+
+        $isWritable = $share->getPermissions() & (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_CREATE);
+        if (!$isWritable) {
+            $this->addROWrapper();
+        }
+
+        $node = $share->getNode();
+
+        if ($dir !== null && $node instanceof Folder) {
+            try {
+                $node = $node->get($dir);
+            } catch (NotFoundException $e) {
+
+            }
+        }
+
+        return new JSONResponse($this->parseNode($node));
+    }
+
+    private function parseNode(Node $node) {
+        if ($node instanceof File) {
+            return $this->parseFile($node);
+        }
+        return $this->parseFolder($node);
+    }
+
+    private function parseFile(File $file) {
+        return $this->format($file);
+    }
+
+    private function parseFolder(Folder $folder) {
+        $data = $this->format($folder);
+
+        $data['children'] = [];
+
+        $nodes = $folder->getDirectoryListing();
+        foreach ($nodes as $node) {
+            $data['children'][] = $this->parseNode($node);
+        }
+
+        return $data;
+    }
+
+    private function format(Node $node) {
+        $entry = [];
+
+        $entry['id'] = $node->getId();
+        $entry['parentId'] = $node->getParent()->getId();
+        $entry['mtime'] = $node->getMTime();
+
+        $entry['name'] = $node->getName();
+        $entry['permissions'] = $node->getPermissions();
+        $entry['mimetype'] = $node->getMimetype();
+        $entry['size'] = $node->getSize();
+        $entry['type'] = $node->getType();
+        $entry['etag'] = $node->getEtag();
+
+        return $entry;
+    }
+
+    protected function addROWrapper() {
+        // FIXME: should not add storage wrappers outside of preSetup, need to find a better way
+        $previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
+        \OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
+            return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
+        });
+        \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
 	protected function addROWrapper() {
 		// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
 		$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
-		\OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
+		\OC\Files\Filesystem::addStorageWrapper('readonly', function($mountPoint, $storage) {
 			return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
 		});
 		\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);

apps/files_sharing/lib/Middleware/ShareInfoMiddleware.php

Indentation +58 added lines, -58 removed lines

@@ -13,74 +13,74 @@
 use OCP\Share\IManager;
 
 class ShareInfoMiddleware extends Middleware {
-	/** @var IManager */
-	private $shareManager;
+    /** @var IManager */
+    private $shareManager;
 
-	public function __construct(IManager $shareManager) {
-		$this->shareManager = $shareManager;
-	}
+    public function __construct(IManager $shareManager) {
+        $this->shareManager = $shareManager;
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @throws S2SException
-	 */
-	public function beforeController($controller, $methodName) {
-		if (!($controller instanceof ShareInfoController)) {
-			return;
-		}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @throws S2SException
+     */
+    public function beforeController($controller, $methodName) {
+        if (!($controller instanceof ShareInfoController)) {
+            return;
+        }
 
-		if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
-			throw new S2SException();
-		}
-	}
+        if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
+            throw new S2SException();
+        }
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param \Exception $exception
-	 * @throws \Exception
-	 * @return Response
-	 */
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if (!($controller instanceof ShareInfoController)) {
-			throw $exception;
-		}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @param \Exception $exception
+     * @throws \Exception
+     * @return Response
+     */
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if (!($controller instanceof ShareInfoController)) {
+            throw $exception;
+        }
 
-		if ($exception instanceof S2SException) {
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
+        if ($exception instanceof S2SException) {
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
 
-		throw $exception;
-	}
+        throw $exception;
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param Response $response
-	 * @return Response
-	 */
-	public function afterController($controller, $methodName, Response $response) {
-		if (!($controller instanceof ShareInfoController)) {
-			return $response;
-		}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @param Response $response
+     * @return Response
+     */
+    public function afterController($controller, $methodName, Response $response) {
+        if (!($controller instanceof ShareInfoController)) {
+            return $response;
+        }
 
-		if (!($response instanceof JSONResponse)) {
-			return $response;
-		}
+        if (!($response instanceof JSONResponse)) {
+            return $response;
+        }
 
-		$data = $response->getData();
-		$status = 'error';
+        $data = $response->getData();
+        $status = 'error';
 
-		if ($response->getStatus() === Http::STATUS_OK) {
-			$status = 'success';
-		}
+        if ($response->getStatus() === Http::STATUS_OK) {
+            $status = 'success';
+        }
 
-		$response->setData([
-			'data' => $data,
-			'status' => $status,
-		]);
+        $response->setData([
+            'data' => $data,
+            'status' => $status,
+        ]);
 
-		return $response;
-	}
+        return $response;
+    }
 }