nextcloud / server

apps/dav/lib/Direct/Server.php

Indentation +5 added lines, -5 removed lines

@@ -25,9 +25,9 @@
 namespace OCA\DAV\Direct;
 
 class Server extends \Sabre\DAV\Server {
-	public function __construct($treeOrNode = null) {
-		parent::__construct($treeOrNode);
-		self::$exposeVersion = false;
-		$this->enablePropfindDepthInfinityf = false;
-	}
+    public function __construct($treeOrNode = null) {
+        parent::__construct($treeOrNode);
+        self::$exposeVersion = false;
+        $this->enablePropfindDepthInfinityf = false;
+    }
 }

apps/dav/lib/Db/Direct.php

Indentation +14 added lines, -14 removed lines

@@ -37,22 +37,22 @@
  * @method void setExpiration(int $expiration)
  */
 class Direct extends Entity {
-	/** @var string */
-	protected $userId;
+    /** @var string */
+    protected $userId;
 
-	/** @var int */
-	protected $fileId;
+    /** @var int */
+    protected $fileId;
 
-	/** @var string */
-	protected $token;
+    /** @var string */
+    protected $token;
 
-	/** @var int */
-	protected $expiration;
+    /** @var int */
+    protected $expiration;
 
-	public function __construct() {
-		$this->addType('userId', 'string');
-		$this->addType('fileId', 'int');
-		$this->addType('token', 'string');
-		$this->addType('expiration', 'int');
-	}
+    public function __construct() {
+        $this->addType('userId', 'string');
+        $this->addType('fileId', 'int');
+        $this->addType('token', 'string');
+        $this->addType('expiration', 'int');
+    }
 }

apps/dav/lib/Migration/Version1005Date20180413093149.php

Indentation +41 added lines, -41 removed lines

