nextcloud / server

apps/dav/lib/Migration/RemoveOrphanEventsAndContacts.php

Indentation +72 added lines, -72 removed lines

@@ -35,76 +35,76 @@
 
 class RemoveOrphanEventsAndContacts implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $connection;
-
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getName(): string {
-		return 'Clean up orphan event and contact data';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function run(IOutput $output) {
-		$orphanItems = $this->removeOrphanChildren('calendarobjects', 'calendars',  'calendarid');
-		$output->info(sprintf('%d events without a calendar have been cleaned up', $orphanItems));
-		$orphanItems = $this->removeOrphanChildren('calendarobjects_props', 'calendarobjects',  'objectid');
-		$output->info(sprintf('%d properties without an events have been cleaned up', $orphanItems));
-		$orphanItems = $this->removeOrphanChildren('calendarchanges', 'calendars',  'calendarid');
-		$output->info(sprintf('%d changes without a calendar have been cleaned up', $orphanItems));
-
-		$orphanItems = $this->removeOrphanChildren('calendarobjects', 'calendarsubscriptions',  'calendarid');
-		$output->info(sprintf('%d cached events without a calendar subscription have been cleaned up', $orphanItems));
-		$orphanItems = $this->removeOrphanChildren('calendarchanges', 'calendarsubscriptions',  'calendarid');
-		$output->info(sprintf('%d changes without a calendar subscription have been cleaned up', $orphanItems));
-
-		$orphanItems = $this->removeOrphanChildren('cards', 'addressbooks',  'addressbookid');
-		$output->info(sprintf('%d contacts without an addressbook have been cleaned up', $orphanItems));
-		$orphanItems = $this->removeOrphanChildren('cards_properties', 'cards',  'cardid');
-		$output->info(sprintf('%d properties without a contact have been cleaned up', $orphanItems));
-		$orphanItems = $this->removeOrphanChildren('addressbookchanges', 'addressbooks',  'addressbookid');
-		$output->info(sprintf('%d changes without an addressbook have been cleaned up', $orphanItems));
-	}
-
-	protected function removeOrphanChildren($childTable, $parentTable, $parentId): int {
-		$qb = $this->connection->getQueryBuilder();
-
-		$qb->select('c.id')
-			->from($childTable, 'c')
-			->leftJoin('c', $parentTable, 'p', $qb->expr()->eq('c.' . $parentId, 'p.id'))
-			->where($qb->expr()->isNull('p.id'));
-
-		if (\in_array($parentTable, ['calendars', 'calendarsubscriptions'], true)) {
-			$calendarType = $parentTable === 'calendarsubscriptions' ? CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION : CalDavBackend::CALENDAR_TYPE_CALENDAR;
-			$qb->andWhere($qb->expr()->eq('c.calendartype', $qb->createNamedParameter($calendarType, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT));
-		}
-
-		$result = $qb->execute();
-
-		$orphanItems = [];
-		while ($row = $result->fetch()) {
-			$orphanItems[] = (int) $row['id'];
-		}
-		$result->closeCursor();
-
-		if (!empty($orphanItems)) {
-			$qb->delete($childTable)
-				->where($qb->expr()->in('id', $qb->createParameter('ids')));
-
-			$orphanItemsBatch = array_chunk($orphanItems, 200);
-			foreach ($orphanItemsBatch as $items) {
-				$qb->setParameter('ids', $items, IQueryBuilder::PARAM_INT_ARRAY);
-				$qb->execute();
-			}
-		}
-
-		return count($orphanItems);
-	}
+    /** @var IDBConnection */
+    private $connection;
+
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getName(): string {
+        return 'Clean up orphan event and contact data';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run(IOutput $output) {
+        $orphanItems = $this->removeOrphanChildren('calendarobjects', 'calendars',  'calendarid');
+        $output->info(sprintf('%d events without a calendar have been cleaned up', $orphanItems));
+        $orphanItems = $this->removeOrphanChildren('calendarobjects_props', 'calendarobjects',  'objectid');
+        $output->info(sprintf('%d properties without an events have been cleaned up', $orphanItems));
+        $orphanItems = $this->removeOrphanChildren('calendarchanges', 'calendars',  'calendarid');
+        $output->info(sprintf('%d changes without a calendar have been cleaned up', $orphanItems));
+
+        $orphanItems = $this->removeOrphanChildren('calendarobjects', 'calendarsubscriptions',  'calendarid');
+        $output->info(sprintf('%d cached events without a calendar subscription have been cleaned up', $orphanItems));
+        $orphanItems = $this->removeOrphanChildren('calendarchanges', 'calendarsubscriptions',  'calendarid');
+        $output->info(sprintf('%d changes without a calendar subscription have been cleaned up', $orphanItems));
+
+        $orphanItems = $this->removeOrphanChildren('cards', 'addressbooks',  'addressbookid');
+        $output->info(sprintf('%d contacts without an addressbook have been cleaned up', $orphanItems));
+        $orphanItems = $this->removeOrphanChildren('cards_properties', 'cards',  'cardid');
+        $output->info(sprintf('%d properties without a contact have been cleaned up', $orphanItems));
+        $orphanItems = $this->removeOrphanChildren('addressbookchanges', 'addressbooks',  'addressbookid');
+        $output->info(sprintf('%d changes without an addressbook have been cleaned up', $orphanItems));
+    }
+
+    protected function removeOrphanChildren($childTable, $parentTable, $parentId): int {
+        $qb = $this->connection->getQueryBuilder();
+
+        $qb->select('c.id')
+            ->from($childTable, 'c')
+            ->leftJoin('c', $parentTable, 'p', $qb->expr()->eq('c.' . $parentId, 'p.id'))
+            ->where($qb->expr()->isNull('p.id'));
+
+        if (\in_array($parentTable, ['calendars', 'calendarsubscriptions'], true)) {
+            $calendarType = $parentTable === 'calendarsubscriptions' ? CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION : CalDavBackend::CALENDAR_TYPE_CALENDAR;
+            $qb->andWhere($qb->expr()->eq('c.calendartype', $qb->createNamedParameter($calendarType, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT));
+        }
+
+        $result = $qb->execute();
+
+        $orphanItems = [];
+        while ($row = $result->fetch()) {
+            $orphanItems[] = (int) $row['id'];
+        }
+        $result->closeCursor();
+
+        if (!empty($orphanItems)) {
+            $qb->delete($childTable)
+                ->where($qb->expr()->in('id', $qb->createParameter('ids')));
+
+            $orphanItemsBatch = array_chunk($orphanItems, 200);
+            foreach ($orphanItemsBatch as $items) {
+                $qb->setParameter('ids', $items, IQueryBuilder::PARAM_INT_ARRAY);
+                $qb->execute();
+            }
+        }
+
+        return count($orphanItems);
+    }
 }

apps/files_sharing/public.php

Indentation +10 added lines, -10 removed lines

@@ -28,15 +28,15 @@
 $route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadShare' : 'files_sharing.sharecontroller.showShare';
 
 if ($token !== '') {
-	$protocol = \OC::$server->getRequest()->getHttpProtocol();
-	if ($protocol == 'HTTP/1.0') {
-		http_response_code(302);
-	} else {
-		http_response_code(307);
-	}
-	header('Location: ' . $urlGenerator->linkToRoute($route, ['token' => $token]));
+    $protocol = \OC::$server->getRequest()->getHttpProtocol();
+    if ($protocol == 'HTTP/1.0') {
+        http_response_code(302);
+    } else {
+        http_response_code(307);
+    }
+    header('Location: ' . $urlGenerator->linkToRoute($route, ['token' => $token]));
 } else {
-	http_response_code(404);
-	$tmpl = new OCP\Template('', '404', 'guest');
-	print_unescaped($tmpl->fetchPage());
+    http_response_code(404);
+    $tmpl = new OCP\Template('', '404', 'guest');
+    print_unescaped($tmpl->fetchPage());
 }

apps/user_ldap/ajax/getConfiguration.php

Indentation +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@
 $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix);
 $configuration = $connection->getConfiguration();
 if (isset($configuration['ldap_agent_password']) && $configuration['ldap_agent_password'] !== '') {
-	// hide password
-	$configuration['ldap_agent_password'] = '**PASSWORD SET**';
+    // hide password
+    $configuration['ldap_agent_password'] = '**PASSWORD SET**';
 }
 \OC_JSON::success(['configuration' => $configuration]);

lib/private/Files/Type/TemplateManager.php

Indentation +33 added lines, -33 removed lines

@@ -29,40 +29,40 @@
  * @deprecated 18.0.0
  */
 class TemplateManager {
-	protected $templates = [];
+    protected $templates = [];
 
-	public function registerTemplate($mimetype, $path) {
-		$this->templates[$mimetype] = $path;
-	}
+    public function registerTemplate($mimetype, $path) {
+        $this->templates[$mimetype] = $path;
+    }
 
-	/**
-	 * get the path of the template for a mimetype
-	 *
-	 * @deprecated 18.0.0
-	 * @param string $mimetype
-	 * @return string|null
-	 */
-	public function getTemplatePath($mimetype) {
-		if (isset($this->templates[$mimetype])) {
-			return $this->templates[$mimetype];
-		} else {
-			return null;
-		}
-	}
+    /**
+     * get the path of the template for a mimetype
+     *
+     * @deprecated 18.0.0
+     * @param string $mimetype
+     * @return string|null
+     */
+    public function getTemplatePath($mimetype) {
+        if (isset($this->templates[$mimetype])) {
+            return $this->templates[$mimetype];
+        } else {
+            return null;
+        }
+    }
 
-	/**
-	 * get the template content for a mimetype
-	 *
-	 * @deprecated 18.0.0
-	 * @param string $mimetype
-	 * @return string
-	 */
-	public function getTemplate($mimetype) {
-		$path = $this->getTemplatePath($mimetype);
-		if ($path) {
-			return file_get_contents($path);
-		} else {
-			return '';
-		}
-	}
+    /**
+     * get the template content for a mimetype
+     *
+     * @deprecated 18.0.0
+     * @param string $mimetype
+     * @return string
+     */
+    public function getTemplate($mimetype) {
+        $path = $this->getTemplatePath($mimetype);
+        if ($path) {
+            return file_get_contents($path);
+        } else {
+            return '';
+        }
+    }
 }

lib/private/Setup/Sqlite.php

Indentation +29 added lines, -29 removed lines

@@ -26,14 +26,14 @@ 
 use OC\DB\ConnectionFactory;
 
 class Sqlite extends AbstractDatabase {
-	public $dbprettyname = 'Sqlite';
+    public $dbprettyname = 'Sqlite';
 
-	public function validate($config) {
-		return [];
-	}
+    public function validate($config) {
+        return [];
+    }
 
-	public function initialize($config) {
-		/*
+    public function initialize($config) {
+        /*
 		 * Web: When using web based installer its not possible to set dbname
 		 * or dbtableprefix. Defaults used from ConnectionFactory and dbtype = 'sqlite'
 		 * is written to config.php.
@@ -44,32 +44,32 @@ 
 		 * in connection factory configuration is obtained from config.php.
 		 */
 
-		$this->dbName = empty($config['dbname'])
-			? ConnectionFactory::DEFAULT_DBNAME
-			: $config['dbname'];
+        $this->dbName = empty($config['dbname'])
+            ? ConnectionFactory::DEFAULT_DBNAME
+            : $config['dbname'];
 
-		$this->tablePrefix = empty($config['dbtableprefix'])
-			? ConnectionFactory::DEFAULT_DBTABLEPREFIX
-			: $config['dbtableprefix'];
+        $this->tablePrefix = empty($config['dbtableprefix'])
+            ? ConnectionFactory::DEFAULT_DBTABLEPREFIX
+            : $config['dbtableprefix'];
 
-		if ($this->dbName !== ConnectionFactory::DEFAULT_DBNAME) {
-			$this->config->setValue('dbname', $this->dbName);
-		}
+        if ($this->dbName !== ConnectionFactory::DEFAULT_DBNAME) {
+            $this->config->setValue('dbname', $this->dbName);
+        }
 
-		if ($this->tablePrefix !== ConnectionFactory::DEFAULT_DBTABLEPREFIX) {
-			$this->config->setValue('dbtableprefix', $this->tablePrefix);
-		}
-	}
+        if ($this->tablePrefix !== ConnectionFactory::DEFAULT_DBTABLEPREFIX) {
+            $this->config->setValue('dbtableprefix', $this->tablePrefix);
+        }
+    }
 
-	public function setupDatabase($username) {
-		$datadir = $this->config->getValue(
-			'datadirectory',
-			\OC::$SERVERROOT . '/data'
-		);
+    public function setupDatabase($username) {
+        $datadir = $this->config->getValue(
+            'datadirectory',
+            \OC::$SERVERROOT . '/data'
+        );
 
-		$sqliteFile = $datadir . '/' . $this->dbName . 'db';
-		if (file_exists($sqliteFile)) {
-			unlink($sqliteFile);
-		}
-	}
+        $sqliteFile = $datadir . '/' . $this->dbName . 'db';
+        if (file_exists($sqliteFile)) {
+            unlink($sqliteFile);
+        }
+    }
 }

apps/settings/lib/Settings/Personal/Security/WebAuthn.php

Indentation +35 added lines, -35 removed lines

@@ -33,48 +33,48 @@
 
 class WebAuthn implements ISettings {
 
-	/** @var PublicKeyCredentialMapper */
-	private $mapper;
+    /** @var PublicKeyCredentialMapper */
+    private $mapper;
 
-	/** @var string */
-	private $uid;
+    /** @var string */
+    private $uid;
 
-	/** @var IInitialStateService */
-	private $initialStateService;
+    /** @var IInitialStateService */
+    private $initialStateService;
 
-	/** @var Manager */
-	private $manager;
+    /** @var Manager */
+    private $manager;
 
-	public function __construct(PublicKeyCredentialMapper $mapper,
-								string $UserId,
-								IInitialStateService $initialStateService,
-								Manager $manager) {
-		$this->mapper = $mapper;
-		$this->uid = $UserId;
-		$this->initialStateService = $initialStateService;
-		$this->manager = $manager;
-	}
+    public function __construct(PublicKeyCredentialMapper $mapper,
+                                string $UserId,
+                                IInitialStateService $initialStateService,
+                                Manager $manager) {
+        $this->mapper = $mapper;
+        $this->uid = $UserId;
+        $this->initialStateService = $initialStateService;
+        $this->manager = $manager;
+    }
 
-	public function getForm() {
-		$this->initialStateService->provideInitialState(
-			Application::APP_ID,
-			'webauthn-devices',
-			$this->mapper->findAllForUid($this->uid)
-		);
+    public function getForm() {
+        $this->initialStateService->provideInitialState(
+            Application::APP_ID,
+            'webauthn-devices',
+            $this->mapper->findAllForUid($this->uid)
+        );
 
-		return new TemplateResponse('settings', 'settings/personal/security/webauthn', [
-		]);
-	}
+        return new TemplateResponse('settings', 'settings/personal/security/webauthn', [
+        ]);
+    }
 
-	public function getSection(): ?string {
-		if (!$this->manager->isWebAuthnAvailable()) {
-			return null;
-		}
+    public function getSection(): ?string {
+        if (!$this->manager->isWebAuthnAvailable()) {
+            return null;
+        }
 
-		return 'security';
-	}
+        return 'security';
+    }
 
-	public function getPriority(): int {
-		return 20;
-	}
+    public function getPriority(): int {
+        return 20;
+    }
 }

lib/private/Authentication/Login/WebAuthnChain.php

Indentation +56 added lines, -56 removed lines

@@ -25,72 +25,72 @@
 namespace OC\Authentication\Login;
 
 class WebAuthnChain {
-	/** @var UserDisabledCheckCommand */
-	private $userDisabledCheckCommand;
+    /** @var UserDisabledCheckCommand */
+    private $userDisabledCheckCommand;
 
-	/** @var LoggedInCheckCommand */
-	private $loggedInCheckCommand;
+    /** @var LoggedInCheckCommand */
+    private $loggedInCheckCommand;
 
-	/** @var CompleteLoginCommand */
-	private $completeLoginCommand;
+    /** @var CompleteLoginCommand */
+    private $completeLoginCommand;
 
-	/** @var CreateSessionTokenCommand */
-	private $createSessionTokenCommand;
+    /** @var CreateSessionTokenCommand */
+    private $createSessionTokenCommand;
 
-	/** @var ClearLostPasswordTokensCommand */
-	private $clearLostPasswordTokensCommand;
+    /** @var ClearLostPasswordTokensCommand */
+    private $clearLostPasswordTokensCommand;
 
-	/** @var UpdateLastPasswordConfirmCommand */
-	private $updateLastPasswordConfirmCommand;
+    /** @var UpdateLastPasswordConfirmCommand */
+    private $updateLastPasswordConfirmCommand;
 
-	/** @var SetUserTimezoneCommand */
-	private $setUserTimezoneCommand;
+    /** @var SetUserTimezoneCommand */
+    private $setUserTimezoneCommand;
 
-	/** @var TwoFactorCommand */
-	private $twoFactorCommand;
+    /** @var TwoFactorCommand */
+    private $twoFactorCommand;
 
-	/** @var FinishRememberedLoginCommand */
-	private $finishRememberedLoginCommand;
+    /** @var FinishRememberedLoginCommand */
+    private $finishRememberedLoginCommand;
 
-	/** @var WebAuthnLoginCommand */
-	private $webAuthnLoginCommand;
+    /** @var WebAuthnLoginCommand */
+    private $webAuthnLoginCommand;
 
-	public function __construct(UserDisabledCheckCommand $userDisabledCheckCommand,
-								WebAuthnLoginCommand $webAuthnLoginCommand,
-								LoggedInCheckCommand $loggedInCheckCommand,
-								CompleteLoginCommand $completeLoginCommand,
-								CreateSessionTokenCommand $createSessionTokenCommand,
-								ClearLostPasswordTokensCommand $clearLostPasswordTokensCommand,
-								UpdateLastPasswordConfirmCommand $updateLastPasswordConfirmCommand,
-								SetUserTimezoneCommand $setUserTimezoneCommand,
-								TwoFactorCommand $twoFactorCommand,
-								FinishRememberedLoginCommand $finishRememberedLoginCommand
-	) {
-		$this->userDisabledCheckCommand = $userDisabledCheckCommand;
-		$this->webAuthnLoginCommand = $webAuthnLoginCommand;
-		$this->loggedInCheckCommand = $loggedInCheckCommand;
-		$this->completeLoginCommand = $completeLoginCommand;
-		$this->createSessionTokenCommand = $createSessionTokenCommand;
-		$this->clearLostPasswordTokensCommand = $clearLostPasswordTokensCommand;
-		$this->updateLastPasswordConfirmCommand = $updateLastPasswordConfirmCommand;
-		$this->setUserTimezoneCommand = $setUserTimezoneCommand;
-		$this->twoFactorCommand = $twoFactorCommand;
-		$this->finishRememberedLoginCommand = $finishRememberedLoginCommand;
-	}
+    public function __construct(UserDisabledCheckCommand $userDisabledCheckCommand,
+                                WebAuthnLoginCommand $webAuthnLoginCommand,
+                                LoggedInCheckCommand $loggedInCheckCommand,
+                                CompleteLoginCommand $completeLoginCommand,
+                                CreateSessionTokenCommand $createSessionTokenCommand,
+                                ClearLostPasswordTokensCommand $clearLostPasswordTokensCommand,
+                                UpdateLastPasswordConfirmCommand $updateLastPasswordConfirmCommand,
+                                SetUserTimezoneCommand $setUserTimezoneCommand,
+                                TwoFactorCommand $twoFactorCommand,
+                                FinishRememberedLoginCommand $finishRememberedLoginCommand
+    ) {
+        $this->userDisabledCheckCommand = $userDisabledCheckCommand;
+        $this->webAuthnLoginCommand = $webAuthnLoginCommand;
+        $this->loggedInCheckCommand = $loggedInCheckCommand;
+        $this->completeLoginCommand = $completeLoginCommand;
+        $this->createSessionTokenCommand = $createSessionTokenCommand;
+        $this->clearLostPasswordTokensCommand = $clearLostPasswordTokensCommand;
+        $this->updateLastPasswordConfirmCommand = $updateLastPasswordConfirmCommand;
+        $this->setUserTimezoneCommand = $setUserTimezoneCommand;
+        $this->twoFactorCommand = $twoFactorCommand;
+        $this->finishRememberedLoginCommand = $finishRememberedLoginCommand;
+    }
 
-	public function process(LoginData $loginData): LoginResult {
-		$chain = $this->userDisabledCheckCommand;
-		$chain
-			->setNext($this->webAuthnLoginCommand)
-			->setNext($this->loggedInCheckCommand)
-			->setNext($this->completeLoginCommand)
-			->setNext($this->createSessionTokenCommand)
-			->setNext($this->clearLostPasswordTokensCommand)
-			->setNext($this->updateLastPasswordConfirmCommand)
-			->setNext($this->setUserTimezoneCommand)
-			->setNext($this->twoFactorCommand)
-			->setNext($this->finishRememberedLoginCommand);
+    public function process(LoginData $loginData): LoginResult {
+        $chain = $this->userDisabledCheckCommand;
+        $chain
+            ->setNext($this->webAuthnLoginCommand)
+            ->setNext($this->loggedInCheckCommand)
+            ->setNext($this->completeLoginCommand)
+            ->setNext($this->createSessionTokenCommand)
+            ->setNext($this->clearLostPasswordTokensCommand)
+            ->setNext($this->updateLastPasswordConfirmCommand)
+            ->setNext($this->setUserTimezoneCommand)
+            ->setNext($this->twoFactorCommand)
+            ->setNext($this->finishRememberedLoginCommand);
 
-		return $chain->process($loginData);
-	}
+        return $chain->process($loginData);
+    }
 }

apps/dav/lib/CardDAV/Integration/IAddressBookProvider.php

Indentation +35 added lines, -35 removed lines

@@ -31,43 +31,43 @@
  */
 interface IAddressBookProvider {
 
-	/**
-	 * Provides the appId of the plugin
-	 *
-	 * @since 19.0.0
-	 * @return string AppId
-	 */
-	public function getAppId(): string;
+    /**
+     * Provides the appId of the plugin
+     *
+     * @since 19.0.0
+     * @return string AppId
+     */
+    public function getAppId(): string;
 
-	/**
-	 * Fetches all address books for a given principal uri
-	 *
-	 * @since 19.0.0
-	 * @param string $principalUri E.g. principals/users/user1
-	 * @return ExternalAddressBook[] Array of all address books
-	 */
-	public function fetchAllForAddressBookHome(string $principalUri): array;
+    /**
+     * Fetches all address books for a given principal uri
+     *
+     * @since 19.0.0
+     * @param string $principalUri E.g. principals/users/user1
+     * @return ExternalAddressBook[] Array of all address books
+     */
+    public function fetchAllForAddressBookHome(string $principalUri): array;
 
-	/**
-	 * Checks whether plugin has an address book for a given principalUri and URI
-	 *
-	 * @since 19.0.0
-	 * @param string $principalUri E.g. principals/users/user1
-	 * @param string $uri E.g. personal
-	 * @return bool True if address book for principalUri and URI exists, false otherwise
-	 */
-	public function hasAddressBookInAddressBookHome(string $principalUri, string $uri): bool;
+    /**
+     * Checks whether plugin has an address book for a given principalUri and URI
+     *
+     * @since 19.0.0
+     * @param string $principalUri E.g. principals/users/user1
+     * @param string $uri E.g. personal
+     * @return bool True if address book for principalUri and URI exists, false otherwise
+     */
+    public function hasAddressBookInAddressBookHome(string $principalUri, string $uri): bool;
 
-	/**
-	 * Fetches an address book for a given principalUri and URI
-	 * Returns null if address book does not exist
-	 *
-	 * @param string $principalUri E.g. principals/users/user1
-	 * @param string $uri E.g. personal
-	 *
-	 * @return ExternalAddressBook|null address book if it exists, null otherwise
-	 *@since 19.0.0
-	 */
-	public function getAddressBookInAddressBookHome(string $principalUri, string $uri): ?ExternalAddressBook;
+    /**
+     * Fetches an address book for a given principalUri and URI
+     * Returns null if address book does not exist
+     *
+     * @param string $principalUri E.g. principals/users/user1
+     * @param string $uri E.g. personal
+     *
+     * @return ExternalAddressBook|null address book if it exists, null otherwise
+     *@since 19.0.0
+     */
+    public function getAddressBookInAddressBookHome(string $principalUri, string $uri): ?ExternalAddressBook;
 
 }

apps/settings/lib/Activity/SecurityProvider.php

Indentation +66 added lines, -66 removed lines

@@ -37,77 +37,77 @@
 
 class SecurityProvider implements IProvider {
 
-	/** @var L10nFactory */
-	private $l10n;
+    /** @var L10nFactory */
+    private $l10n;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/** @var IManager */
-	private $activityManager;
+    /** @var IManager */
+    private $activityManager;
 
-	public function __construct(L10nFactory $l10n, IURLGenerator $urlGenerator, IManager $activityManager) {
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-		$this->activityManager = $activityManager;
-	}
+    public function __construct(L10nFactory $l10n, IURLGenerator $urlGenerator, IManager $activityManager) {
+        $this->urlGenerator = $urlGenerator;
+        $this->l10n = $l10n;
+        $this->activityManager = $activityManager;
+    }
 
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getType() !== 'security') {
-			throw new InvalidArgumentException();
-		}
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getType() !== 'security') {
+            throw new InvalidArgumentException();
+        }
 
