nextcloud / server

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;
 
 }

lib/public/User/Events/BeforeUserLoggedInEvent.php

Indentation +26 added lines, -26 removed lines

@@ -34,35 +34,35 @@
  */
 class BeforeUserLoggedInEvent extends Event {
 
-	/** @var string */
-	private $username;
+    /** @var string */
+    private $username;
 
-	/** @var string */
-	private $password;
+    /** @var string */
+    private $password;
 
-	/**
-	 * @since 18.0.0
-	 */
-	public function __construct(string $username, string $password) {
-		parent::__construct();
-		$this->username = $username;
-		$this->password = $password;
-	}
+    /**
+     * @since 18.0.0
+     */
+    public function __construct(string $username, string $password) {
+        parent::__construct();
+        $this->username = $username;
+        $this->password = $password;
+    }
 
-	/**
-	 * returns the login name, which must not necessarily match to a user ID
-	 *
-	 * @since 18.0.0
-	 */
-	public function getUsername(): string {
-		return $this->username;
-	}
+    /**
+     * returns the login name, which must not necessarily match to a user ID
+     *
+     * @since 18.0.0
+     */
+    public function getUsername(): string {
+        return $this->username;
+    }
 
-	/**
-	 * @since 18.0.0
-	 */
-	public function getPassword(): string {
-		return $this->password;
-	}
+    /**
+     * @since 18.0.0
+     */
+    public function getPassword(): string {
+        return $this->password;
+    }
 
 }

apps/files/lib/Notification/Notifier.php

Indentation +265 added lines, -265 removed lines