@@ -31,50 +31,50 @@
 
 class Version1005Date20180413093149 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
 
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('directlink')) {
-			$table = $schema->createTable('directlink');
+        if (!$schema->hasTable('directlink')) {
+            $table = $schema->createTable('directlink');
 
-			$table->addColumn('id',Type::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('user_id', Type::STRING, [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('file_id', Type::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('token', Type::STRING, [
-				'notnull' => false,
-				'length' => 60,
-			]);
-			$table->addColumn('expiration', Type::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
+            $table->addColumn('id',Type::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('user_id', Type::STRING, [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('file_id', Type::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('token', Type::STRING, [
+                'notnull' => false,
+                'length' => 60,
+            ]);
+            $table->addColumn('expiration', Type::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
 
-			$table->setPrimaryKey(['id'], 'directlink_id_idx');
-			$table->addIndex(['token'], 'directlink_token_idx');
-			$table->addIndex(['expiration'], 'directlink_expiration_idx');
+            $table->setPrimaryKey(['id'], 'directlink_id_idx');
+            $table->addIndex(['token'], 'directlink_token_idx');
+            $table->addIndex(['expiration'], 'directlink_expiration_idx');
 
-			return $schema;
-		}
-	}
+            return $schema;
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 		if (!$schema->hasTable('directlink')) {
 			$table = $schema->createTable('directlink');
 
-			$table->addColumn('id',Type::BIGINT, [
+			$table->addColumn('id', Type::BIGINT, [
 				'autoincrement' => true,
 				'notnull' => true,
 				'length' => 11,

apps/dav/appinfo/routes.php

Indentation +7 added lines, -7 removed lines

@@ -22,11 +22,11 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'birthday_calendar#enable', 'url' => '/enableBirthdayCalendar', 'verb' => 'POST'],
-		['name' => 'birthday_calendar#disable', 'url' => '/disableBirthdayCalendar', 'verb' => 'POST'],
-	],
-	'ocs' => [
-		['name' => 'direct#getUrl', 'url' => '/api/v1/direct', 'verb' => 'POST'],
-	],
+    'routes' => [
+        ['name' => 'birthday_calendar#enable', 'url' => '/enableBirthdayCalendar', 'verb' => 'POST'],
+        ['name' => 'birthday_calendar#disable', 'url' => '/disableBirthdayCalendar', 'verb' => 'POST'],
+    ],
+    'ocs' => [
+        ['name' => 'direct#getUrl', 'url' => '/api/v1/direct', 'verb' => 'POST'],
+    ],
 ];

remote.php

Indentation +109 added lines, -109 removed lines

@@ -46,45 +46,45 @@ 
  * @param Exception|Error $e
  */
 function handleException($e) {
-	$request = \OC::$server->getRequest();
-	// in case the request content type is text/xml - we assume it's a WebDAV request
-	$isXmlContentType = strpos($request->getHeader('Content-Type'), 'text/xml');
-	if ($isXmlContentType === 0) {
-		// fire up a simple server to properly process the exception
-		$server = new Server();
-		if (!($e instanceof RemoteException)) {
-			// we shall not log on RemoteException
-			$server->addPlugin(new ExceptionLoggerPlugin('webdav', \OC::$server->getLogger()));
-		}
-		$server->on('beforeMethod', function () use ($e) {
-			if ($e instanceof RemoteException) {
-				switch ($e->getCode()) {
-					case OC_Response::STATUS_SERVICE_UNAVAILABLE:
-						throw new ServiceUnavailable($e->getMessage());
-					case OC_Response::STATUS_NOT_FOUND:
-						throw new \Sabre\DAV\Exception\NotFound($e->getMessage());
-				}
-			}
-			$class = get_class($e);
-			$msg = $e->getMessage();
-			throw new ServiceUnavailable("$class: $msg");
-		});
-		$server->exec();
-	} else {
-		$statusCode = OC_Response::STATUS_INTERNAL_SERVER_ERROR;
-		if ($e instanceof \OC\ServiceUnavailableException ) {
-			$statusCode = OC_Response::STATUS_SERVICE_UNAVAILABLE;
-		}
-		if ($e instanceof RemoteException) {
-			// we shall not log on RemoteException
-			OC_Response::setStatus($e->getCode());
-			OC_Template::printErrorPage($e->getMessage());
-		} else {
-			\OC::$server->getLogger()->logException($e, ['app' => 'remote']);
-			OC_Response::setStatus($statusCode);
-			OC_Template::printExceptionErrorPage($e);
-		}
-	}
+    $request = \OC::$server->getRequest();
+    // in case the request content type is text/xml - we assume it's a WebDAV request
+    $isXmlContentType = strpos($request->getHeader('Content-Type'), 'text/xml');
+    if ($isXmlContentType === 0) {
+        // fire up a simple server to properly process the exception
+        $server = new Server();
+        if (!($e instanceof RemoteException)) {
+            // we shall not log on RemoteException
+            $server->addPlugin(new ExceptionLoggerPlugin('webdav', \OC::$server->getLogger()));
+        }
+        $server->on('beforeMethod', function () use ($e) {
+            if ($e instanceof RemoteException) {
+                switch ($e->getCode()) {
+                    case OC_Response::STATUS_SERVICE_UNAVAILABLE:
+                        throw new ServiceUnavailable($e->getMessage());
+                    case OC_Response::STATUS_NOT_FOUND:
+                        throw new \Sabre\DAV\Exception\NotFound($e->getMessage());
+                }
+            }
+            $class = get_class($e);
+            $msg = $e->getMessage();
+            throw new ServiceUnavailable("$class: $msg");
+        });
+        $server->exec();
+    } else {
+        $statusCode = OC_Response::STATUS_INTERNAL_SERVER_ERROR;
+        if ($e instanceof \OC\ServiceUnavailableException ) {
+            $statusCode = OC_Response::STATUS_SERVICE_UNAVAILABLE;
+        }
+        if ($e instanceof RemoteException) {
+            // we shall not log on RemoteException
+            OC_Response::setStatus($e->getCode());
+            OC_Template::printErrorPage($e->getMessage());
+        } else {
+            \OC::$server->getLogger()->logException($e, ['app' => 'remote']);
+            OC_Response::setStatus($statusCode);
+            OC_Template::printExceptionErrorPage($e);
+        }
+    }
 }
 
 /**
@@ -92,80 +92,80 @@ 
  * @return string
  */
 function resolveService($service) {
-	$services = [
-		'webdav' => 'dav/appinfo/v1/webdav.php',
-		'dav' => 'dav/appinfo/v2/remote.php',
-		'caldav' => 'dav/appinfo/v1/caldav.php',
-		'calendar' => 'dav/appinfo/v1/caldav.php',
-		'carddav' => 'dav/appinfo/v1/carddav.php',
-		'contacts' => 'dav/appinfo/v1/carddav.php',
-		'files' => 'dav/appinfo/v1/webdav.php',
-		'direct' => 'dav/appinfo/v2/direct.php',
-	];
-	if (isset($services[$service])) {
-		return $services[$service];
-	}
-
-	return \OC::$server->getConfig()->getAppValue('core', 'remote_' . $service);
+    $services = [
+        'webdav' => 'dav/appinfo/v1/webdav.php',
+        'dav' => 'dav/appinfo/v2/remote.php',
+        'caldav' => 'dav/appinfo/v1/caldav.php',
+        'calendar' => 'dav/appinfo/v1/caldav.php',
+        'carddav' => 'dav/appinfo/v1/carddav.php',
+        'contacts' => 'dav/appinfo/v1/carddav.php',
+        'files' => 'dav/appinfo/v1/webdav.php',
+        'direct' => 'dav/appinfo/v2/direct.php',
+    ];
+    if (isset($services[$service])) {
+        return $services[$service];
+    }
+
+    return \OC::$server->getConfig()->getAppValue('core', 'remote_' . $service);
 }
 
 try {
-	require_once __DIR__ . '/lib/base.php';
-
-	// All resources served via the DAV endpoint should have the strictest possible
-	// policy. Exempted from this is the SabreDAV browser plugin which overwrites
-	// this policy with a softer one if debug mode is enabled.
-	header("Content-Security-Policy: default-src 'none';");
-
-	if (\OCP\Util::needUpgrade()) {
-		// since the behavior of apps or remotes are unpredictable during
-		// an upgrade, return a 503 directly
-		throw new RemoteException('Service unavailable', OC_Response::STATUS_SERVICE_UNAVAILABLE);
-	}
-
-	$request = \OC::$server->getRequest();
-	$pathInfo = $request->getPathInfo();
-	if ($pathInfo === false || $pathInfo === '') {
-		throw new RemoteException('Path not found', OC_Response::STATUS_NOT_FOUND);
-	}
-	if (!$pos = strpos($pathInfo, '/', 1)) {
-		$pos = strlen($pathInfo);
-	}
-	$service=substr($pathInfo, 1, $pos-1);
-
-	$file = resolveService($service);
-
-	if(is_null($file)) {
-		throw new RemoteException('Path not found', OC_Response::STATUS_NOT_FOUND);
-	}
-
-	$file=ltrim($file, '/');
-
-	$parts=explode('/', $file, 2);
-	$app=$parts[0];
-
-	// Load all required applications
-	\OC::$REQUESTEDAPP = $app;
-	OC_App::loadApps(array('authentication'));
-	OC_App::loadApps(array('filesystem', 'logging'));
-
-	switch ($app) {
-		case 'core':
-			$file =  OC::$SERVERROOT .'/'. $file;
-			break;
-		default:
-			if (!\OC::$server->getAppManager()->isInstalled($app)) {
-				throw new RemoteException('App not installed: ' . $app);
-			}
-			OC_App::loadApp($app);
-			$file = OC_App::getAppPath($app) .'/'. $parts[1];
-			break;
-	}
-	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
-	require_once $file;
+    require_once __DIR__ . '/lib/base.php';
+
+    // All resources served via the DAV endpoint should have the strictest possible
+    // policy. Exempted from this is the SabreDAV browser plugin which overwrites
+    // this policy with a softer one if debug mode is enabled.
+    header("Content-Security-Policy: default-src 'none';");
+
+    if (\OCP\Util::needUpgrade()) {
+        // since the behavior of apps or remotes are unpredictable during
+        // an upgrade, return a 503 directly
+        throw new RemoteException('Service unavailable', OC_Response::STATUS_SERVICE_UNAVAILABLE);
+    }
+
+    $request = \OC::$server->getRequest();
+    $pathInfo = $request->getPathInfo();
+    if ($pathInfo === false || $pathInfo === '') {
+        throw new RemoteException('Path not found', OC_Response::STATUS_NOT_FOUND);
+    }
+    if (!$pos = strpos($pathInfo, '/', 1)) {
+        $pos = strlen($pathInfo);
+    }
+    $service=substr($pathInfo, 1, $pos-1);
+
+    $file = resolveService($service);
+
+    if(is_null($file)) {
+        throw new RemoteException('Path not found', OC_Response::STATUS_NOT_FOUND);
+    }
+
+    $file=ltrim($file, '/');
+
+    $parts=explode('/', $file, 2);
+    $app=$parts[0];
+
+    // Load all required applications
+    \OC::$REQUESTEDAPP = $app;
+    OC_App::loadApps(array('authentication'));
+    OC_App::loadApps(array('filesystem', 'logging'));
+
+    switch ($app) {
+        case 'core':
+            $file =  OC::$SERVERROOT .'/'. $file;
+            break;
+        default:
+            if (!\OC::$server->getAppManager()->isInstalled($app)) {
+                throw new RemoteException('App not installed: ' . $app);
+            }
+            OC_App::loadApp($app);
+            $file = OC_App::getAppPath($app) .'/'. $parts[1];
+            break;
+    }
+    $baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
+    require_once $file;
 
 } catch (Exception $ex) {
-	handleException($ex);
+    handleException($ex);
 } catch (Error $e) {
-	handleException($e);
+    handleException($e);
 }

apps/dav/lib/Db/DirectMapper.php

Indentation +31 added lines, -31 removed lines

@@ -30,43 +30,43 @@
 
 class DirectMapper extends Mapper {
 
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'directlink', Direct::class);
-	}
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'directlink', Direct::class);
+    }
 
-	/**
-	 * @param string $token
-	 * @return Direct
-	 * @throws DoesNotExistException
-	 */
-	public function getByToken(string $token): Direct {
-		$qb = $this->db->getQueryBuilder();
+    /**
+     * @param string $token
+     * @return Direct
+     * @throws DoesNotExistException
+     */
+    public function getByToken(string $token): Direct {
+        $qb = $this->db->getQueryBuilder();
 
-		$qb->select('*')
-			->from('directlink')
-			->where(
-				$qb->expr()->eq('token', $qb->createNamedParameter($token))
-			);
+        $qb->select('*')
+            ->from('directlink')
+            ->where(
+                $qb->expr()->eq('token', $qb->createNamedParameter($token))
+            );
 
-		$cursor = $qb->execute();
-		$data = $cursor->fetch();
-		$cursor->closeCursor();
+        $cursor = $qb->execute();
+        $data = $cursor->fetch();
+        $cursor->closeCursor();
 
-		if ($data === false) {
-			throw new DoesNotExistException('Direct link with token does not exist');
-		}
+        if ($data === false) {
+            throw new DoesNotExistException('Direct link with token does not exist');
+        }
 
-		return Direct::fromRow($data);
-	}
+        return Direct::fromRow($data);
+    }
 
-	public function deleteExpired(int $expiration) {
-		$qb = $this->db->getQueryBuilder();
+    public function deleteExpired(int $expiration) {
+        $qb = $this->db->getQueryBuilder();
 
-		$qb->delete('directlink')
-			->where(
-				$qb->expr()->lt('expiration', $qb->createNamedParameter($expiration))
-			);
+        $qb->delete('directlink')
+            ->where(
+                $qb->expr()->lt('expiration', $qb->createNamedParameter($expiration))
+            );
 
-		$qb->execute();
-	}
+        $qb->execute();
+    }
 }

apps/dav/lib/Direct/ServerFactory.php

Indentation +19 added lines, -19 removed lines

@@ -32,30 +32,30 @@
 use OCP\IRequest;
 
 class ServerFactory {
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	public function createServer(string $baseURI,
-								 string $requestURI,
-								 IRootFolder $rootFolder,
-								 DirectMapper $mapper,
-								 ITimeFactory $timeFactory,
-								 Throttler $throttler,
-								 IRequest $request): Server {
-		$home = new DirectHome($rootFolder, $mapper, $timeFactory, $throttler, $request);
-		$server = new Server($home);
+    public function createServer(string $baseURI,
+                                    string $requestURI,
+                                    IRootFolder $rootFolder,
+                                    DirectMapper $mapper,
+                                    ITimeFactory $timeFactory,
+                                    Throttler $throttler,
+                                    IRequest $request): Server {
+        $home = new DirectHome($rootFolder, $mapper, $timeFactory, $throttler, $request);
+        $server = new Server($home);
 
-		$server->httpRequest->setUrl($requestURI);
-		$server->setBaseUri($baseURI);
+        $server->httpRequest->setUrl($requestURI);
+        $server->setBaseUri($baseURI);
 
-		$server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin($this->config));
+        $server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin($this->config));
 
-		return $server;
+        return $server;
 
 
-	}
+    }
 }

apps/dav/lib/Direct/DirectFile.php

Indentation +53 added lines, -53 removed lines

@@ -32,79 +32,79 @@
 use Sabre\DAV\IFile;
 
 class DirectFile implements IFile {
-	/** @var Direct */
-	private $direct;
+    /** @var Direct */
+    private $direct;
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	/** @var File */
-	private $file;
+    /** @var File */
+    private $file;
 
-	public function __construct(Direct $direct, IRootFolder $rootFolder) {
-		$this->direct = $direct;
-		$this->rootFolder = $rootFolder;
-	}
+    public function __construct(Direct $direct, IRootFolder $rootFolder) {
+        $this->direct = $direct;
+        $this->rootFolder = $rootFolder;
+    }
 
-	public function put($data) {
-		throw new Forbidden();
-	}
+    public function put($data) {
+        throw new Forbidden();
+    }
 
-	public function get() {
-		$this->getFile();
+    public function get() {
+        $this->getFile();
 
-		return $this->file->fopen('rb');
-	}
+        return $this->file->fopen('rb');
+    }
 
-	public function getContentType() {
-		$this->getFile();
+    public function getContentType() {
+        $this->getFile();
 
-		return $this->file->getMimeType();
-	}
+        return $this->file->getMimeType();
+    }
 
-	public function getETag() {
-		$this->getFile();
+    public function getETag() {
+        $this->getFile();
 
-		return $this->file->getEtag();
-	}
+        return $this->file->getEtag();
+    }
 
-	public function getSize() {
-		$this->getFile();
+    public function getSize() {
+        $this->getFile();
 
-		return $this->file->getSize();
-	}
+        return $this->file->getSize();
+    }
 
-	public function delete() {
-		throw new Forbidden();
-	}
+    public function delete() {
+        throw new Forbidden();
+    }
 
-	public function getName() {
-		return $this->direct->getToken();
-	}
+    public function getName() {
+        return $this->direct->getToken();
+    }
 
-	public function setName($name) {
-		throw new Forbidden();
-	}
+    public function setName($name) {
+        throw new Forbidden();
+    }
 
-	public function getLastModified() {
-		$this->getFile();
+    public function getLastModified() {
+        $this->getFile();
 
-		return $this->file->getMTime();
-	}
+        return $this->file->getMTime();
+    }
 
-	private function getFile() {
-		if ($this->file === null) {
-			$userFolder = $this->rootFolder->getUserFolder($this->direct->getUserId());
-			$files = $userFolder->getById($this->direct->getFileId());
+    private function getFile() {
+        if ($this->file === null) {
+            $userFolder = $this->rootFolder->getUserFolder($this->direct->getUserId());
+            $files = $userFolder->getById($this->direct->getFileId());
 
-			if ($files === []) {
-				throw new NotFound();
-			}
+            if ($files === []) {
+                throw new NotFound();
+            }
 
-			$this->file = array_shift($files);
-		}
+            $this->file = array_shift($files);
+        }
 
-		return $this->file;
-	}
+        return $this->file;
+    }
 
 }

apps/dav/lib/BackgroundJob/CleanupDirectLinksJob.php

Indentation +13 added lines, -13 removed lines

@@ -29,22 +29,22 @@
 use OCP\AppFramework\Utility\ITimeFactory;
 
 class CleanupDirectLinksJob extends TimedJob {
-	/** @var ITimeFactory */
-	private $timeFactory;
+    /** @var ITimeFactory */
+    private $timeFactory;
 
-	/** @var DirectMapper */
-	private $mapper;
+    /** @var DirectMapper */
+    private $mapper;
 
-	public function __construct(ITimeFactory $timeFactory, DirectMapper $mapper) {
-		$this->setInterval(60*60*24);
+    public function __construct(ITimeFactory $timeFactory, DirectMapper $mapper) {
+        $this->setInterval(60*60*24);
 
-		$this->timeFactory = $timeFactory;
-		$this->mapper = $mapper;
-	}
+        $this->timeFactory = $timeFactory;
+        $this->mapper = $mapper;
+    }
 
-	protected function run($argument) {
-		// Delete all shares expired 24 hours ago
-		$this->mapper->deleteExpired($this->timeFactory->getTime() - 60*60*24);
-	}
+    protected function run($argument) {
+        // Delete all shares expired 24 hours ago
+        $this->mapper->deleteExpired($this->timeFactory->getTime() - 60*60*24);
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 	private $mapper;
 
 	public function __construct(ITimeFactory $timeFactory, DirectMapper $mapper) {
-		$this->setInterval(60*60*24);
+		$this->setInterval(60 * 60 * 24);
 
 		$this->timeFactory = $timeFactory;
 		$this->mapper = $mapper;
@@ -44,7 +44,7 @@ 
 
 	protected function run($argument) {
 		// Delete all shares expired 24 hours ago
-		$this->mapper->deleteExpired($this->timeFactory->getTime() - 60*60*24);
+		$this->mapper->deleteExpired($this->timeFactory->getTime() - 60 * 60 * 24);
 	}
 
 }