-		$l = $this->l10n->get('settings', $language);
+        $l = $this->l10n->get('settings', $language);
 
-		switch ($event->getSubject()) {
-			case 'twofactor_success':
-				$params = $event->getSubjectParameters();
-				$event->setParsedSubject($l->t('You successfully logged in using two-factor authentication (%1$s)', [
-					$params['provider'],
-				]));
-				if ($this->activityManager->getRequirePNG()) {
-					$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.png')));
-				} else {
-					$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg')));
-				}
-				break;
-			case 'twofactor_failed':
-				$params = $event->getSubjectParameters();
-				$event->setParsedSubject($l->t('A login attempt using two-factor authentication failed (%1$s)', [
-					$params['provider'],
-				]));
-				if ($this->activityManager->getRequirePNG()) {
-					$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.png')));
-				} else {
-					$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg')));
-				}
-				break;
-			case 'remote_wipe_start':
-				$params = $event->getSubjectParameters();
-				$event->setParsedSubject($l->t('Remote wipe was started on %1$s', [
-					$params['name'],
-				]));
-				if ($this->activityManager->getRequirePNG()) {
-					$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/delete.png')));
-				} else {
-					$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/delete.svg')));
-				}
-				break;
-			case 'remote_wipe_finish':
-				$params = $event->getSubjectParameters();
-				$event->setParsedSubject($l->t('Remote wipe has finished on %1$s', [
-					$params['name'],
-				]));
-				if ($this->activityManager->getRequirePNG()) {
-					$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/delete.png')));
-				} else {
-					$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/delete.svg')));
-				}
-				break;
-			default:
-				throw new InvalidArgumentException();
-		}
-		return $event;
-	}
+        switch ($event->getSubject()) {
+            case 'twofactor_success':
+                $params = $event->getSubjectParameters();
+                $event->setParsedSubject($l->t('You successfully logged in using two-factor authentication (%1$s)', [
+                    $params['provider'],
+                ]));
+                if ($this->activityManager->getRequirePNG()) {
+                    $event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.png')));
+                } else {
+                    $event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg')));
+                }
+                break;
+            case 'twofactor_failed':
+                $params = $event->getSubjectParameters();
+                $event->setParsedSubject($l->t('A login attempt using two-factor authentication failed (%1$s)', [
+                    $params['provider'],
+                ]));
+                if ($this->activityManager->getRequirePNG()) {
+                    $event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.png')));
+                } else {
+                    $event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg')));
+                }
+                break;
+            case 'remote_wipe_start':
+                $params = $event->getSubjectParameters();
+                $event->setParsedSubject($l->t('Remote wipe was started on %1$s', [
+                    $params['name'],
+                ]));
+                if ($this->activityManager->getRequirePNG()) {
+                    $event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/delete.png')));
+                } else {
+                    $event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/delete.svg')));
+                }
+                break;
+            case 'remote_wipe_finish':
+                $params = $event->getSubjectParameters();
+                $event->setParsedSubject($l->t('Remote wipe has finished on %1$s', [
+                    $params['name'],
+                ]));
+                if ($this->activityManager->getRequirePNG()) {
+                    $event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/delete.png')));
+                } else {
+                    $event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/delete.svg')));
+                }
+                break;
+            default:
+                throw new InvalidArgumentException();
+        }
+        return $event;
+    }
 
 }