@@ -43,269 +43,269 @@
 
 class Notifier implements INotifier, IDismissableNotifier {
 
-	/** @var IFactory */
-	protected $l10nFactory;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-	/** @var TransferOwnershipMapper */
-	private $mapper;
-	/** @var IManager */
-	private $notificationManager;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	public function __construct(IFactory $l10nFactory,
-								IURLGenerator $urlGenerator,
-								TransferOwnershipMapper $mapper,
-								IManager $notificationManager,
-								IUserManager $userManager,
-								ITimeFactory $timeFactory) {
-		$this->l10nFactory = $l10nFactory;
-		$this->urlGenerator = $urlGenerator;
-		$this->mapper = $mapper;
-		$this->notificationManager = $notificationManager;
-		$this->userManager = $userManager;
-		$this->timeFactory = $timeFactory;
-	}
-
-	public function getID(): string {
-		return 'files';
-	}
-
-	public function getName(): string {
-		return $this->l10nFactory->get('files')->t('Files');
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @param string $languageCode The code of the language that should be used to prepare the notification
-	 * @return INotification
-	 * @throws \InvalidArgumentException When the notification was not prepared by a notifier
-	 */
-	public function prepare(INotification $notification, string $languageCode): INotification {
-		if ($notification->getApp() !== 'files') {
-			throw new \InvalidArgumentException('Unhandled app');
-		}
-
-		if ($notification->getSubject() === 'transferownershipRequest') {
-			return $this->handleTransferownershipRequest($notification, $languageCode);
-		}
-		if ($notification->getSubject() === 'transferOwnershipFailedSource') {
-			return $this->handleTransferOwnershipFailedSource($notification, $languageCode);
-		}
-		if ($notification->getSubject() === 'transferOwnershipFailedTarget') {
-			return $this->handleTransferOwnershipFailedTarget($notification, $languageCode);
-		}
-		if ($notification->getSubject() === 'transferOwnershipDoneSource') {
-			return $this->handleTransferOwnershipDoneSource($notification, $languageCode);
-		}
-		if ($notification->getSubject() === 'transferOwnershipDoneTarget') {
-			return $this->handleTransferOwnershipDoneTarget($notification, $languageCode);
-		}
-
-		throw new \InvalidArgumentException('Unhandled subject');
-	}
-
-	public function handleTransferownershipRequest(INotification $notification, string $languageCode): INotification {
-		$l = $this->l10nFactory->get('files', $languageCode);
-		$id = $notification->getObjectId();
-		$param = $notification->getSubjectParameters();
-
-		$approveAction = $notification->createAction()
-			->setParsedLabel($l->t('Accept'))
-			->setPrimary(true)
-			->setLink(
-				$this->urlGenerator->getAbsoluteURL(
-					$this->urlGenerator->linkTo(
-						'',
-						'ocs/v2.php/apps/files/api/v1/transferownership/' . $id
-					)
-				),
-				IAction::TYPE_POST
-			);
-
-		$disapproveAction = $notification->createAction()
-			->setParsedLabel($l->t('Reject'))
-			->setPrimary(false)
-			->setLink(
-				$this->urlGenerator->getAbsoluteURL(
-					$this->urlGenerator->linkTo(
-						'',
-						'ocs/v2.php/apps/files/api/v1/transferownership/' . $id
-					)
-				),
-				IAction::TYPE_DELETE
-			);
-
-		$sourceUser = $this->getUser($param['sourceUser']);
-		$notification->addParsedAction($approveAction)
-			->addParsedAction($disapproveAction)
-			->setRichSubject(
-				$l->t('Incoming ownership transfer from {user}'),
-				[
-					'user' => [
-						'type' => 'user',
-						'id' => $sourceUser->getUID(),
-						'name' => $sourceUser->getDisplayName(),
-					],
-				])
-			->setParsedSubject(str_replace('{user}', $sourceUser->getDisplayName(), $l->t('Incoming ownership transfer from {user}')))
-			->setRichMessage(
-				$l->t("Do you want to accept {path}?\n\nNote: The transfer process after accepting may take up to 1 hour."),
-				[
-					'path' => [
-						'type' => 'highlight',
-						'id' => $param['targetUser'] . '::' . $param['nodeName'],
-						'name' => $param['nodeName'],
-					]
-				])
-			->setParsedMessage(str_replace('{path}', $param['nodeName'], $l->t("Do you want to accept {path}?\n\nNote: The transfer process after accepting may take up to 1 hour.")));
-
-		return $notification;
-	}
-
-	public function handleTransferOwnershipFailedSource(INotification $notification,  string $languageCode): INotification {
-		$l = $this->l10nFactory->get('files', $languageCode);
-		$param = $notification->getSubjectParameters();
-
-		$targetUser = $this->getUser($param['targetUser']);
-		$notification->setRichSubject($l->t('Ownership transfer failed'))
-			->setParsedSubject($l->t('Ownership transfer failed'))
-
-			->setRichMessage(
-				$l->t('Your ownership transfer of {path} to {user} failed.'),
-				[
-					'path' => [
-						'type' => 'highlight',
-						'id' => $param['targetUser'] . '::' . $param['nodeName'],
-						'name' => $param['nodeName'],
-					],
-					'user' => [
-						'type' => 'user',
-						'id' => $targetUser->getUID(),
-						'name' => $targetUser->getDisplayName(),
-					],
-				])
-			->setParsedMessage(str_replace(['{path}', '{user}'], [$param['nodeName'], $targetUser->getDisplayName()], $l->t('Your ownership transfer of {path} to {user} failed.')));
-		return $notification;
-	}
-
-	public function handleTransferOwnershipFailedTarget(INotification $notification,  string $languageCode): INotification {
-		$l = $this->l10nFactory->get('files', $languageCode);
-		$param = $notification->getSubjectParameters();
-
-		$sourceUser = $this->getUser($param['sourceUser']);
-		$notification->setRichSubject($l->t('Ownership transfer failed'))
-			->setParsedSubject($l->t('Ownership transfer failed'))
-
-			->setRichMessage(
-				$l->t('The ownership transfer of {path} from {user} failed.'),
-				[
-					'path' => [
-						'type' => 'highlight',
-						'id' => $param['sourceUser'] . '::' . $param['nodeName'],
-						'name' => $param['nodeName'],
-					],
-					'user' => [
-						'type' => 'user',
-						'id' => $sourceUser->getUID(),
-						'name' => $sourceUser->getDisplayName(),
-					],
-				])
-			->setParsedMessage(str_replace(['{path}', '{user}'], [$param['nodeName'], $sourceUser->getDisplayName()], $l->t('The ownership transfer of {path} from {user} failed.')));
-
-		return $notification;
-	}
-
-	public function handleTransferOwnershipDoneSource(INotification $notification,  string $languageCode): INotification {
-		$l = $this->l10nFactory->get('files', $languageCode);
-		$param = $notification->getSubjectParameters();
-
-		$targetUser = $this->getUser($param['targetUser']);
-		$notification->setRichSubject($l->t('Ownership transfer done'))
-			->setParsedSubject($l->t('Ownership transfer done'))
-
-			->setRichMessage(
-				$l->t('Your ownership transfer of {path} to {user} has completed.'),
-				[
-					'path' => [
-						'type' => 'highlight',
-						'id' => $param['targetUser'] . '::' . $param['nodeName'],
-						'name' => $param['nodeName'],
-					],
-					'user' => [
-						'type' => 'user',
-						'id' => $targetUser->getUID(),
-						'name' => $targetUser->getDisplayName(),
-					],
-				])
-			->setParsedMessage(str_replace(['{path}', '{user}'], [$param['nodeName'], $targetUser->getDisplayName()], $l->t('Your ownership transfer of {path} to {user} has completed.')));
-
-		return $notification;
-	}
-
-	public function handleTransferOwnershipDoneTarget(INotification $notification,  string $languageCode): INotification {
-		$l = $this->l10nFactory->get('files', $languageCode);
-		$param = $notification->getSubjectParameters();
-
-		$sourceUser = $this->getUser($param['sourceUser']);
-		$notification->setRichSubject($l->t('Ownership transfer done'))
-			->setParsedSubject($l->t('Ownership transfer done'))
-
-			->setRichMessage(
-				$l->t('The ownership transfer of {path} from {user} has completed.'),
-				[
-					'path' => [
-						'type' => 'highlight',
-						'id' => $param['sourceUser'] . '::' . $param['nodeName'],
-						'name' => $param['nodeName'],
-					],
-					'user' => [
-						'type' => 'user',
-						'id' => $sourceUser->getUID(),
-						'name' => $sourceUser->getDisplayName(),
-					],
-				])
-			->setParsedMessage(str_replace(['{path}', '{user}'], [$param['nodeName'], $sourceUser->getDisplayName()], $l->t('The ownership transfer of {path} from {user} has completed.')));
-
-		return $notification;
-	}
-
-	public function dismissNotification(INotification $notification): void {
-		if ($notification->getApp() !== 'files') {
-			throw new \InvalidArgumentException('Unhandled app');
-		}
-
-		// TODO: This should all be moved to a service that also the transferownershipContoller uses.
-		try {
-			$transferOwnership = $this->mapper->getById((int)$notification->getObjectId());
-		} catch (DoesNotExistException $e) {
-			return;
-		}
-
-		$notification = $this->notificationManager->createNotification();
-		$notification->setUser($transferOwnership->getSourceUser())
-			->setApp('files')
-			->setDateTime($this->timeFactory->getDateTime())
-			->setSubject('transferownershipRequestDenied', [
-				'sourceUser' => $transferOwnership->getSourceUser(),
-				'targetUser' => $transferOwnership->getTargetUser(),
-				'nodeName' => $transferOwnership->getNodeName()
-			])
-			->setObject('transfer', (string)$transferOwnership->getId());
-		$this->notificationManager->notify($notification);
-
-		$this->mapper->delete($transferOwnership);
-	}
-
-	protected function getUser(string $userId): IUser {
-		$user = $this->userManager->get($userId);
-		if ($user instanceof IUser) {
-			return $user;
-		}
-		throw new \InvalidArgumentException('User not found');
-	}
+    /** @var IFactory */
+    protected $l10nFactory;
+
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+    /** @var TransferOwnershipMapper */
+    private $mapper;
+    /** @var IManager */
+    private $notificationManager;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    public function __construct(IFactory $l10nFactory,
+                                IURLGenerator $urlGenerator,
+                                TransferOwnershipMapper $mapper,
+                                IManager $notificationManager,
+                                IUserManager $userManager,
+                                ITimeFactory $timeFactory) {
+        $this->l10nFactory = $l10nFactory;
+        $this->urlGenerator = $urlGenerator;
+        $this->mapper = $mapper;
+        $this->notificationManager = $notificationManager;
+        $this->userManager = $userManager;
+        $this->timeFactory = $timeFactory;
+    }
+
+    public function getID(): string {
+        return 'files';
+    }
+
+    public function getName(): string {
+        return $this->l10nFactory->get('files')->t('Files');
+    }
+
+    /**
+     * @param INotification $notification
+     * @param string $languageCode The code of the language that should be used to prepare the notification
+     * @return INotification
+     * @throws \InvalidArgumentException When the notification was not prepared by a notifier
+     */
+    public function prepare(INotification $notification, string $languageCode): INotification {
+        if ($notification->getApp() !== 'files') {
+            throw new \InvalidArgumentException('Unhandled app');
+        }
+
+        if ($notification->getSubject() === 'transferownershipRequest') {
+            return $this->handleTransferownershipRequest($notification, $languageCode);
+        }
+        if ($notification->getSubject() === 'transferOwnershipFailedSource') {
+            return $this->handleTransferOwnershipFailedSource($notification, $languageCode);
+        }
+        if ($notification->getSubject() === 'transferOwnershipFailedTarget') {
+            return $this->handleTransferOwnershipFailedTarget($notification, $languageCode);
+        }
+        if ($notification->getSubject() === 'transferOwnershipDoneSource') {
+            return $this->handleTransferOwnershipDoneSource($notification, $languageCode);
+        }
+        if ($notification->getSubject() === 'transferOwnershipDoneTarget') {
+            return $this->handleTransferOwnershipDoneTarget($notification, $languageCode);
+        }
+
+        throw new \InvalidArgumentException('Unhandled subject');
+    }
+
+    public function handleTransferownershipRequest(INotification $notification, string $languageCode): INotification {
+        $l = $this->l10nFactory->get('files', $languageCode);
+        $id = $notification->getObjectId();
+        $param = $notification->getSubjectParameters();
+
+        $approveAction = $notification->createAction()
+            ->setParsedLabel($l->t('Accept'))
+            ->setPrimary(true)
+            ->setLink(
+                $this->urlGenerator->getAbsoluteURL(
+                    $this->urlGenerator->linkTo(
+                        '',
+                        'ocs/v2.php/apps/files/api/v1/transferownership/' . $id
+                    )
+                ),
+                IAction::TYPE_POST
+            );
+
+        $disapproveAction = $notification->createAction()
+            ->setParsedLabel($l->t('Reject'))
+            ->setPrimary(false)
+            ->setLink(
+                $this->urlGenerator->getAbsoluteURL(
+                    $this->urlGenerator->linkTo(
+                        '',
+                        'ocs/v2.php/apps/files/api/v1/transferownership/' . $id
+                    )
+                ),
+                IAction::TYPE_DELETE
+            );
+
+        $sourceUser = $this->getUser($param['sourceUser']);
+        $notification->addParsedAction($approveAction)
+            ->addParsedAction($disapproveAction)
+            ->setRichSubject(
+                $l->t('Incoming ownership transfer from {user}'),
+                [
+                    'user' => [
+                        'type' => 'user',
+                        'id' => $sourceUser->getUID(),
+                        'name' => $sourceUser->getDisplayName(),
+                    ],
+                ])
+            ->setParsedSubject(str_replace('{user}', $sourceUser->getDisplayName(), $l->t('Incoming ownership transfer from {user}')))
+            ->setRichMessage(
+                $l->t("Do you want to accept {path}?\n\nNote: The transfer process after accepting may take up to 1 hour."),
+                [
+                    'path' => [
+                        'type' => 'highlight',
+                        'id' => $param['targetUser'] . '::' . $param['nodeName'],
+                        'name' => $param['nodeName'],
+                    ]
+                ])
+            ->setParsedMessage(str_replace('{path}', $param['nodeName'], $l->t("Do you want to accept {path}?\n\nNote: The transfer process after accepting may take up to 1 hour.")));
+
+        return $notification;
+    }
+
+    public function handleTransferOwnershipFailedSource(INotification $notification,  string $languageCode): INotification {
+        $l = $this->l10nFactory->get('files', $languageCode);
+        $param = $notification->getSubjectParameters();
+
+        $targetUser = $this->getUser($param['targetUser']);
+        $notification->setRichSubject($l->t('Ownership transfer failed'))
+            ->setParsedSubject($l->t('Ownership transfer failed'))
+
+            ->setRichMessage(
+                $l->t('Your ownership transfer of {path} to {user} failed.'),
+                [
+                    'path' => [
+                        'type' => 'highlight',
+                        'id' => $param['targetUser'] . '::' . $param['nodeName'],
+                        'name' => $param['nodeName'],
+                    ],
+                    'user' => [
+                        'type' => 'user',
+                        'id' => $targetUser->getUID(),
+                        'name' => $targetUser->getDisplayName(),
+                    ],
+                ])
+            ->setParsedMessage(str_replace(['{path}', '{user}'], [$param['nodeName'], $targetUser->getDisplayName()], $l->t('Your ownership transfer of {path} to {user} failed.')));
+        return $notification;
+    }
+
+    public function handleTransferOwnershipFailedTarget(INotification $notification,  string $languageCode): INotification {
+        $l = $this->l10nFactory->get('files', $languageCode);
+        $param = $notification->getSubjectParameters();
+
+        $sourceUser = $this->getUser($param['sourceUser']);
+        $notification->setRichSubject($l->t('Ownership transfer failed'))
+            ->setParsedSubject($l->t('Ownership transfer failed'))
+
+            ->setRichMessage(
+                $l->t('The ownership transfer of {path} from {user} failed.'),
+                [
+                    'path' => [
+                        'type' => 'highlight',
+                        'id' => $param['sourceUser'] . '::' . $param['nodeName'],
+                        'name' => $param['nodeName'],
+                    ],
+                    'user' => [
+                        'type' => 'user',
+                        'id' => $sourceUser->getUID(),
+                        'name' => $sourceUser->getDisplayName(),
+                    ],
+                ])
+            ->setParsedMessage(str_replace(['{path}', '{user}'], [$param['nodeName'], $sourceUser->getDisplayName()], $l->t('The ownership transfer of {path} from {user} failed.')));
+
+        return $notification;
+    }
+
+    public function handleTransferOwnershipDoneSource(INotification $notification,  string $languageCode): INotification {
+        $l = $this->l10nFactory->get('files', $languageCode);
+        $param = $notification->getSubjectParameters();
+
+        $targetUser = $this->getUser($param['targetUser']);
+        $notification->setRichSubject($l->t('Ownership transfer done'))
+            ->setParsedSubject($l->t('Ownership transfer done'))
+
+            ->setRichMessage(
+                $l->t('Your ownership transfer of {path} to {user} has completed.'),
+                [
+                    'path' => [
+                        'type' => 'highlight',
+                        'id' => $param['targetUser'] . '::' . $param['nodeName'],
+                        'name' => $param['nodeName'],
+                    ],
+                    'user' => [
+                        'type' => 'user',
+                        'id' => $targetUser->getUID(),
+                        'name' => $targetUser->getDisplayName(),
+                    ],
+                ])
+            ->setParsedMessage(str_replace(['{path}', '{user}'], [$param['nodeName'], $targetUser->getDisplayName()], $l->t('Your ownership transfer of {path} to {user} has completed.')));
+
+        return $notification;
+    }
+
+    public function handleTransferOwnershipDoneTarget(INotification $notification,  string $languageCode): INotification {
+        $l = $this->l10nFactory->get('files', $languageCode);
+        $param = $notification->getSubjectParameters();
+
+        $sourceUser = $this->getUser($param['sourceUser']);
+        $notification->setRichSubject($l->t('Ownership transfer done'))
+            ->setParsedSubject($l->t('Ownership transfer done'))
+
+            ->setRichMessage(
+                $l->t('The ownership transfer of {path} from {user} has completed.'),
+                [
+                    'path' => [
+                        'type' => 'highlight',
+                        'id' => $param['sourceUser'] . '::' . $param['nodeName'],
+                        'name' => $param['nodeName'],
+                    ],
+                    'user' => [
+                        'type' => 'user',
+                        'id' => $sourceUser->getUID(),
+                        'name' => $sourceUser->getDisplayName(),
+                    ],
+                ])
+            ->setParsedMessage(str_replace(['{path}', '{user}'], [$param['nodeName'], $sourceUser->getDisplayName()], $l->t('The ownership transfer of {path} from {user} has completed.')));
+
+        return $notification;
+    }
+
+    public function dismissNotification(INotification $notification): void {
+        if ($notification->getApp() !== 'files') {
+            throw new \InvalidArgumentException('Unhandled app');
+        }
+
+        // TODO: This should all be moved to a service that also the transferownershipContoller uses.
+        try {
+            $transferOwnership = $this->mapper->getById((int)$notification->getObjectId());
+        } catch (DoesNotExistException $e) {
+            return;
+        }
+
+        $notification = $this->notificationManager->createNotification();
+        $notification->setUser($transferOwnership->getSourceUser())
+            ->setApp('files')
+            ->setDateTime($this->timeFactory->getDateTime())
+            ->setSubject('transferownershipRequestDenied', [
+                'sourceUser' => $transferOwnership->getSourceUser(),
+                'targetUser' => $transferOwnership->getTargetUser(),
+                'nodeName' => $transferOwnership->getNodeName()
+            ])
+            ->setObject('transfer', (string)$transferOwnership->getId());
+        $this->notificationManager->notify($notification);
+
+        $this->mapper->delete($transferOwnership);
+    }
+
+    protected function getUser(string $userId): IUser {
+        $user = $this->userManager->get($userId);
+        if ($user instanceof IUser) {
+            return $user;
+        }
+        throw new \InvalidArgumentException('User not found');
+    }
 }

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;
+    }
 
 }

