nextcloud / server

lib/private/Collaboration/Collaborators/GroupPlugin.php

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
 		$result = ['wide' => [], 'exact' => []];
 
 		$groups = $this->groupManager->search($search, $limit, $offset);
-		$groupIds = array_map(function (IGroup $group) {
+		$groupIds = array_map(function(IGroup $group) {
 			return $group->getGID();
 		}, $groups);
 
@@ -75,7 +75,7 @@ 
 		if (!empty($groups) && ($this->shareWithGroupOnly || $this->shareeEnumerationInGroupOnly)) {
 			// Intersect all the groups that match with the groups this user is a member of
 			$userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
-			$userGroups = array_map(function (IGroup $group) {
+			$userGroups = array_map(function(IGroup $group) {
 				return $group->getGID();
 			}, $userGroups);
 			$groupIds = array_intersect($groupIds, $userGroups);

Indentation +111 added lines, -111 removed lines

@@ -15,115 +15,115 @@
 use OCP\Share\IShare;
 
 class GroupPlugin implements ISearchPlugin {
-	protected bool $shareeEnumeration;
-
-	protected bool $shareWithGroupOnly;
-
-	protected bool $shareeEnumerationInGroupOnly;
-
-	protected bool $groupSharingDisabled;
-
-	public function __construct(
-		private IConfig $config,
-		private IGroupManager $groupManager,
-		private IUserSession $userSession,
-		private mixed $shareWithGroupOnlyExcludeGroupsList = [],
-	) {
-		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
-		$this->shareeEnumerationInGroupOnly = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
-		$this->groupSharingDisabled = $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'no';
-
-		if ($this->shareWithGroupOnly) {
-			$this->shareWithGroupOnlyExcludeGroupsList = json_decode($this->config->getAppValue('core', 'shareapi_only_share_with_group_members_exclude_group_list', ''), true) ?? [];
-		}
-	}
-
-	public function search($search, $limit, $offset, ISearchResult $searchResult): bool {
-		if ($this->groupSharingDisabled) {
-			return false;
-		}
-
-		$hasMoreResults = false;
-		$result = ['wide' => [], 'exact' => []];
-
-		$groups = $this->groupManager->search($search, $limit, $offset);
-		$groupIds = array_map(function (IGroup $group) {
-			return $group->getGID();
-		}, $groups);
-
-		if (!$this->shareeEnumeration || count($groups) < $limit) {
-			$hasMoreResults = true;
-		}
-
-		$userGroups = [];
-		if (!empty($groups) && ($this->shareWithGroupOnly || $this->shareeEnumerationInGroupOnly)) {
-			// Intersect all the groups that match with the groups this user is a member of
-			$userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
-			$userGroups = array_map(function (IGroup $group) {
-				return $group->getGID();
-			}, $userGroups);
-			$groupIds = array_intersect($groupIds, $userGroups);
-
-			// ShareWithGroupOnly filtering
-			$groupIds = array_diff($groupIds, $this->shareWithGroupOnlyExcludeGroupsList);
-		}
-
-		$lowerSearch = strtolower($search);
-		foreach ($groups as $group) {
-			if ($group->hideFromCollaboration()) {
-				continue;
-			}
-
-			// FIXME: use a more efficient approach
-			$gid = $group->getGID();
-			if (!in_array($gid, $groupIds)) {
-				continue;
-			}
-			if (strtolower($gid) === $lowerSearch || strtolower($group->getDisplayName()) === $lowerSearch) {
-				$result['exact'][] = [
-					'label' => $group->getDisplayName(),
-					'value' => [
-						'shareType' => IShare::TYPE_GROUP,
-						'shareWith' => $gid,
-					],
-				];
-			} else {
-				if ($this->shareeEnumerationInGroupOnly && !in_array($group->getGID(), $userGroups, true)) {
-					continue;
-				}
-				$result['wide'][] = [
-					'label' => $group->getDisplayName(),
-					'value' => [
-						'shareType' => IShare::TYPE_GROUP,
-						'shareWith' => $gid,
-					],
-				];
-			}
-		}
-
-		if ($offset === 0 && empty($result['exact'])) {
-			// On page one we try if the search result has a direct hit on the
-			// user id and if so, we add that to the exact match list
-			$group = $this->groupManager->get($search);
-			if ($group instanceof IGroup && !$group->hideFromCollaboration() && (!$this->shareWithGroupOnly || in_array($group->getGID(), $userGroups))) {
-				$result['exact'][] = [
-					'label' => $group->getDisplayName(),
-					'value' => [
-						'shareType' => IShare::TYPE_GROUP,
-						'shareWith' => $group->getGID(),
-					],
-				];
-			}
-		}
-
-		if (!$this->shareeEnumeration) {
-			$result['wide'] = [];
-		}
-
-		$type = new SearchResultType('groups');
-		$searchResult->addResultSet($type, $result['wide'], $result['exact']);
-
-		return $hasMoreResults;
-	}
+    protected bool $shareeEnumeration;
+
+    protected bool $shareWithGroupOnly;
+
+    protected bool $shareeEnumerationInGroupOnly;
+
+    protected bool $groupSharingDisabled;
+
+    public function __construct(
+        private IConfig $config,
+        private IGroupManager $groupManager,
+        private IUserSession $userSession,
+        private mixed $shareWithGroupOnlyExcludeGroupsList = [],
+    ) {
+        $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+        $this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+        $this->shareeEnumerationInGroupOnly = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
+        $this->groupSharingDisabled = $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'no';
+
+        if ($this->shareWithGroupOnly) {
+            $this->shareWithGroupOnlyExcludeGroupsList = json_decode($this->config->getAppValue('core', 'shareapi_only_share_with_group_members_exclude_group_list', ''), true) ?? [];
+        }
+    }
+
+    public function search($search, $limit, $offset, ISearchResult $searchResult): bool {
+        if ($this->groupSharingDisabled) {
+            return false;
+        }
+
+        $hasMoreResults = false;
+        $result = ['wide' => [], 'exact' => []];
+
+        $groups = $this->groupManager->search($search, $limit, $offset);
+        $groupIds = array_map(function (IGroup $group) {
+            return $group->getGID();
+        }, $groups);
+
+        if (!$this->shareeEnumeration || count($groups) < $limit) {
+            $hasMoreResults = true;
+        }
+
+        $userGroups = [];
+        if (!empty($groups) && ($this->shareWithGroupOnly || $this->shareeEnumerationInGroupOnly)) {
+            // Intersect all the groups that match with the groups this user is a member of
+            $userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
+            $userGroups = array_map(function (IGroup $group) {
+                return $group->getGID();
+            }, $userGroups);
+            $groupIds = array_intersect($groupIds, $userGroups);
+
+            // ShareWithGroupOnly filtering
+            $groupIds = array_diff($groupIds, $this->shareWithGroupOnlyExcludeGroupsList);
+        }
+
+        $lowerSearch = strtolower($search);
+        foreach ($groups as $group) {
+            if ($group->hideFromCollaboration()) {
+                continue;
+            }
+
+            // FIXME: use a more efficient approach
+            $gid = $group->getGID();
+            if (!in_array($gid, $groupIds)) {
+                continue;
+            }
+            if (strtolower($gid) === $lowerSearch || strtolower($group->getDisplayName()) === $lowerSearch) {
+                $result['exact'][] = [
+                    'label' => $group->getDisplayName(),
+                    'value' => [
+                        'shareType' => IShare::TYPE_GROUP,
+                        'shareWith' => $gid,
+                    ],
+                ];
+            } else {
+                if ($this->shareeEnumerationInGroupOnly && !in_array($group->getGID(), $userGroups, true)) {
+                    continue;
+                }
+                $result['wide'][] = [
+                    'label' => $group->getDisplayName(),
+                    'value' => [
+                        'shareType' => IShare::TYPE_GROUP,
+                        'shareWith' => $gid,
+                    ],
+                ];
+            }
+        }
+
+        if ($offset === 0 && empty($result['exact'])) {
+            // On page one we try if the search result has a direct hit on the
+            // user id and if so, we add that to the exact match list
+            $group = $this->groupManager->get($search);
+            if ($group instanceof IGroup && !$group->hideFromCollaboration() && (!$this->shareWithGroupOnly || in_array($group->getGID(), $userGroups))) {
+                $result['exact'][] = [
+                    'label' => $group->getDisplayName(),
+                    'value' => [
+                        'shareType' => IShare::TYPE_GROUP,
+                        'shareWith' => $group->getGID(),
+                    ],
+                ];
+            }
+        }
+
+        if (!$this->shareeEnumeration) {
+            $result['wide'] = [];
+        }
+
+        $type = new SearchResultType('groups');
+        $searchResult->addResultSet($type, $result['wide'], $result['exact']);
+
+        return $hasMoreResults;
+    }
 }

lib/public/Log/IFileBased.php

Indentation +8 added lines, -8 removed lines

@@ -30,13 +30,13 @@
  * @since 14.0.0
  */
 interface IFileBased {
-	/**
-	 * @since 14.0.0
-	 */
-	public function getLogFilePath():string;
+    /**
+     * @since 14.0.0
+     */
+    public function getLogFilePath():string;
 
-	/**
-	 * @since 14.0.0
-	 */
-	public function getEntries(int $limit = 50, int $offset = 0): array;
+    /**
+     * @since 14.0.0
+     */
+    public function getEntries(int $limit = 50, int $offset = 0): array;
 }

lib/public/AppFramework/ApiController.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 		$response = new Response();
 		$response->addHeader('Access-Control-Allow-Origin', $origin);
 		$response->addHeader('Access-Control-Allow-Methods', $this->corsMethods);
-		$response->addHeader('Access-Control-Max-Age', (string)$this->corsMaxAge);
+		$response->addHeader('Access-Control-Max-Age', (string) $this->corsMaxAge);
 		$response->addHeader('Access-Control-Allow-Headers', $this->corsAllowedHeaders);
 		$response->addHeader('Access-Control-Allow-Credentials', 'false');
 		return $response;

Indentation +49 added lines, -49 removed lines

@@ -18,57 +18,57 @@
  * @since 7.0.0
  */
 abstract class ApiController extends Controller {
-	private $corsMethods;
-	private $corsAllowedHeaders;
-	private $corsMaxAge;
+    private $corsMethods;
+    private $corsAllowedHeaders;
+    private $corsMaxAge;
 
-	/**
-	 * constructor of the controller
-	 * @param string $appName the name of the app
-	 * @param IRequest $request an instance of the request
-	 * @param string $corsMethods comma separated string of HTTP verbs which
-	 *                            should be allowed for websites or webapps when calling your API, defaults to
-	 *                            'PUT, POST, GET, DELETE, PATCH'
-	 * @param string $corsAllowedHeaders comma separated string of HTTP headers
-	 *                                   which should be allowed for websites or webapps when calling your API,
-	 *                                   defaults to 'Authorization, Content-Type, Accept'
-	 * @param int $corsMaxAge number in seconds how long a preflighted OPTIONS
-	 *                        request should be cached, defaults to 1728000 seconds
-	 * @since 7.0.0
-	 */
-	public function __construct($appName,
-		IRequest $request,
-		$corsMethods = 'PUT, POST, GET, DELETE, PATCH',
-		$corsAllowedHeaders = 'Authorization, Content-Type, Accept',
-		$corsMaxAge = 1728000) {
-		parent::__construct($appName, $request);
-		$this->corsMethods = $corsMethods;
-		$this->corsAllowedHeaders = $corsAllowedHeaders;
-		$this->corsMaxAge = $corsMaxAge;
-	}
+    /**
+     * constructor of the controller
+     * @param string $appName the name of the app
+     * @param IRequest $request an instance of the request
+     * @param string $corsMethods comma separated string of HTTP verbs which
+     *                            should be allowed for websites or webapps when calling your API, defaults to
+     *                            'PUT, POST, GET, DELETE, PATCH'
+     * @param string $corsAllowedHeaders comma separated string of HTTP headers
+     *                                   which should be allowed for websites or webapps when calling your API,
+     *                                   defaults to 'Authorization, Content-Type, Accept'
+     * @param int $corsMaxAge number in seconds how long a preflighted OPTIONS
+     *                        request should be cached, defaults to 1728000 seconds
+     * @since 7.0.0
+     */
+    public function __construct($appName,
+        IRequest $request,
+        $corsMethods = 'PUT, POST, GET, DELETE, PATCH',
+        $corsAllowedHeaders = 'Authorization, Content-Type, Accept',
+        $corsMaxAge = 1728000) {
+        parent::__construct($appName, $request);
+        $this->corsMethods = $corsMethods;
+        $this->corsAllowedHeaders = $corsAllowedHeaders;
+        $this->corsMaxAge = $corsMaxAge;
+    }
 
 
-	/**
-	 * This method implements a preflighted cors response for you that you can
-	 * link to for the options request
-	 *
-	 * @since 7.0.0
-	 */
-	#[NoCSRFRequired]
-	#[PublicPage]
-	#[NoAdminRequired]
-	public function preflightedCors() {
-		$origin = $this->request->getHeader('origin');
-		if ($origin === '') {
-			$origin = '*';
-		}
+    /**
+     * This method implements a preflighted cors response for you that you can
+     * link to for the options request
+     *
+     * @since 7.0.0
+     */
+    #[NoCSRFRequired]
+    #[PublicPage]
+    #[NoAdminRequired]
+    public function preflightedCors() {
+        $origin = $this->request->getHeader('origin');
+        if ($origin === '') {
+            $origin = '*';
+        }
 
-		$response = new Response();
-		$response->addHeader('Access-Control-Allow-Origin', $origin);
-		$response->addHeader('Access-Control-Allow-Methods', $this->corsMethods);
-		$response->addHeader('Access-Control-Max-Age', (string)$this->corsMaxAge);
-		$response->addHeader('Access-Control-Allow-Headers', $this->corsAllowedHeaders);
-		$response->addHeader('Access-Control-Allow-Credentials', 'false');
-		return $response;
-	}
+        $response = new Response();
+        $response->addHeader('Access-Control-Allow-Origin', $origin);
+        $response->addHeader('Access-Control-Allow-Methods', $this->corsMethods);
+        $response->addHeader('Access-Control-Max-Age', (string)$this->corsMaxAge);
+        $response->addHeader('Access-Control-Allow-Headers', $this->corsAllowedHeaders);
+        $response->addHeader('Access-Control-Allow-Credentials', 'false');
+        return $response;
+    }
 }

lib/public/AppFramework/App.php

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
 
 		if ($runIsSetupDirectly) {
 			$applicationClassName = get_class($this);
-			$e = new \RuntimeException('App class ' . $applicationClassName . ' is not setup via query() but directly');
+			$e = new \RuntimeException('App class '.$applicationClassName.' is not setup via query() but directly');
 			$setUpViaQuery = false;
 
 			$classNameParts = explode('\\', trim($applicationClassName, '\\'));

Indentation +104 added lines, -104 removed lines

@@ -23,118 +23,118 @@
  * @since 6.0.0
  */
 class App {
-	/** @var IAppContainer */
-	private $container;
+    /** @var IAppContainer */
+    private $container;
 
-	/**
-	 * Turns an app id into a namespace by convention. The id is split at the
-	 * underscores, all parts are CamelCased and reassembled. e.g.:
-	 * some_app_id -> OCA\SomeAppId
-	 * @param string $appId the app id
-	 * @param string $topNamespace the namespace which should be prepended to
-	 *                             the transformed app id, defaults to OCA\
-	 * @return string the starting namespace for the app
-	 * @since 8.0.0
-	 */
-	public static function buildAppNamespace(string $appId, string $topNamespace = 'OCA\\'): string {
-		return \OC\AppFramework\App::buildAppNamespace($appId, $topNamespace);
-	}
+    /**
+     * Turns an app id into a namespace by convention. The id is split at the
+     * underscores, all parts are CamelCased and reassembled. e.g.:
+     * some_app_id -> OCA\SomeAppId
+     * @param string $appId the app id
+     * @param string $topNamespace the namespace which should be prepended to
+     *                             the transformed app id, defaults to OCA\
+     * @return string the starting namespace for the app
+     * @since 8.0.0
+     */
+    public static function buildAppNamespace(string $appId, string $topNamespace = 'OCA\\'): string {
+        return \OC\AppFramework\App::buildAppNamespace($appId, $topNamespace);
+    }
 
 
-	/**
-	 * @param string $appName
-	 * @param array $urlParams an array with variables extracted from the routes
-	 * @since 6.0.0
-	 */
-	public function __construct(string $appName, array $urlParams = []) {
-		$runIsSetupDirectly = Server::get(IConfig::class)->getSystemValueBool('debug')
-			&& !ini_get('zend.exception_ignore_args');
+    /**
+     * @param string $appName
+     * @param array $urlParams an array with variables extracted from the routes
+     * @since 6.0.0
+     */
+    public function __construct(string $appName, array $urlParams = []) {
+        $runIsSetupDirectly = Server::get(IConfig::class)->getSystemValueBool('debug')
+            && !ini_get('zend.exception_ignore_args');
 
-		if ($runIsSetupDirectly) {
-			$applicationClassName = get_class($this);
-			$e = new \RuntimeException('App class ' . $applicationClassName . ' is not setup via query() but directly');
-			$setUpViaQuery = false;
+        if ($runIsSetupDirectly) {
+            $applicationClassName = get_class($this);
+            $e = new \RuntimeException('App class ' . $applicationClassName . ' is not setup via query() but directly');
+            $setUpViaQuery = false;
 
-			$classNameParts = explode('\\', trim($applicationClassName, '\\'));
+            $classNameParts = explode('\\', trim($applicationClassName, '\\'));
 
-			foreach ($e->getTrace() as $step) {
-				if (isset($step['class'], $step['function'], $step['args'][0]) &&
-					$step['class'] === ServerContainer::class &&
-					$step['function'] === 'query' &&
-					$step['args'][0] === $applicationClassName) {
-					$setUpViaQuery = true;
-					break;
-				} elseif (isset($step['class'], $step['function'], $step['args'][0]) &&
-					$step['class'] === ServerContainer::class &&
-					$step['function'] === 'getAppContainer' &&
-					$step['args'][1] === $classNameParts[1]) {
-					$setUpViaQuery = true;
-					break;
-				} elseif (isset($step['class'], $step['function'], $step['args'][0]) &&
-					$step['class'] === SimpleContainer::class &&
-					preg_match('/{closure:OC\\\\AppFramework\\\\Utility\\\\SimpleContainer::buildClass\\(\\):\\d+}/', $step['function']) &&
-					$step['args'][0] === $this) {
-					/* We are setup through a lazy ghost, fine */
-					$setUpViaQuery = true;
-					break;
-				}
-			}
+            foreach ($e->getTrace() as $step) {
+                if (isset($step['class'], $step['function'], $step['args'][0]) &&
+                    $step['class'] === ServerContainer::class &&
+                    $step['function'] === 'query' &&
+                    $step['args'][0] === $applicationClassName) {
+                    $setUpViaQuery = true;
+                    break;
+                } elseif (isset($step['class'], $step['function'], $step['args'][0]) &&
+                    $step['class'] === ServerContainer::class &&
+                    $step['function'] === 'getAppContainer' &&
+                    $step['args'][1] === $classNameParts[1]) {
+                    $setUpViaQuery = true;
+                    break;
+                } elseif (isset($step['class'], $step['function'], $step['args'][0]) &&
+                    $step['class'] === SimpleContainer::class &&
+                    preg_match('/{closure:OC\\\\AppFramework\\\\Utility\\\\SimpleContainer::buildClass\\(\\):\\d+}/', $step['function']) &&
+                    $step['args'][0] === $this) {
+                    /* We are setup through a lazy ghost, fine */
+                    $setUpViaQuery = true;
+                    break;
+                }
+            }
 
-			if (!$setUpViaQuery && $applicationClassName !== \OCP\AppFramework\App::class) {
-				Server::get(LoggerInterface::class)->error($e->getMessage(), [
-					'app' => $appName,
-					'exception' => $e,
-				]);
-			}
-		}
+            if (!$setUpViaQuery && $applicationClassName !== \OCP\AppFramework\App::class) {
+                Server::get(LoggerInterface::class)->error($e->getMessage(), [
+                    'app' => $appName,
+                    'exception' => $e,
+                ]);
+            }
+        }
 
-		try {
-			$this->container = \OC::$server->getRegisteredAppContainer($appName);
-		} catch (QueryException $e) {
-			$this->container = new \OC\AppFramework\DependencyInjection\DIContainer($appName, $urlParams);
-		}
-	}
+        try {
+            $this->container = \OC::$server->getRegisteredAppContainer($appName);
+        } catch (QueryException $e) {
+            $this->container = new \OC\AppFramework\DependencyInjection\DIContainer($appName, $urlParams);
+        }
+    }
 
-	/**
-	 * @return IAppContainer
-	 * @since 6.0.0
-	 */
-	public function getContainer(): IAppContainer {
-		return $this->container;
-	}
+    /**
+     * @return IAppContainer
+     * @since 6.0.0
+     */
+    public function getContainer(): IAppContainer {
+        return $this->container;
+    }
 
-	/**
-	 * This function is called by the routing component to fire up the frameworks dispatch mechanism.
-	 *
-	 * Example code in routes.php of the task app:
-	 * $this->create('tasks_index', '/')->get()->action(
-	 *		function($params){
-	 *			$app = new TaskApp($params);
-	 *			$app->dispatch('PageController', 'index');
-	 *		}
-	 *	);
-	 *
-	 *
-	 * Example for for TaskApp implementation:
-	 * class TaskApp extends \OCP\AppFramework\App {
-	 *
-	 *		public function __construct($params){
-	 *			parent::__construct('tasks', $params);
-	 *
-	 *			$this->getContainer()->registerService('PageController', function(IAppContainer $c){
-	 *				$a = $c->query('API');
-	 *				$r = $c->query('Request');
-	 *				return new PageController($a, $r);
-	 *			});
-	 *		}
-	 *	}
-	 *
-	 * @param string $controllerName the name of the controller under which it is
-	 *                               stored in the DI container
-	 * @param string $methodName the method that you want to call
-	 * @since 6.0.0
-	 */
-	public function dispatch(string $controllerName, string $methodName) {
-		\OC\AppFramework\App::main($controllerName, $methodName, $this->container);
-	}
+    /**
+     * This function is called by the routing component to fire up the frameworks dispatch mechanism.
+     *
+     * Example code in routes.php of the task app:
+     * $this->create('tasks_index', '/')->get()->action(
+     *		function($params){
+     *			$app = new TaskApp($params);
+     *			$app->dispatch('PageController', 'index');
+     *		}
+     *	);
+     *
+     *
+     * Example for for TaskApp implementation:
+     * class TaskApp extends \OCP\AppFramework\App {
+     *
+     *		public function __construct($params){
+     *			parent::__construct('tasks', $params);
+     *
+     *			$this->getContainer()->registerService('PageController', function(IAppContainer $c){
+     *				$a = $c->query('API');
+     *				$r = $c->query('Request');
+     *				return new PageController($a, $r);
+     *			});
+     *		}
+     *	}
+     *
+     * @param string $controllerName the name of the controller under which it is
+     *                               stored in the DI container
+     * @param string $methodName the method that you want to call
+     * @since 6.0.0
+     */
+    public function dispatch(string $controllerName, string $methodName) {
+        \OC\AppFramework\App::main($controllerName, $methodName, $this->container);
+    }
 }

lib/private/Authentication/Listeners/UserDeletedTokenCleanupListener.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 				$this->manager->invalidateTokenById($uid, $token->getId());
 			}
 		} catch (Throwable $e) {
-			$this->logger->error('Could not clean up auth tokens after user deletion: ' . $e->getMessage(), [
+			$this->logger->error('Could not clean up auth tokens after user deletion: '.$e->getMessage(), [
 				'exception' => $e,
 			]);
 		}

Indentation +34 added lines, -34 removed lines

@@ -19,38 +19,38 @@
  * @template-implements IEventListener<\OCP\User\Events\UserDeletedEvent>
  */
 class UserDeletedTokenCleanupListener implements IEventListener {
-	/** @var Manager */
-	private $manager;
-
-	/** @var LoggerInterface */
-	private $logger;
-
-	public function __construct(Manager $manager,
-		LoggerInterface $logger) {
-		$this->manager = $manager;
-		$this->logger = $logger;
-	}
-
-	public function handle(Event $event): void {
-		if (!($event instanceof UserDeletedEvent)) {
-			// Unrelated
-			return;
-		}
-
-		/**
-		 * Catch any exception during this process as any failure here shouldn't block the
-		 * user deletion.
-		 */
-		try {
-			$uid = $event->getUser()->getUID();
-			$tokens = $this->manager->getTokenByUser($uid);
-			foreach ($tokens as $token) {
-				$this->manager->invalidateTokenById($uid, $token->getId());
-			}
-		} catch (Throwable $e) {
-			$this->logger->error('Could not clean up auth tokens after user deletion: ' . $e->getMessage(), [
-				'exception' => $e,
-			]);
-		}
-	}
+    /** @var Manager */
+    private $manager;
+
+    /** @var LoggerInterface */
+    private $logger;
+
+    public function __construct(Manager $manager,
+        LoggerInterface $logger) {
+        $this->manager = $manager;
+        $this->logger = $logger;
+    }
+
+    public function handle(Event $event): void {
+        if (!($event instanceof UserDeletedEvent)) {
+            // Unrelated
+            return;
+        }
+
+        /**
+         * Catch any exception during this process as any failure here shouldn't block the
+         * user deletion.
+         */
+        try {
+            $uid = $event->getUser()->getUID();
+            $tokens = $this->manager->getTokenByUser($uid);
+            foreach ($tokens as $token) {
+                $this->manager->invalidateTokenById($uid, $token->getId());
+            }
+        } catch (Throwable $e) {
+            $this->logger->error('Could not clean up auth tokens after user deletion: ' . $e->getMessage(), [
+                'exception' => $e,
+            ]);
+        }
+    }
 }

apps/settings/templates/settings/personal/security/twofactor.php

Spacing +4 added lines, -4 removed lines

@@ -25,12 +25,12 @@
 ?>
 
 <div id="two-factor-auth" class="section">
-	<h2><?php p($l->t('Two-Factor Authentication'));?></h2>
+	<h2><?php p($l->t('Two-Factor Authentication')); ?></h2>
 	<a target="_blank" rel="noreferrer noopener" class="icon-info"
-	   title="<?php p($l->t('Open documentation'));?>"
+	   title="<?php p($l->t('Open documentation')); ?>"
 	   href="<?php p(link_to_docs('user-2fa')); ?>"></a>
-	<p class="settings-hint"><?php p($l->t('Use a second factor besides your password to increase security for your account.'));?></p>
-	<p class="settings-hint"><?php p($l->t('If you use third party applications to connect to Nextcloud, please make sure to create and configure an app password for each before enabling second factor authentication.'));?></p>
+	<p class="settings-hint"><?php p($l->t('Use a second factor besides your password to increase security for your account.')); ?></p>
+	<p class="settings-hint"><?php p($l->t('If you use third party applications to connect to Nextcloud, please make sure to create and configure an app password for each before enabling second factor authentication.')); ?></p>
 	<ul>
 	<?php foreach ($_['twoFactorProviderData']['providers'] as $data) { ?>
 		<li>

Indentation +12 added lines, -12 removed lines

@@ -19,18 +19,18 @@
 		<li>
 			<?php
 
-			/** @var \OCP\Authentication\TwoFactorAuth\IProvidesPersonalSettings $provider */
-			$provider = $data['provider'];
-		//Handle 2FA provider icons and theme
-		if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
-			$icon = $provider->getDarkIcon();
-			//fallback icon if the 2factor provider doesn't provide an icon.
-		} else {
-			$icon = image_path('core', 'actions/password.svg');
-		}
-		/** @var \OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings $settings */
-		$settings = $data['settings'];
-		?>
+            /** @var \OCP\Authentication\TwoFactorAuth\IProvidesPersonalSettings $provider */
+            $provider = $data['provider'];
+        //Handle 2FA provider icons and theme
+        if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
+            $icon = $provider->getDarkIcon();
+            //fallback icon if the 2factor provider doesn't provide an icon.
+        } else {
+            $icon = image_path('core', 'actions/password.svg');
+        }
+        /** @var \OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings $settings */
+        $settings = $data['settings'];
+        ?>
 			<h3>
 				<img class="two-factor-provider-settings-icon" src="<?php p($icon) ?>" alt="">
 				<?php p($provider->getDisplayName()) ?>

lib/private/Hooks/PublicEmitter.php

Indentation +11 added lines, -11 removed lines

@@ -29,15 +29,15 @@
  * @deprecated 18.0.0 use events and the \OCP\EventDispatcher\IEventDispatcher service
  */
 class PublicEmitter extends BasicEmitter {
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param array $arguments optional
-	 * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher::dispatchTyped
-	 *
-	 * @suppress PhanAccessMethodProtected
-	 */
-	public function emit($scope, $method, array $arguments = []) {
-		parent::emit($scope, $method, $arguments);
-	}
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param array $arguments optional
+     * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher::dispatchTyped
+     *
+     * @suppress PhanAccessMethodProtected
+     */
+    public function emit($scope, $method, array $arguments = []) {
+        parent::emit($scope, $method, $arguments);
+    }
 }

lib/private/Hooks/EmitterTrait.php

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
 	 * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher::addListener
 	 */
 	public function listen($scope, $method, callable $callback) {
-		$eventName = $scope . '::' . $method;
+		$eventName = $scope.'::'.$method;
 		if (!isset($this->listeners[$eventName])) {
 			$this->listeners[$eventName] = [];
 		}
@@ -60,7 +60,7 @@ 
 		$names = [];
 		$allNames = array_keys($this->listeners);
 		if ($scope and $method) {
-			$name = $scope . '::' . $method;
+			$name = $scope.'::'.$method;
 			if (isset($this->listeners[$name])) {
 				$names[] = $name;
 			}
@@ -101,7 +101,7 @@ 
 	 * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher::dispatchTyped
 	 */
 	protected function emit($scope, $method, array $arguments = []) {
-		$eventName = $scope . '::' . $method;
+		$eventName = $scope.'::'.$method;
 		if (isset($this->listeners[$eventName])) {
 			foreach ($this->listeners[$eventName] as $callback) {
 				call_user_func_array($callback, $arguments);

Indentation +75 added lines, -75 removed lines

@@ -10,83 +10,83 @@
  * @deprecated 18.0.0 use events and the \OCP\EventDispatcher\IEventDispatcher service
  */
 trait EmitterTrait {
-	/**
-	 * @var callable[][] $listeners
-	 */
-	protected $listeners = [];
+    /**
+     * @var callable[][] $listeners
+     */
+    protected $listeners = [];
 
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param callable $callback
-	 * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher::addListener
-	 */
-	public function listen($scope, $method, callable $callback) {
-		$eventName = $scope . '::' . $method;
-		if (!isset($this->listeners[$eventName])) {
-			$this->listeners[$eventName] = [];
-		}
-		if (!in_array($callback, $this->listeners[$eventName], true)) {
-			$this->listeners[$eventName][] = $callback;
-		}
-	}
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param callable $callback
+     * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher::addListener
+     */
+    public function listen($scope, $method, callable $callback) {
+        $eventName = $scope . '::' . $method;
+        if (!isset($this->listeners[$eventName])) {
+            $this->listeners[$eventName] = [];
+        }
+        if (!in_array($callback, $this->listeners[$eventName], true)) {
+            $this->listeners[$eventName][] = $callback;
+        }
+    }
 
-	/**
-	 * @param string $scope optional
-	 * @param string $method optional
-	 * @param callable $callback optional
-	 * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher::removeListener
-	 */
-	public function removeListener($scope = null, $method = null, ?callable $callback = null) {
-		$names = [];
-		$allNames = array_keys($this->listeners);
-		if ($scope and $method) {
-			$name = $scope . '::' . $method;
-			if (isset($this->listeners[$name])) {
-				$names[] = $name;
-			}
-		} elseif ($scope) {
-			foreach ($allNames as $name) {
-				$parts = explode('::', $name, 2);
-				if ($parts[0] == $scope) {
-					$names[] = $name;
-				}
-			}
-		} elseif ($method) {
-			foreach ($allNames as $name) {
-				$parts = explode('::', $name, 2);
-				if ($parts[1] == $method) {
-					$names[] = $name;
-				}
-			}
-		} else {
-			$names = $allNames;
-		}
+    /**
+     * @param string $scope optional
+     * @param string $method optional
+     * @param callable $callback optional
+     * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher::removeListener
+     */
+    public function removeListener($scope = null, $method = null, ?callable $callback = null) {
+        $names = [];
+        $allNames = array_keys($this->listeners);
+        if ($scope and $method) {
+            $name = $scope . '::' . $method;
+            if (isset($this->listeners[$name])) {
+                $names[] = $name;
+            }
+        } elseif ($scope) {
+            foreach ($allNames as $name) {
+                $parts = explode('::', $name, 2);
+                if ($parts[0] == $scope) {
+                    $names[] = $name;
+                }
+            }
+        } elseif ($method) {
+            foreach ($allNames as $name) {
+                $parts = explode('::', $name, 2);
+                if ($parts[1] == $method) {
+                    $names[] = $name;
+                }
+            }
+        } else {
+            $names = $allNames;
+        }
 
-		foreach ($names as $name) {
-			if ($callback) {
-				$index = array_search($callback, $this->listeners[$name], true);
-				if ($index !== false) {
-					unset($this->listeners[$name][$index]);
-				}
-			} else {
-				$this->listeners[$name] = [];
-			}
-		}
-	}
+        foreach ($names as $name) {
+            if ($callback) {
+                $index = array_search($callback, $this->listeners[$name], true);
+                if ($index !== false) {
+                    unset($this->listeners[$name][$index]);
+                }
+            } else {
+                $this->listeners[$name] = [];
+            }
+        }
+    }
 
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param array $arguments optional
-	 * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher::dispatchTyped
-	 */
-	protected function emit($scope, $method, array $arguments = []) {
-		$eventName = $scope . '::' . $method;
-		if (isset($this->listeners[$eventName])) {
-			foreach ($this->listeners[$eventName] as $callback) {
-				call_user_func_array($callback, $arguments);
-			}
-		}
-	}
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param array $arguments optional
+     * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher::dispatchTyped
+     */
+    protected function emit($scope, $method, array $arguments = []) {
+        $eventName = $scope . '::' . $method;
+        if (isset($this->listeners[$eventName])) {
+            foreach ($this->listeners[$eventName] as $callback) {
+                call_user_func_array($callback, $arguments);
+            }
+        }
+    }
 }

apps/files_sharing/lib/External/MountProvider.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 		$managerProvider = $this->managerProvider;
 		$manager = $managerProvider();
 		$data['manager'] = $manager;
-		$mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
+		$mountPoint = '/'.$user->getUID().'/files/'.ltrim($data['mountpoint'], '/');
 		$data['mountpoint'] = $mountPoint;
 		$data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']);
 		$data['certificateManager'] = \OC::$server->getCertificateManager();

Indentation +44 added lines, -44 removed lines

@@ -16,52 +16,52 @@
 use OCP\Server;
 
 class MountProvider implements IMountProvider {
-	public const STORAGE = '\OCA\Files_Sharing\External\Storage';
+    public const STORAGE = '\OCA\Files_Sharing\External\Storage';
 
-	/**
-	 * @var callable
-	 */
-	private $managerProvider;
+    /**
+     * @var callable
+     */
+    private $managerProvider;
 
-	/**
-	 * @param IDBConnection $connection
-	 * @param callable $managerProvider due to setup order we need a callable that return the manager instead of the manager itself
-	 * @param ICloudIdManager $cloudIdManager
-	 */
-	public function __construct(
-		private IDBConnection $connection,
-		callable $managerProvider,
-		private ICloudIdManager $cloudIdManager,
-	) {
-		$this->managerProvider = $managerProvider;
-	}
+    /**
+     * @param IDBConnection $connection
+     * @param callable $managerProvider due to setup order we need a callable that return the manager instead of the manager itself
+     * @param ICloudIdManager $cloudIdManager
+     */
+    public function __construct(
+        private IDBConnection $connection,
+        callable $managerProvider,
+        private ICloudIdManager $cloudIdManager,
+    ) {
+        $this->managerProvider = $managerProvider;
+    }
 
-	public function getMount(IUser $user, $data, IStorageFactory $storageFactory) {
-		$managerProvider = $this->managerProvider;
-		$manager = $managerProvider();
-		$data['manager'] = $manager;
-		$mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
-		$data['mountpoint'] = $mountPoint;
-		$data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']);
-		$data['certificateManager'] = \OC::$server->getCertificateManager();
-		$data['HttpClientService'] = Server::get(IClientService::class);
-		return new Mount(self::STORAGE, $mountPoint, $data, $manager, $storageFactory);
-	}
+    public function getMount(IUser $user, $data, IStorageFactory $storageFactory) {
+        $managerProvider = $this->managerProvider;
+        $manager = $managerProvider();
+        $data['manager'] = $manager;
+        $mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
+        $data['mountpoint'] = $mountPoint;
+        $data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']);
+        $data['certificateManager'] = \OC::$server->getCertificateManager();
+        $data['HttpClientService'] = Server::get(IClientService::class);
+        return new Mount(self::STORAGE, $mountPoint, $data, $manager, $storageFactory);
+    }
 
-	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('remote', 'share_token', 'password', 'mountpoint', 'owner')
-			->from('share_external')
-			->where($qb->expr()->eq('user', $qb->createNamedParameter($user->getUID())))
-			->andWhere($qb->expr()->eq('accepted', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT)));
-		$result = $qb->executeQuery();
-		$mounts = [];
-		while ($row = $result->fetch()) {
-			$row['manager'] = $this;
-			$row['token'] = $row['share_token'];
-			$mounts[] = $this->getMount($user, $row, $loader);
-		}
-		$result->closeCursor();
-		return $mounts;
-	}
+    public function getMountsForUser(IUser $user, IStorageFactory $loader) {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('remote', 'share_token', 'password', 'mountpoint', 'owner')
+            ->from('share_external')
+            ->where($qb->expr()->eq('user', $qb->createNamedParameter($user->getUID())))
+            ->andWhere($qb->expr()->eq('accepted', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT)));
+        $result = $qb->executeQuery();
+        $mounts = [];
+        while ($row = $result->fetch()) {
+            $row['manager'] = $this;
+            $row['token'] = $row['share_token'];
+            $mounts[] = $this->getMount($user, $row, $loader);
+        }
+        $result->closeCursor();
+        return $mounts;
+    }
 }