nextcloud / server

apps/federation/lib/Controller/SettingsController.php

Indentation +86 added lines, -86 removed lines

@@ -34,91 +34,91 @@
 
 class SettingsController extends Controller {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var  TrustedServers */
-	private $trustedServers;
-
-	/**
-	 * @param string $AppName
-	 * @param IRequest $request
-	 * @param IL10N $l10n
-	 * @param TrustedServers $trustedServers
-	 */
-	public function __construct($AppName,
-								IRequest $request,
-								IL10N $l10n,
-								TrustedServers $trustedServers
-	) {
-		parent::__construct($AppName, $request);
-		$this->l = $l10n;
-		$this->trustedServers = $trustedServers;
-	}
-
-
-	/**
-	 * add server to the list of trusted Nextclouds
-	 *
-	 * @param string $url
-	 * @return DataResponse
-	 * @throws HintException
-	 */
-	public function addServer($url) {
-		$this->checkServer($url);
-		$id = $this->trustedServers->addServer($url);
-
-		return new DataResponse(
-			[
-				'url' => $url,
-				'id' => $id,
-				'message' => (string) $this->l->t('Added to the list of trusted servers')
-			]
-		);
-	}
-
-	/**
-	 * add server to the list of trusted Nextclouds
-	 *
-	 * @param int $id
-	 * @return DataResponse
-	 */
-	public function removeServer($id) {
-		$this->trustedServers->removeServer($id);
-		return new DataResponse();
-	}
-
-	/**
-	 * enable/disable to automatically add servers to the list of trusted servers
-	 * once a federated share was created and accepted successfully
-	 *
-	 * @param bool $autoAddServers
-	 */
-	public function autoAddServers($autoAddServers) {
-		$this->trustedServers->setAutoAddServers($autoAddServers);
-	}
-
-	/**
-	 * check if the server should be added to the list of trusted servers or not
-	 *
-	 * @param string $url
-	 * @return bool
-	 * @throws HintException
-	 */
-	protected function checkServer($url) {
-		if ($this->trustedServers->isTrustedServer($url) === true) {
-			$message = 'Server is already in the list of trusted servers.';
-			$hint = $this->l->t('Server is already in the list of trusted servers.');
-			throw new HintException($message, $hint);
-		}
-
-		if ($this->trustedServers->isOwnCloudServer($url) === false) {
-			$message = 'No server to federate with found';
-			$hint = $this->l->t('No server to federate with found');
-			throw new HintException($message, $hint);
-		}
-
-		return true;
-	}
+    /** @var IL10N */
+    private $l;
+
+    /** @var  TrustedServers */
+    private $trustedServers;
+
+    /**
+     * @param string $AppName
+     * @param IRequest $request
+     * @param IL10N $l10n
+     * @param TrustedServers $trustedServers
+     */
+    public function __construct($AppName,
+                                IRequest $request,
+                                IL10N $l10n,
+                                TrustedServers $trustedServers
+    ) {
+        parent::__construct($AppName, $request);
+        $this->l = $l10n;
+        $this->trustedServers = $trustedServers;
+    }
+
+
+    /**
+     * add server to the list of trusted Nextclouds
+     *
+     * @param string $url
+     * @return DataResponse
+     * @throws HintException
+     */
+    public function addServer($url) {
+        $this->checkServer($url);
+        $id = $this->trustedServers->addServer($url);
+
+        return new DataResponse(
+            [
+                'url' => $url,
+                'id' => $id,
+                'message' => (string) $this->l->t('Added to the list of trusted servers')
+            ]
+        );
+    }
+
+    /**
+     * add server to the list of trusted Nextclouds
+     *
+     * @param int $id
+     * @return DataResponse
+     */
+    public function removeServer($id) {
+        $this->trustedServers->removeServer($id);
+        return new DataResponse();
+    }
+
+    /**
+     * enable/disable to automatically add servers to the list of trusted servers
+     * once a federated share was created and accepted successfully
+     *
+     * @param bool $autoAddServers
+     */
+    public function autoAddServers($autoAddServers) {
+        $this->trustedServers->setAutoAddServers($autoAddServers);
+    }
+
+    /**
+     * check if the server should be added to the list of trusted servers or not
+     *
+     * @param string $url
+     * @return bool
+     * @throws HintException
+     */
+    protected function checkServer($url) {
+        if ($this->trustedServers->isTrustedServer($url) === true) {
+            $message = 'Server is already in the list of trusted servers.';
+            $hint = $this->l->t('Server is already in the list of trusted servers.');
+            throw new HintException($message, $hint);
+        }
+
+        if ($this->trustedServers->isOwnCloudServer($url) === false) {
+            $message = 'No server to federate with found';
+            $hint = $this->l->t('No server to federate with found');
+            throw new HintException($message, $hint);
+        }
+
+        return true;
+    }
 
 }

apps/files_external/lib/Migration/StorageMigrator.php

Indentation +83 added lines, -83 removed lines