apps/files_sharing/templates/public.php

Indentation +4 added lines, -4 removed lines

@@ -111,10 +111,10 @@
 			<?php if (!empty($_['disclaimer'])) { ?>
 				<div>
 					<?php
-						echo $l->t('By uploading files, you agree to the %1$sterms of service%2$s.', [
-							'<span id="show-terms-dialog">', '</span>'
-						]);
-					?>
+                        echo $l->t('By uploading files, you agree to the %1$sterms of service%2$s.', [
+                            '<span id="show-terms-dialog">', '</span>'
+                        ]);
+                    ?>
 				</div>
 			<?php } ?>
 		</div>

apps/files_external/lib/Controller/AjaxController.php

Indentation +73 added lines, -73 removed lines

@@ -38,84 +38,84 @@
 use OCP\IUserSession;
 
 class AjaxController extends Controller {
-	/** @var RSA */
-	private $rsaMechanism;
-	/** @var GlobalAuth  */
-	private $globalAuth;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IGroupManager */
-	private $groupManager;
+    /** @var RSA */
+    private $rsaMechanism;
+    /** @var GlobalAuth  */
+    private $globalAuth;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IGroupManager */
+    private $groupManager;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param RSA $rsaMechanism
-	 * @param GlobalAuth $globalAuth
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								RSA $rsaMechanism,
-								GlobalAuth $globalAuth,
-								IUserSession $userSession,
-								IGroupManager $groupManager) {
-		parent::__construct($appName, $request);
-		$this->rsaMechanism = $rsaMechanism;
-		$this->globalAuth = $globalAuth;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param RSA $rsaMechanism
+     * @param GlobalAuth $globalAuth
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                RSA $rsaMechanism,
+                                GlobalAuth $globalAuth,
+                                IUserSession $userSession,
+                                IGroupManager $groupManager) {
+        parent::__construct($appName, $request);
+        $this->rsaMechanism = $rsaMechanism;
+        $this->globalAuth = $globalAuth;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+    }
 
-	/**
-	 * @param int $keyLength
-	 * @return array
-	 */
-	private function generateSshKeys($keyLength) {
-		$key = $this->rsaMechanism->createKey($keyLength);
-		// Replace the placeholder label with a more meaningful one
-		$key['publickey'] = str_replace('phpseclib-generated-key', gethostname(), $key['publickey']);
+    /**
+     * @param int $keyLength
+     * @return array
+     */
+    private function generateSshKeys($keyLength) {
+        $key = $this->rsaMechanism->createKey($keyLength);
+        // Replace the placeholder label with a more meaningful one
+        $key['publickey'] = str_replace('phpseclib-generated-key', gethostname(), $key['publickey']);
 
-		return $key;
-	}
+        return $key;
+    }
 
-	/**
-	 * Generates an SSH public/private key pair.
-	 *
-	 * @NoAdminRequired
-	 * @param int $keyLength
-	 */
-	public function getSshKeys($keyLength = 1024) {
-		$key = $this->generateSshKeys($keyLength);
-		return new JSONResponse(
-			['data' => [
-				'private_key' => $key['privatekey'],
-				'public_key' => $key['publickey']
-			],
-				'status' => 'success'
-			]);
-	}
+    /**
+     * Generates an SSH public/private key pair.
+     *
+     * @NoAdminRequired
+     * @param int $keyLength
+     */
+    public function getSshKeys($keyLength = 1024) {
+        $key = $this->generateSshKeys($keyLength);
+        return new JSONResponse(
+            ['data' => [
+                'private_key' => $key['privatekey'],
+                'public_key' => $key['publickey']
+            ],
+                'status' => 'success'
+            ]);
+    }
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $uid
-	 * @param string $user
-	 * @param string $password
-	 * @return bool
-	 */
-	public function saveGlobalCredentials($uid, $user, $password) {
-		$currentUser = $this->userSession->getUser();
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $uid
+     * @param string $user
+     * @param string $password
+     * @return bool
+     */
+    public function saveGlobalCredentials($uid, $user, $password) {
+        $currentUser = $this->userSession->getUser();
 
-		// Non-admins can only edit their own credentials
-		$allowedToEdit = ($this->groupManager->isAdmin($currentUser->getUID()) || $currentUser->getUID() === $uid);
+        // Non-admins can only edit their own credentials
+        $allowedToEdit = ($this->groupManager->isAdmin($currentUser->getUID()) || $currentUser->getUID() === $uid);
 
-		if ($allowedToEdit) {
-			$this->globalAuth->saveAuth($uid, $user, $password);
-			return true;
-		} else {
-			return false;
-		}
-	}
+        if ($allowedToEdit) {
+            $this->globalAuth->saveAuth($uid, $user, $password);
+            return true;
+        } else {
+            return false;
+        }
+    }
 }