@@ -42,97 +42,97 @@
  * Migrate mount config from mount.json to the database
  */
 class StorageMigrator {
-	/**
-	 * @var BackendService
-	 */
-	private $backendService;
+    /**
+     * @var BackendService
+     */
+    private $backendService;
 
-	/**
-	 * @var DBConfigService
-	 */
-	private $dbConfig;
+    /**
+     * @var DBConfigService
+     */
+    private $dbConfig;
 
-	/**
-	 * @var IConfig
-	 */
-	private $config;
+    /**
+     * @var IConfig
+     */
+    private $config;
 
-	/**
-	 * @var IDBConnection
-	 */
-	private $connection;
+    /**
+     * @var IDBConnection
+     */
+    private $connection;
 
-	/**
-	 * @var ILogger
-	 */
-	private $logger;
+    /**
+     * @var ILogger
+     */
+    private $logger;
 
-	/** @var IUserMountCache  */
-	private $userMountCache;
+    /** @var IUserMountCache  */
+    private $userMountCache;
 
-	/**
-	 * StorageMigrator constructor.
-	 *
-	 * @param BackendService $backendService
-	 * @param DBConfigService $dbConfig
-	 * @param IConfig $config
-	 * @param IDBConnection $connection
-	 * @param ILogger $logger
-	 * @param IUserMountCache $userMountCache
-	 */
-	public function __construct(
-		BackendService $backendService,
-		DBConfigService $dbConfig,
-		IConfig $config,
-		IDBConnection $connection,
-		ILogger $logger,
-		IUserMountCache $userMountCache
-	) {
-		$this->backendService = $backendService;
-		$this->dbConfig = $dbConfig;
-		$this->config = $config;
-		$this->connection = $connection;
-		$this->logger = $logger;
-		$this->userMountCache = $userMountCache;
-	}
+    /**
+     * StorageMigrator constructor.
+     *
+     * @param BackendService $backendService
+     * @param DBConfigService $dbConfig
+     * @param IConfig $config
+     * @param IDBConnection $connection
+     * @param ILogger $logger
+     * @param IUserMountCache $userMountCache
+     */
+    public function __construct(
+        BackendService $backendService,
+        DBConfigService $dbConfig,
+        IConfig $config,
+        IDBConnection $connection,
+        ILogger $logger,
+        IUserMountCache $userMountCache
+    ) {
+        $this->backendService = $backendService;
+        $this->dbConfig = $dbConfig;
+        $this->config = $config;
+        $this->connection = $connection;
+        $this->logger = $logger;
+        $this->userMountCache = $userMountCache;
+    }
 
-	private function migrate(LegacyStoragesService $legacyService, StoragesService $storageService) {
-		$existingStorage = $legacyService->getAllStorages();
+    private function migrate(LegacyStoragesService $legacyService, StoragesService $storageService) {
+        $existingStorage = $legacyService->getAllStorages();
 
-		$this->connection->beginTransaction();
-		try {
-			foreach ($existingStorage as $storage) {
-				$mountOptions = $storage->getMountOptions();
-				if (!empty($mountOptions) && !isset($mountOptions['enable_sharing'])) {
-					// existing mounts must have sharing enabled by default to avoid surprises
-					$mountOptions['enable_sharing'] = true;
-					$storage->setMountOptions($mountOptions);
-				}
-				$storageService->addStorage($storage);
-			}
-			$this->connection->commit();
-		} catch (\Exception $e) {
-			$this->logger->logException($e);
-			$this->connection->rollBack();
-		}
-	}
+        $this->connection->beginTransaction();
+        try {
+            foreach ($existingStorage as $storage) {
+                $mountOptions = $storage->getMountOptions();
+                if (!empty($mountOptions) && !isset($mountOptions['enable_sharing'])) {
+                    // existing mounts must have sharing enabled by default to avoid surprises
+                    $mountOptions['enable_sharing'] = true;
+                    $storage->setMountOptions($mountOptions);
+                }
+                $storageService->addStorage($storage);
+            }
+            $this->connection->commit();
+        } catch (\Exception $e) {
+            $this->logger->logException($e);
+            $this->connection->rollBack();
+        }
+    }
 
-	/**
-	 * Migrate personal storages configured by the current user
-	 *
-	 * @param IUser $user
-	 */
-	public function migrateUser(IUser $user) {
-		$dummySession = new DummyUserSession();
-		$dummySession->setUser($user);
-		$userId = $user->getUID();
-		$userVersion = $this->config->getUserValue($userId, 'files_external', 'config_version', '0.0.0');
-		if (version_compare($userVersion, '0.5.0', '<')) {
-			$this->config->setUserValue($userId, 'files_external', 'config_version', '0.5.0');
-			$legacyService = new UserLegacyStoragesService($this->backendService, $dummySession);
-			$storageService = new UserStoragesService($this->backendService, $this->dbConfig, $dummySession, $this->userMountCache);
+    /**
+     * Migrate personal storages configured by the current user
+     *
+     * @param IUser $user
+     */
+    public function migrateUser(IUser $user) {
+        $dummySession = new DummyUserSession();
+        $dummySession->setUser($user);
+        $userId = $user->getUID();
+        $userVersion = $this->config->getUserValue($userId, 'files_external', 'config_version', '0.0.0');
+        if (version_compare($userVersion, '0.5.0', '<')) {
+            $this->config->setUserValue($userId, 'files_external', 'config_version', '0.5.0');
+            $legacyService = new UserLegacyStoragesService($this->backendService, $dummySession);
+            $storageService = new UserStoragesService($this->backendService, $this->dbConfig, $dummySession, $this->userMountCache);
 
-			$this->migrate($legacyService, $storageService);
-		}
-	}
+            $this->migrate($legacyService, $storageService);
+        }
+    }
 }

apps/files_sharing/lib/Scanner.php

Indentation +43 added lines, -43 removed lines

@@ -31,52 +31,52 @@
  * Scanner for SharedStorage
  */
 class Scanner extends \OC\Files\Cache\Scanner {
-	/**
-	 * @var \OCA\Files_Sharing\SharedStorage $storage
-	 */
-	protected $storage;
+    /**
+     * @var \OCA\Files_Sharing\SharedStorage $storage
+     */
+    protected $storage;
 
-	private $sourceScanner;
+    private $sourceScanner;
 
-	/**
-	 * Returns metadata from the shared storage, but
-	 * with permissions from the source storage.
-	 *
-	 * @param string $path path of the file for which to retrieve metadata
-	 *
-	 * @return array an array of metadata of the file
-	 */
-	public function getData($path) {
-		$data = parent::getData($path);
-		if ($data === null) {
-			return null;
-		}
-		$internalPath = $this->storage->getUnjailedPath($path);
-		$data['permissions'] = $this->storage->getSourceStorage()->getPermissions($internalPath);
-		return $data;
-	}
+    /**
+     * Returns metadata from the shared storage, but
+     * with permissions from the source storage.
+     *
+     * @param string $path path of the file for which to retrieve metadata
+     *
+     * @return array an array of metadata of the file
+     */
+    public function getData($path) {
+        $data = parent::getData($path);
+        if ($data === null) {
+            return null;
+        }
+        $internalPath = $this->storage->getUnjailedPath($path);
+        $data['permissions'] = $this->storage->getSourceStorage()->getPermissions($internalPath);
+        return $data;
+    }
 
-	private function getSourceScanner() {
-		if ($this->sourceScanner) {
-			return $this->sourceScanner;
-		}
-		if ($this->storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
-			/** @var \OC\Files\Storage\Storage $storage */
-			list($storage) = $this->storage->resolvePath('');
-			$this->sourceScanner = $storage->getScanner();
-			return $this->sourceScanner;
-		} else {
-			return null;
-		}
-	}
+    private function getSourceScanner() {
+        if ($this->sourceScanner) {
+            return $this->sourceScanner;
+        }
+        if ($this->storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
+            /** @var \OC\Files\Storage\Storage $storage */
+            list($storage) = $this->storage->resolvePath('');
+            $this->sourceScanner = $storage->getScanner();
+            return $this->sourceScanner;
+        } else {
+            return null;
+        }
+    }
 
-	public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true) {
-		$sourceScanner = $this->getSourceScanner();
-		if ($sourceScanner instanceof NoopScanner) {
-			return [];
-		} else {
-			return parent::scanFile($file, $reuseExisting, $parentId, $cacheData, $lock);
-		}
-	}
+    public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true) {
+        $sourceScanner = $this->getSourceScanner();
+        if ($sourceScanner instanceof NoopScanner) {
+            return [];
+        } else {
+            return parent::scanFile($file, $reuseExisting, $parentId, $cacheData, $lock);
+        }
+    }
 }
 

apps/testing/lib/Controller/RateLimitTestController.php

Indentation +23 added lines, -23 removed lines