core/templates/loginflow/grant.php

Indentation +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@
 	<h2><?php p($l->t('Account access')) ?></h2>
 	<p class="info">
 		<?php print_unescaped($l->t('You are about to grant %1$s access to your %2$s account.', [
-			'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
-			\OCP\Util::sanitizeHTML($_['instanceName'])
-		])) ?>
+            '<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+            \OCP\Util::sanitizeHTML($_['instanceName'])
+        ])) ?>
 	</p>
 
 	<br/>

apps/user_ldap/lib/ConnectionFactory.php

Indentation +8 added lines, -8 removed lines

@@ -24,14 +24,14 @@
 namespace OCA\User_LDAP;
 
 class ConnectionFactory {
-	/** @var ILDAPWrapper */
-	private $ldap;
+    /** @var ILDAPWrapper */
+    private $ldap;
 
-	public function __construct(ILDAPWrapper $ldap) {
-		$this->ldap = $ldap;
-	}
+    public function __construct(ILDAPWrapper $ldap) {
+        $this->ldap = $ldap;
+    }
 
-	public function get($prefix) {
-		return new Connection($this->ldap, $prefix, 'user_ldap');
-	}
+    public function get($prefix) {
+        return new Connection($this->ldap, $prefix, 'user_ldap');
+    }
 }

apps/files_trashbin/lib/Sabre/TrashFolderFile.php

Indentation +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@
 namespace OCA\Files_Trashbin\Sabre;
 
 class TrashFolderFile extends AbstractTrashFile {
-	public function get() {
-		return $this->data->getStorage()->fopen($this->data->getInternalPath(), 'rb');
-	}
+    public function get() {
+        return $this->data->getStorage()->fopen($this->data->getInternalPath(), 'rb');
+    }
 }