@@ -25,28 +25,28 @@
 use OCP\AppFramework\Http\JSONResponse;
 
 class RateLimitTestController extends Controller {
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @UserRateThrottle(limit=5, period=100)
-	 * @AnonRateThrottle(limit=1, period=100)
-	 *
-	 * @return JSONResponse
-	 */
-	public function userAndAnonProtected() {
-		return new JSONResponse();
-	}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @UserRateThrottle(limit=5, period=100)
+     * @AnonRateThrottle(limit=1, period=100)
+     *
+     * @return JSONResponse
+     */
+    public function userAndAnonProtected() {
+        return new JSONResponse();
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @AnonRateThrottle(limit=1, period=10)
-	 *
-	 * @return JSONResponse
-	 */
-	public function onlyAnonProtected() {
-		return new JSONResponse();
-	}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @AnonRateThrottle(limit=1, period=10)
+     *
+     * @return JSONResponse
+     */
+    public function onlyAnonProtected() {
+        return new JSONResponse();
+    }
 }

lib/private/Security/RateLimiting/Exception/RateLimitExceededException.php

Indentation +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@
 use OCP\AppFramework\Http;
 
 class RateLimitExceededException extends SecurityException {
-	public function __construct() {
-		parent::__construct('Rate limit exceeded', Http::STATUS_TOO_MANY_REQUESTS);
-	}
+    public function __construct() {
+        parent::__construct('Rate limit exceeded', Http::STATUS_TOO_MANY_REQUESTS);
+    }
 }

lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php

Indentation +77 added lines, -77 removed lines

@@ -48,87 +48,87 @@
  * @package OC\AppFramework\Middleware\Security
  */
 class RateLimitingMiddleware extends Middleware {
-	/** @var IRequest $request */
-	private $request;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var ControllerMethodReflector */
-	private $reflector;
-	/** @var Limiter */
-	private $limiter;
+    /** @var IRequest $request */
+    private $request;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var ControllerMethodReflector */
+    private $reflector;
+    /** @var Limiter */
+    private $limiter;
 
-	/**
-	 * @param IRequest $request
-	 * @param IUserSession $userSession
-	 * @param ControllerMethodReflector $reflector
-	 * @param Limiter $limiter
-	 */
-	public function __construct(IRequest $request,
-								IUserSession $userSession,
-								ControllerMethodReflector $reflector,
-								Limiter $limiter) {
-		$this->request = $request;
-		$this->userSession = $userSession;
-		$this->reflector = $reflector;
-		$this->limiter = $limiter;
-	}
+    /**
+     * @param IRequest $request
+     * @param IUserSession $userSession
+     * @param ControllerMethodReflector $reflector
+     * @param Limiter $limiter
+     */
+    public function __construct(IRequest $request,
+                                IUserSession $userSession,
+                                ControllerMethodReflector $reflector,
+                                Limiter $limiter) {
+        $this->request = $request;
+        $this->userSession = $userSession;
+        $this->reflector = $reflector;
+        $this->limiter = $limiter;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 * @throws RateLimitExceededException
-	 */
-	public function beforeController($controller, $methodName) {
-		parent::beforeController($controller, $methodName);
+    /**
+     * {@inheritDoc}
+     * @throws RateLimitExceededException
+     */
+    public function beforeController($controller, $methodName) {
+        parent::beforeController($controller, $methodName);
 
-		$anonLimit = $this->reflector->getAnnotationParameter('AnonRateThrottle', 'limit');
-		$anonPeriod = $this->reflector->getAnnotationParameter('AnonRateThrottle', 'period');
-		$userLimit = $this->reflector->getAnnotationParameter('UserRateThrottle', 'limit');
-		$userPeriod = $this->reflector->getAnnotationParameter('UserRateThrottle', 'period');
-		$rateLimitIdentifier = get_class($controller) . '::' . $methodName;
-		if($userLimit !== '' && $userPeriod !== '' && $this->userSession->isLoggedIn()) {
-			$this->limiter->registerUserRequest(
-				$rateLimitIdentifier,
-				$userLimit,
-				$userPeriod,
-				$this->userSession->getUser()
-			);
-		} elseif ($anonLimit !== '' && $anonPeriod !== '') {
-			$this->limiter->registerAnonRequest(
-				$rateLimitIdentifier,
-				$anonLimit,
-				$anonPeriod,
-				$this->request->getRemoteAddress()
-			);
-		}
-	}
+        $anonLimit = $this->reflector->getAnnotationParameter('AnonRateThrottle', 'limit');
+        $anonPeriod = $this->reflector->getAnnotationParameter('AnonRateThrottle', 'period');
+        $userLimit = $this->reflector->getAnnotationParameter('UserRateThrottle', 'limit');
+        $userPeriod = $this->reflector->getAnnotationParameter('UserRateThrottle', 'period');
+        $rateLimitIdentifier = get_class($controller) . '::' . $methodName;
+        if($userLimit !== '' && $userPeriod !== '' && $this->userSession->isLoggedIn()) {
+            $this->limiter->registerUserRequest(
+                $rateLimitIdentifier,
+                $userLimit,
+                $userPeriod,
+                $this->userSession->getUser()
+            );
+        } elseif ($anonLimit !== '' && $anonPeriod !== '') {
+            $this->limiter->registerAnonRequest(
+                $rateLimitIdentifier,
+                $anonLimit,
+                $anonPeriod,
+                $this->request->getRemoteAddress()
+            );
+        }
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if($exception instanceof RateLimitExceededException) {
-			if (stripos($this->request->getHeader('Accept'),'html') === false) {
-				$response = new JSONResponse(
-					[
-						'message' => $exception->getMessage(),
-					],
-					$exception->getCode()
-				);
-			} else {
-					$response = new TemplateResponse(
-						'core',
-						'403',
-							[
-								'file' => $exception->getMessage()
-							],
-						'guest'
-					);
-					$response->setStatus($exception->getCode());
-			}
+    /**
+     * {@inheritDoc}
+     */
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if($exception instanceof RateLimitExceededException) {
+            if (stripos($this->request->getHeader('Accept'),'html') === false) {
+                $response = new JSONResponse(
+                    [
+                        'message' => $exception->getMessage(),
+                    ],
+                    $exception->getCode()
+                );
+            } else {
+                    $response = new TemplateResponse(
+                        'core',
+                        '403',
+                            [
+                                'file' => $exception->getMessage()
+                            ],
+                        'guest'
+                    );
+                    $response->setStatus($exception->getCode());
+            }
 
-			return $response;
-		}
+            return $response;
+        }
 
-		throw $exception;
-	}
+        throw $exception;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -84,8 +84,8 @@ 
 		$anonPeriod = $this->reflector->getAnnotationParameter('AnonRateThrottle', 'period');
 		$userLimit = $this->reflector->getAnnotationParameter('UserRateThrottle', 'limit');
 		$userPeriod = $this->reflector->getAnnotationParameter('UserRateThrottle', 'period');
-		$rateLimitIdentifier = get_class($controller) . '::' . $methodName;
-		if($userLimit !== '' && $userPeriod !== '' && $this->userSession->isLoggedIn()) {
+		$rateLimitIdentifier = get_class($controller).'::'.$methodName;
+		if ($userLimit !== '' && $userPeriod !== '' && $this->userSession->isLoggedIn()) {
 			$this->limiter->registerUserRequest(
 				$rateLimitIdentifier,
 				$userLimit,
@@ -106,8 +106,8 @@ 
 	 * {@inheritDoc}
 	 */
 	public function afterException($controller, $methodName, \Exception $exception) {
-		if($exception instanceof RateLimitExceededException) {
-			if (stripos($this->request->getHeader('Accept'),'html') === false) {
+		if ($exception instanceof RateLimitExceededException) {
+			if (stripos($this->request->getHeader('Accept'), 'html') === false) {
 				$response = new JSONResponse(
 					[
 						'message' => $exception->getMessage(),

lib/private/AppFramework/Middleware/Security/BruteForceMiddleware.php

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
 	public function beforeController($controller, $methodName) {
 		parent::beforeController($controller, $methodName);
 
-		if($this->reflector->hasAnnotation('BruteForceProtection')) {
+		if ($this->reflector->hasAnnotation('BruteForceProtection')) {
 			$action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
 			$this->throttler->sleepDelay($this->request->getRemoteAddress(), $action);
 		}
@@ -71,7 +71,7 @@ 
 	 * {@inheritDoc}
 	 */
 	public function afterController($controller, $methodName, Response $response) {
-		if($this->reflector->hasAnnotation('BruteForceProtection') && $response->isThrottled()) {
+		if ($this->reflector->hasAnnotation('BruteForceProtection') && $response->isThrottled()) {
 			$action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
 			$ip = $this->request->getRemoteAddress();
 			$this->throttler->sleepDelay($ip, $action);

Indentation +40 added lines, -40 removed lines

@@ -35,49 +35,49 @@
  * @package OC\AppFramework\Middleware\Security
  */
 class BruteForceMiddleware extends Middleware {
-	/** @var ControllerMethodReflector */
-	private $reflector;
-	/** @var Throttler */
-	private $throttler;
-	/** @var IRequest */
-	private $request;
+    /** @var ControllerMethodReflector */
+    private $reflector;
+    /** @var Throttler */
+    private $throttler;
+    /** @var IRequest */
+    private $request;
 
-	/**
-	 * @param ControllerMethodReflector $controllerMethodReflector
-	 * @param Throttler $throttler
-	 * @param IRequest $request
-	 */
-	public function __construct(ControllerMethodReflector $controllerMethodReflector,
-								Throttler $throttler,
-								IRequest $request) {
-		$this->reflector = $controllerMethodReflector;
-		$this->throttler = $throttler;
-		$this->request = $request;
-	}
+    /**
+     * @param ControllerMethodReflector $controllerMethodReflector
+     * @param Throttler $throttler
+     * @param IRequest $request
+     */
+    public function __construct(ControllerMethodReflector $controllerMethodReflector,
+                                Throttler $throttler,
+                                IRequest $request) {
+        $this->reflector = $controllerMethodReflector;
+        $this->throttler = $throttler;
+        $this->request = $request;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function beforeController($controller, $methodName) {
-		parent::beforeController($controller, $methodName);
+    /**
+     * {@inheritDoc}
+     */
+    public function beforeController($controller, $methodName) {
+        parent::beforeController($controller, $methodName);
 
-		if($this->reflector->hasAnnotation('BruteForceProtection')) {
-			$action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
-			$this->throttler->sleepDelay($this->request->getRemoteAddress(), $action);
-		}
-	}
+        if($this->reflector->hasAnnotation('BruteForceProtection')) {
+            $action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
+            $this->throttler->sleepDelay($this->request->getRemoteAddress(), $action);
+        }
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function afterController($controller, $methodName, Response $response) {
-		if($this->reflector->hasAnnotation('BruteForceProtection') && $response->isThrottled()) {
-			$action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
-			$ip = $this->request->getRemoteAddress();
-			$this->throttler->sleepDelay($ip, $action);
-			$this->throttler->registerAttempt($action, $ip, $response->getThrottleMetadata());
-		}
+    /**
+     * {@inheritDoc}
+     */
+    public function afterController($controller, $methodName, Response $response) {
+        if($this->reflector->hasAnnotation('BruteForceProtection') && $response->isThrottled()) {
+            $action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
+            $ip = $this->request->getRemoteAddress();
+            $this->throttler->sleepDelay($ip, $action);
+            $this->throttler->registerAttempt($action, $ip, $response->getThrottleMetadata());
+        }
 
-		return parent::afterController($controller, $methodName, $response);
-	}
+        return parent::afterController($controller, $methodName, $response);
+    }
 }

apps/files_external/lib/Controller/UserStoragesController.php

Indentation +180 added lines, -180 removed lines

@@ -43,185 +43,185 @@
  * User storages controller
  */
 class UserStoragesController extends StoragesController {
-	/**
-	 * @var IUserSession
-	 */
-	private $userSession;
-
-	/**
-	 * Creates a new user storages controller.
-	 *
-	 * @param string $AppName application name
-	 * @param IRequest $request request object
-	 * @param IL10N $l10n l10n service
-	 * @param UserStoragesService $userStoragesService storage service
-	 * @param IUserSession $userSession
-	 * @param ILogger $logger
-	 */
-	public function __construct(
-		$AppName,
-		IRequest $request,
-		IL10N $l10n,
-		UserStoragesService $userStoragesService,
-		IUserSession $userSession,
-		ILogger $logger
-	) {
-		parent::__construct(
-			$AppName,
-			$request,
-			$l10n,
-			$userStoragesService,
-			$logger
-		);
-		$this->userSession = $userSession;
-	}
-
-	protected function manipulateStorageConfig(StorageConfig $storage) {
-		/** @var AuthMechanism */
-		$authMechanism = $storage->getAuthMechanism();
-		$authMechanism->manipulateStorageConfig($storage, $this->userSession->getUser());
-		/** @var Backend */
-		$backend = $storage->getBackend();
-		$backend->manipulateStorageConfig($storage, $this->userSession->getUser());
-	}
-
-	/**
-	 * Get all storage entries
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @return DataResponse
-	 */
-	public function index() {
-		return parent::index();
-	}
-
-	/**
-	 * Return storage
-	 *
-	 * @NoAdminRequired
-	 *
-	 * {@inheritdoc}
-	 */
-	public function show($id, $testOnly = true) {
-		return parent::show($id, $testOnly);
-	}
-
-	/**
-	 * Create an external storage entry.
-	 *
-	 * @param string $mountPoint storage mount point
-	 * @param string $backend backend identifier
-	 * @param string $authMechanism authentication mechanism identifier
-	 * @param array $backendOptions backend-specific options
-	 * @param array $mountOptions backend-specific mount options
-	 *
-	 * @return DataResponse
-	 *
-	 * @NoAdminRequired
-	 */
-	public function create(
-		$mountPoint,
-		$backend,
-		$authMechanism,
-		$backendOptions,
-		$mountOptions
-	) {
-		$newStorage = $this->createStorage(
-			$mountPoint,
-			$backend,
-			$authMechanism,
-			$backendOptions,
-			$mountOptions
-		);
-		if ($newStorage instanceOf DataResponse) {
-			return $newStorage;
-		}
-
-		$response = $this->validate($newStorage);
-		if (!empty($response)) {
-			return $response;
-		}
-
-		$newStorage = $this->service->addStorage($newStorage);
-		$this->updateStorageStatus($newStorage);
-
-		return new DataResponse(
-			$newStorage,
-			Http::STATUS_CREATED
-		);
-	}
-
-	/**
-	 * Update an external storage entry.
-	 *
-	 * @param int $id storage id
-	 * @param string $mountPoint storage mount point
-	 * @param string $backend backend identifier
-	 * @param string $authMechanism authentication mechanism identifier
-	 * @param array $backendOptions backend-specific options
-	 * @param array $mountOptions backend-specific mount options
-	 * @param bool $testOnly whether to storage should only test the connection or do more things
-	 *
-	 * @return DataResponse
-	 *
-	 * @NoAdminRequired
-	 */
-	public function update(
-		$id,
-		$mountPoint,
-		$backend,
-		$authMechanism,
-		$backendOptions,
-		$mountOptions,
-		$testOnly = true
-	) {
-		$storage = $this->createStorage(
-			$mountPoint,
-			$backend,
-			$authMechanism,
-			$backendOptions,
-			$mountOptions
-		);
-		if ($storage instanceOf DataResponse) {
-			return $storage;
-		}
-		$storage->setId($id);
-
-		$response = $this->validate($storage);
-		if (!empty($response)) {
-			return $response;
-		}
-
-		try {
-			$storage = $this->service->updateStorage($storage);
-		} catch (NotFoundException $e) {
-			return new DataResponse(
-				[
-					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
-				],
-				Http::STATUS_NOT_FOUND
-			);
-		}
-
-		$this->updateStorageStatus($storage, $testOnly);
-
-		return new DataResponse(
-			$storage,
-			Http::STATUS_OK
-		);
-
-	}
-
-	/**
-	 * Delete storage
-	 *
-	 * @NoAdminRequired
-	 *
-	 * {@inheritdoc}
-	 */
-	public function destroy($id) {
-		return parent::destroy($id);
-	}
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+
+    /**
+     * Creates a new user storages controller.
+     *
+     * @param string $AppName application name
+     * @param IRequest $request request object
+     * @param IL10N $l10n l10n service
+     * @param UserStoragesService $userStoragesService storage service
+     * @param IUserSession $userSession
+     * @param ILogger $logger
+     */
+    public function __construct(
+        $AppName,
+        IRequest $request,
+        IL10N $l10n,
+        UserStoragesService $userStoragesService,
+        IUserSession $userSession,
+        ILogger $logger
+    ) {
+        parent::__construct(
+            $AppName,
+            $request,
+            $l10n,
+            $userStoragesService,
+            $logger
+        );
+        $this->userSession = $userSession;
+    }
+
+    protected function manipulateStorageConfig(StorageConfig $storage) {
+        /** @var AuthMechanism */
+        $authMechanism = $storage->getAuthMechanism();
+        $authMechanism->manipulateStorageConfig($storage, $this->userSession->getUser());
+        /** @var Backend */
+        $backend = $storage->getBackend();
+        $backend->manipulateStorageConfig($storage, $this->userSession->getUser());
+    }
+
+    /**
+     * Get all storage entries
+     *
+     * @NoAdminRequired
+     *
+     * @return DataResponse
+     */
+    public function index() {
+        return parent::index();
+    }
+
+    /**
+     * Return storage
+     *
+     * @NoAdminRequired
+     *
+     * {@inheritdoc}
+     */
+    public function show($id, $testOnly = true) {
+        return parent::show($id, $testOnly);
+    }
+
+    /**
+     * Create an external storage entry.
+     *
+     * @param string $mountPoint storage mount point
+     * @param string $backend backend identifier
+     * @param string $authMechanism authentication mechanism identifier
+     * @param array $backendOptions backend-specific options
+     * @param array $mountOptions backend-specific mount options
+     *
+     * @return DataResponse
+     *
+     * @NoAdminRequired
+     */
+    public function create(
+        $mountPoint,
+        $backend,
+        $authMechanism,
+        $backendOptions,
+        $mountOptions
+    ) {
+        $newStorage = $this->createStorage(
+            $mountPoint,
+            $backend,
+            $authMechanism,
+            $backendOptions,
+            $mountOptions
+        );
+        if ($newStorage instanceOf DataResponse) {
+            return $newStorage;
+        }
+
+        $response = $this->validate($newStorage);
+        if (!empty($response)) {
+            return $response;
+        }
+
+        $newStorage = $this->service->addStorage($newStorage);
+        $this->updateStorageStatus($newStorage);
+
+        return new DataResponse(
+            $newStorage,
+            Http::STATUS_CREATED
+        );
+    }
+
+    /**
+     * Update an external storage entry.
+     *
+     * @param int $id storage id
+     * @param string $mountPoint storage mount point
+     * @param string $backend backend identifier
+     * @param string $authMechanism authentication mechanism identifier
+     * @param array $backendOptions backend-specific options
+     * @param array $mountOptions backend-specific mount options
+     * @param bool $testOnly whether to storage should only test the connection or do more things
+     *
+     * @return DataResponse
+     *
+     * @NoAdminRequired
+     */
+    public function update(
+        $id,
+        $mountPoint,
+        $backend,
+        $authMechanism,
+        $backendOptions,
+        $mountOptions,
+        $testOnly = true
+    ) {
+        $storage = $this->createStorage(
+            $mountPoint,
+            $backend,
+            $authMechanism,
+            $backendOptions,
+            $mountOptions
+        );
+        if ($storage instanceOf DataResponse) {
+            return $storage;
+        }
+        $storage->setId($id);
+
+        $response = $this->validate($storage);
+        if (!empty($response)) {
+            return $response;
+        }
+
+        try {
+            $storage = $this->service->updateStorage($storage);
+        } catch (NotFoundException $e) {
+            return new DataResponse(
+                [
+                    'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
+                ],
+                Http::STATUS_NOT_FOUND
+            );
+        }
+
+        $this->updateStorageStatus($storage, $testOnly);
+
+        return new DataResponse(
+            $storage,
+            Http::STATUS_OK
+        );
+
+    }
+
+    /**
+     * Delete storage
+     *
+     * @NoAdminRequired
+     *
+     * {@inheritdoc}
+     */
+    public function destroy($id) {
+        return parent::destroy($id);
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -198,7 +198,7 @@
 		} catch (NotFoundException $e) {
 			return new DataResponse(
 				[
-					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
+					'message' => (string) $this->l10n->t('Storage with ID "%d" not found', array($id))
 				],
 				Http::STATUS_NOT_FOUND
 			);

apps/files_external/lib/Controller/GlobalStoragesController.php

Indentation +145 added lines, -145 removed lines

@@ -39,151 +39,151 @@
  * Global storages controller
  */
 class GlobalStoragesController extends StoragesController {
-	/**
-	 * Creates a new global storages controller.
-	 *
-	 * @param string $AppName application name
-	 * @param IRequest $request request object
-	 * @param IL10N $l10n l10n service
-	 * @param GlobalStoragesService $globalStoragesService storage service
-	 * @param ILogger $logger
-	 */
-	public function __construct(
-		$AppName,
-		IRequest $request,
-		IL10N $l10n,
-		GlobalStoragesService $globalStoragesService,
-		ILogger $logger
-	) {
-		parent::__construct(
-			$AppName,
-			$request,
-			$l10n,
-			$globalStoragesService,
-			$logger
-		);
-	}
-
-	/**
-	 * Create an external storage entry.
-	 *
-	 * @param string $mountPoint storage mount point
-	 * @param string $backend backend identifier
-	 * @param string $authMechanism authentication mechanism identifier
-	 * @param array $backendOptions backend-specific options
-	 * @param array $mountOptions mount-specific options
-	 * @param array $applicableUsers users for which to mount the storage
-	 * @param array $applicableGroups groups for which to mount the storage
-	 * @param int $priority priority
-	 *
-	 * @return DataResponse
-	 */
-	public function create(
-		$mountPoint,
-		$backend,
-		$authMechanism,
-		$backendOptions,
-		$mountOptions,
-		$applicableUsers,
-		$applicableGroups,
-		$priority
-	) {
-		$newStorage = $this->createStorage(
-			$mountPoint,
-			$backend,
-			$authMechanism,
-			$backendOptions,
-			$mountOptions,
-			$applicableUsers,
-			$applicableGroups,
-			$priority
-		);
-		if ($newStorage instanceof DataResponse) {
-			return $newStorage;
-		}
-
-		$response = $this->validate($newStorage);
-		if (!empty($response)) {
-			return $response;
-		}
-
-		$newStorage = $this->service->addStorage($newStorage);
-
-		$this->updateStorageStatus($newStorage);
-
-		return new DataResponse(
-			$newStorage,
-			Http::STATUS_CREATED
-		);
-	}
-
-	/**
-	 * Update an external storage entry.
-	 *
-	 * @param int $id storage id
-	 * @param string $mountPoint storage mount point
-	 * @param string $backend backend identifier
-	 * @param string $authMechanism authentication mechansim identifier
-	 * @param array $backendOptions backend-specific options
-	 * @param array $mountOptions mount-specific options
-	 * @param array $applicableUsers users for which to mount the storage
-	 * @param array $applicableGroups groups for which to mount the storage
-	 * @param int $priority priority
-	 * @param bool $testOnly whether to storage should only test the connection or do more things
-	 *
-	 * @return DataResponse
-	 */
-	public function update(
-		$id,
-		$mountPoint,
-		$backend,
-		$authMechanism,
-		$backendOptions,
-		$mountOptions,
-		$applicableUsers,
-		$applicableGroups,
-		$priority,
-		$testOnly = true
-	) {
-		$storage = $this->createStorage(
-			$mountPoint,
-			$backend,
-			$authMechanism,
-			$backendOptions,
-			$mountOptions,
-			$applicableUsers,
-			$applicableGroups,
-			$priority
-		);
-		if ($storage instanceof DataResponse) {
-			return $storage;
-		}
-		$storage->setId($id);
-
-		$response = $this->validate($storage);
-		if (!empty($response)) {
-			return $response;
-		}
-
-		try {
-			$storage = $this->service->updateStorage($storage);
-		} catch (NotFoundException $e) {
-			return new DataResponse(
-				[
-					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
-				],
-				Http::STATUS_NOT_FOUND
-			);
-		}
-
-		$this->updateStorageStatus($storage, $testOnly);
-
-		return new DataResponse(
-			$storage,
-			Http::STATUS_OK
-		);
-
-	}
+    /**
+     * Creates a new global storages controller.
+     *
+     * @param string $AppName application name
+     * @param IRequest $request request object
+     * @param IL10N $l10n l10n service
+     * @param GlobalStoragesService $globalStoragesService storage service
+     * @param ILogger $logger
+     */
+    public function __construct(
+        $AppName,
+        IRequest $request,
+        IL10N $l10n,
+        GlobalStoragesService $globalStoragesService,
+        ILogger $logger
+    ) {
+        parent::__construct(
+            $AppName,
+            $request,
+            $l10n,
+            $globalStoragesService,
+            $logger
+        );
+    }
+
+    /**
+     * Create an external storage entry.
+     *
+     * @param string $mountPoint storage mount point
+     * @param string $backend backend identifier
+     * @param string $authMechanism authentication mechanism identifier
+     * @param array $backendOptions backend-specific options
+     * @param array $mountOptions mount-specific options
+     * @param array $applicableUsers users for which to mount the storage
+     * @param array $applicableGroups groups for which to mount the storage
+     * @param int $priority priority
+     *
+     * @return DataResponse
+     */
+    public function create(
+        $mountPoint,
+        $backend,
+        $authMechanism,
+        $backendOptions,
+        $mountOptions,
+        $applicableUsers,
+        $applicableGroups,
+        $priority
+    ) {
+        $newStorage = $this->createStorage(
+            $mountPoint,
+            $backend,
+            $authMechanism,
+            $backendOptions,
+            $mountOptions,
+            $applicableUsers,
+            $applicableGroups,
+            $priority
+        );
+        if ($newStorage instanceof DataResponse) {
+            return $newStorage;
+        }
+
+        $response = $this->validate($newStorage);
+        if (!empty($response)) {
+            return $response;
+        }
+
+        $newStorage = $this->service->addStorage($newStorage);
+
+        $this->updateStorageStatus($newStorage);
+
+        return new DataResponse(
+            $newStorage,
+            Http::STATUS_CREATED
+        );
+    }
+
+    /**
+     * Update an external storage entry.
+     *
+     * @param int $id storage id
+     * @param string $mountPoint storage mount point
+     * @param string $backend backend identifier
+     * @param string $authMechanism authentication mechansim identifier
+     * @param array $backendOptions backend-specific options
+     * @param array $mountOptions mount-specific options
+     * @param array $applicableUsers users for which to mount the storage
+     * @param array $applicableGroups groups for which to mount the storage
+     * @param int $priority priority
+     * @param bool $testOnly whether to storage should only test the connection or do more things
+     *
+     * @return DataResponse
+     */
+    public function update(
+        $id,
+        $mountPoint,
+        $backend,
+        $authMechanism,
+        $backendOptions,
+        $mountOptions,
+        $applicableUsers,
+        $applicableGroups,
+        $priority,
+        $testOnly = true
+    ) {
+        $storage = $this->createStorage(
+            $mountPoint,
+            $backend,
+            $authMechanism,
+            $backendOptions,
+            $mountOptions,
+            $applicableUsers,
+            $applicableGroups,
+            $priority
+        );
+        if ($storage instanceof DataResponse) {
+            return $storage;
+        }
+        $storage->setId($id);
+
+        $response = $this->validate($storage);
+        if (!empty($response)) {
+            return $response;
+        }
+
+        try {
+            $storage = $this->service->updateStorage($storage);
+        } catch (NotFoundException $e) {
+            return new DataResponse(
+                [
+                    'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
+                ],
+                Http::STATUS_NOT_FOUND
+            );
+        }
+
+        $this->updateStorageStatus($storage, $testOnly);
+
+        return new DataResponse(
+            $storage,
+            Http::STATUS_OK
+        );
+
+    }
 
 
 }

Spacing +1 added lines, -1 removed lines

@@ -198,7 +198,7 @@
 		} catch (NotFoundException $e) {
 			return new DataResponse(
 				[
-					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
+					'message' => (string) $this->l10n->t('Storage with ID "%d" not found', array($id))
 				],
 				Http::STATUS_NOT_FOUND
 			);