nextcloud / server

apps/settings/lib/Controller/TwoFactorSettingsController.php

Indentation +17 added lines, -17 removed lines

@@ -34,27 +34,27 @@
 
 class TwoFactorSettingsController extends Controller {
 
-	/** @var MandatoryTwoFactor */
-	private $mandatoryTwoFactor;
+    /** @var MandatoryTwoFactor */
+    private $mandatoryTwoFactor;
 
-	public function __construct(string $appName,
-								IRequest $request,
-								MandatoryTwoFactor $mandatoryTwoFactor) {
-		parent::__construct($appName, $request);
+    public function __construct(string $appName,
+                                IRequest $request,
+                                MandatoryTwoFactor $mandatoryTwoFactor) {
+        parent::__construct($appName, $request);
 
-		$this->mandatoryTwoFactor = $mandatoryTwoFactor;
-	}
+        $this->mandatoryTwoFactor = $mandatoryTwoFactor;
+    }
 
-	public function index(): JSONResponse {
-		return new JSONResponse($this->mandatoryTwoFactor->getState());
-	}
+    public function index(): JSONResponse {
+        return new JSONResponse($this->mandatoryTwoFactor->getState());
+    }
 
-	public function update(bool $enforced, array $enforcedGroups = [], array $excludedGroups = []): JSONResponse {
-		$this->mandatoryTwoFactor->setState(
-			new EnforcementState($enforced, $enforcedGroups, $excludedGroups)
-		);
+    public function update(bool $enforced, array $enforcedGroups = [], array $excludedGroups = []): JSONResponse {
+        $this->mandatoryTwoFactor->setState(
+            new EnforcementState($enforced, $enforcedGroups, $excludedGroups)
+        );
 
-		return new JSONResponse($this->mandatoryTwoFactor->getState());
-	}
+        return new JSONResponse($this->mandatoryTwoFactor->getState());
+    }
 
 }

apps/settings/lib/Activity/Setting.php

Indentation +59 added lines, -59 removed lines

@@ -26,71 +26,71 @@
 
 class Setting implements ISetting {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l10n
-	 */
-	public function __construct(IL10N $l10n) {
-		$this->l = $l10n;
-	}
+    /**
+     * @param IL10N $l10n
+     */
+    public function __construct(IL10N $l10n) {
+        $this->l = $l10n;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'personal_settings';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'personal_settings';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('Your <strong>password</strong> or <strong>email</strong> was modified');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('Your <strong>password</strong> or <strong>email</strong> was modified');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 0;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 0;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function canChangeStream() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function canChangeStream() {
+        return false;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 11.0.0
-	 */
-	public function canChangeMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     * @since 11.0.0
+     */
+    public function canChangeMail() {
+        return false;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 }

apps/settings/lib/Activity/SecurityFilter.php

Indentation +26 added lines, -26 removed lines

@@ -28,39 +28,39 @@
 
 class SecurityFilter implements IFilter {
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/** @var IL10N */
-	private $l10n;
+    /** @var IL10N */
+    private $l10n;
 
-	public function __construct(IURLGenerator $urlGenerator, IL10N $l10n) {
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-	}
+    public function __construct(IURLGenerator $urlGenerator, IL10N $l10n) {
+        $this->urlGenerator = $urlGenerator;
+        $this->l10n = $l10n;
+    }
 
-	public function allowedApps() {
-		return [];
-	}
+    public function allowedApps() {
+        return [];
+    }
 
-	public function filterTypes(array $types) {
-		return array_intersect(['security'], $types);
-	}
+    public function filterTypes(array $types) {
+        return array_intersect(['security'], $types);
+    }
 
-	public function getIcon() {
-		return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg'));
-	}
+    public function getIcon() {
+        return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg'));
+    }
 
-	public function getIdentifier() {
-		return 'security';
-	}
+    public function getIdentifier() {
+        return 'security';
+    }
 
-	public function getName() {
-		return $this->l10n->t('Security');
-	}
+    public function getName() {
+        return $this->l10n->t('Security');
+    }
 
-	public function getPriority() {
-		return 30;
-	}
+    public function getPriority() {
+        return 30;
+    }
 
 }

apps/settings/lib/Activity/GroupProvider.php

Spacing +1 added lines, -1 removed lines

@@ -169,7 +169,7 @@
 	protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
 		$placeholders = $replacements = [];
 		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
+			$placeholders[] = '{'.$placeholder.'}';
 			$replacements[] = $parameter['name'];
 		}
 

Indentation +139 added lines, -139 removed lines

@@ -35,143 +35,143 @@
 use OCP\L10N\IFactory as L10nFactory;
 
 class GroupProvider implements IProvider {
-	public const ADDED_TO_GROUP = 'group_added';
-	public const REMOVED_FROM_GROUP = 'group_removed';
-
-	/** @var L10nFactory */
-	private $l10n;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IManager */
-	private $activityManager;
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var string[] */
-	protected $groupDisplayNames = [];
-
-
-	public function __construct(L10nFactory $l10n,
-								IURLGenerator $urlGenerator,
-								IManager $activityManager,
-								IUserManager $userManager,
-								IGroupManager $groupManager) {
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-	}
-
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getType() !== 'group_settings') {
-			throw new InvalidArgumentException();
-		}
-
-		$l = $this->l10n->get('settings', $language);
-
-		$params = $event->getSubjectParameters();
-		$parsedParameters = [
-			'user' => $this->generateUserParameter($params['user']),
-			'group' => $this->generateGroupParameter($params['group']),
-		];
-
-		if (isset($params['actor'])) {
-			$parsedParameters['actor'] = $this->generateUserParameter($params['actor']);
-		}
-
-		switch ($event->getSubject()) {
-			case self::ADDED_TO_GROUP:
-				if (isset($parsedParameters['actor'])) {
-					if ($this->activityManager->getCurrentUserId() === $params['user']) {
-						$subject = $l->t('{actor} added you to group {group}');
-					} elseif (isset($params['actor']) && $this->activityManager->getCurrentUserId() === $params['actor']) {
-						$subject = $l->t('You added {user} to group {group}');
-					} else {
-						$subject = $l->t('{actor} added {user} to group {group}');
-					}
-				} elseif ($this->activityManager->getCurrentUserId() === $params['user']) {
-					$subject = $l->t('An administrator added you to group {group}');
-				} else {
-					$subject = $l->t('An administrator added {user} to group {group}');
-				}
-				break;
-			case self::REMOVED_FROM_GROUP:
-				if (isset($parsedParameters['actor'])) {
-					if ($this->activityManager->getCurrentUserId() === $params['user']) {
-						$subject = $l->t('{actor} removed you from group {group}');
-					} elseif (isset($params['actor']) && $this->activityManager->getCurrentUserId() === $params['actor']) {
-						$subject = $l->t('You removed {user} from group {group}');
-					} else {
-						$subject = $l->t('{actor} removed {user} from group {group}');
-					}
-				} elseif ($this->activityManager->getCurrentUserId() === $params['user']) {
-					$subject = $l->t('An administrator removed you from group {group}');
-				} else {
-					$subject = $l->t('An administrator removed {user} from group {group}');
-				}
-				break;
-			default:
-				throw new InvalidArgumentException();
-		}
-
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param string $subject
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 */
-	protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			$replacements[] = $parameter['name'];
-		}
-
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
-			->setRichSubject($subject, $parameters);
-	}
-
-	/**
-	 * @param string $gid
-	 * @return array
-	 */
-	protected function generateGroupParameter(string $gid): array {
-		if (!isset($this->groupDisplayNames[$gid])) {
-			$this->groupDisplayNames[$gid] = $this->getGroupDisplayName($gid);
-		}
-
-		return [
-			'type' => 'user-group',
-			'id' => $gid,
-			'name' => $this->groupDisplayNames[$gid],
-		];
-	}
-
-	/**
-	 * @param string $gid
-	 * @return string
-	 */
-	protected function getGroupDisplayName(string $gid): string {
-		$group = $this->groupManager->get($gid);
-		if ($group instanceof IGroup) {
-			return $group->getDisplayName();
-		}
-		return $gid;
-	}
-
-	protected function generateUserParameter(string $uid): array {
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->userManager->getDisplayName($uid) ?? $uid,
-		];
-	}
+    public const ADDED_TO_GROUP = 'group_added';
+    public const REMOVED_FROM_GROUP = 'group_removed';
+
+    /** @var L10nFactory */
+    private $l10n;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IManager */
+    private $activityManager;
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var string[] */
+    protected $groupDisplayNames = [];
+
+
+    public function __construct(L10nFactory $l10n,
+                                IURLGenerator $urlGenerator,
+                                IManager $activityManager,
+                                IUserManager $userManager,
+                                IGroupManager $groupManager) {
+        $this->urlGenerator = $urlGenerator;
+        $this->l10n = $l10n;
+        $this->activityManager = $activityManager;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+    }
+
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getType() !== 'group_settings') {
+            throw new InvalidArgumentException();
+        }
+
+        $l = $this->l10n->get('settings', $language);
+
+        $params = $event->getSubjectParameters();
+        $parsedParameters = [
+            'user' => $this->generateUserParameter($params['user']),
+            'group' => $this->generateGroupParameter($params['group']),
+        ];
+
+        if (isset($params['actor'])) {
+            $parsedParameters['actor'] = $this->generateUserParameter($params['actor']);
+        }
+
+        switch ($event->getSubject()) {
+            case self::ADDED_TO_GROUP:
+                if (isset($parsedParameters['actor'])) {
+                    if ($this->activityManager->getCurrentUserId() === $params['user']) {
+                        $subject = $l->t('{actor} added you to group {group}');
+                    } elseif (isset($params['actor']) && $this->activityManager->getCurrentUserId() === $params['actor']) {
+                        $subject = $l->t('You added {user} to group {group}');
+                    } else {
+                        $subject = $l->t('{actor} added {user} to group {group}');
+                    }
+                } elseif ($this->activityManager->getCurrentUserId() === $params['user']) {
+                    $subject = $l->t('An administrator added you to group {group}');
+                } else {
+                    $subject = $l->t('An administrator added {user} to group {group}');
+                }
+                break;
+            case self::REMOVED_FROM_GROUP:
+                if (isset($parsedParameters['actor'])) {
+                    if ($this->activityManager->getCurrentUserId() === $params['user']) {
+                        $subject = $l->t('{actor} removed you from group {group}');
+                    } elseif (isset($params['actor']) && $this->activityManager->getCurrentUserId() === $params['actor']) {
+                        $subject = $l->t('You removed {user} from group {group}');
+                    } else {
+                        $subject = $l->t('{actor} removed {user} from group {group}');
+                    }
+                } elseif ($this->activityManager->getCurrentUserId() === $params['user']) {
+                    $subject = $l->t('An administrator removed you from group {group}');
+                } else {
+                    $subject = $l->t('An administrator removed {user} from group {group}');
+                }
+                break;
+            default:
+                throw new InvalidArgumentException();
+        }
+
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @param string $subject
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     */
+    protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            $replacements[] = $parameter['name'];
+        }
+
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
+            ->setRichSubject($subject, $parameters);
+    }
+
+    /**
+     * @param string $gid
+     * @return array
+     */
+    protected function generateGroupParameter(string $gid): array {
+        if (!isset($this->groupDisplayNames[$gid])) {
+            $this->groupDisplayNames[$gid] = $this->getGroupDisplayName($gid);
+        }
+
+        return [
+            'type' => 'user-group',
+            'id' => $gid,
+            'name' => $this->groupDisplayNames[$gid],
+        ];
+    }
+
+    /**
+     * @param string $gid
+     * @return string
+     */
+    protected function getGroupDisplayName(string $gid): string {
+        $group = $this->groupManager->get($gid);
+        if ($group instanceof IGroup) {
+            return $group->getDisplayName();
+        }
+        return $gid;
+    }
+
+    protected function generateUserParameter(string $uid): array {
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->userManager->getDisplayName($uid) ?? $uid,
+        ];
+    }
 }

apps/settings/lib/Activity/Provider.php

Spacing +1 added lines, -1 removed lines

@@ -169,7 +169,7 @@
 	protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
 		$placeholders = $replacements = [];
 		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
+			$placeholders[] = '{'.$placeholder.'}';
 			$replacements[] = $parameter['name'];
 		}
 

Indentation +171 added lines, -171 removed lines

@@ -38,175 +38,175 @@
 use OCP\L10N\IFactory;
 
 class Provider implements IProvider {
-	public const PASSWORD_CHANGED_BY = 'password_changed_by';
-	public const PASSWORD_CHANGED_SELF = 'password_changed_self';
-	public const PASSWORD_RESET = 'password_changed';
-	public const PASSWORD_RESET_SELF = 'password_reset_self';
-	public const EMAIL_CHANGED_BY = 'email_changed_by';
-	public const EMAIL_CHANGED_SELF = 'email_changed_self';
-	public const EMAIL_CHANGED = 'email_changed';
-	public const APP_TOKEN_CREATED = 'app_token_created';
-	public const APP_TOKEN_DELETED = 'app_token_deleted';
-	public const APP_TOKEN_RENAMED = 'app_token_renamed';
-	public const APP_TOKEN_FILESYSTEM_GRANTED = 'app_token_filesystem_granted';
-	public const APP_TOKEN_FILESYSTEM_REVOKED = 'app_token_filesystem_revoked';
-
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IManager */
-	private $activityManager;
-
-	public function __construct(IFactory $languageFactory,
-								IURLGenerator $url,
-								IUserManager $userManager,
-								IManager $activityManager) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->userManager = $userManager;
-		$this->activityManager = $activityManager;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null): IEvent {
-		if ($event->getApp() !== 'settings') {
-			throw new \InvalidArgumentException('Unknown app');
-		}
-
-		$this->l = $this->languageFactory->get('settings', $language);
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('settings', 'personal.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('settings', 'personal.svg')));
-		}
-
-		if ($event->getSubject() === self::PASSWORD_CHANGED_BY) {
-			$subject = $this->l->t('{actor} changed your password');
-		} elseif ($event->getSubject() === self::PASSWORD_CHANGED_SELF) {
-			$subject = $this->l->t('You changed your password');
-		} elseif ($event->getSubject() === self::PASSWORD_RESET) {
-			$subject = $this->l->t('Your password was reset by an administrator');
-		} elseif ($event->getSubject() === self::PASSWORD_RESET_SELF) {
-			$subject = $this->l->t('Your password was reset');
-		} elseif ($event->getSubject() === self::EMAIL_CHANGED_BY) {
-			$subject = $this->l->t('{actor} changed your email address');
-		} elseif ($event->getSubject() === self::EMAIL_CHANGED_SELF) {
-			$subject = $this->l->t('You changed your email address');
-		} elseif ($event->getSubject() === self::EMAIL_CHANGED) {
-			$subject = $this->l->t('Your email address was changed by an administrator');
-		} elseif ($event->getSubject() === self::APP_TOKEN_CREATED) {
-			if ($event->getAffectedUser() === $event->getAuthor()) {
-				$subject = $this->l->t('You created app password "{token}"');
-			} else {
-				$subject = $this->l->t('An administrator created app password "{token}"');
-			}
-		} elseif ($event->getSubject() === self::APP_TOKEN_DELETED) {
-			$subject = $this->l->t('You deleted app password "{token}"');
-		} elseif ($event->getSubject() === self::APP_TOKEN_RENAMED) {
-			$subject = $this->l->t('You renamed app password "{token}" to "{newToken}"');
-		} elseif ($event->getSubject() === self::APP_TOKEN_FILESYSTEM_GRANTED) {
-			$subject = $this->l->t('You granted filesystem access to app password "{token}"');
-		} elseif ($event->getSubject() === self::APP_TOKEN_FILESYSTEM_REVOKED) {
-			$subject = $this->l->t('You revoked filesystem access from app password "{token}"');
-		} else {
-			throw new \InvalidArgumentException('Unknown subject');
-		}
-
-		$parsedParameters = $this->getParameters($event);
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 * @throws \InvalidArgumentException
-	 */
-	protected function getParameters(IEvent $event): array {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::PASSWORD_CHANGED_SELF:
-			case self::PASSWORD_RESET:
-			case self::PASSWORD_RESET_SELF:
-			case self::EMAIL_CHANGED_SELF:
-			case self::EMAIL_CHANGED:
-				return [];
-			case self::PASSWORD_CHANGED_BY:
-			case self::EMAIL_CHANGED_BY:
-				return [
-					'actor' => $this->generateUserParameter($parameters[0]),
-				];
-			case self::APP_TOKEN_CREATED:
-			case self::APP_TOKEN_DELETED:
-			case self::APP_TOKEN_FILESYSTEM_GRANTED:
-			case self::APP_TOKEN_FILESYSTEM_REVOKED:
-				return [
-					'token' => [
-						'type' => 'highlight',
-						'id' => $event->getObjectId(),
-						'name' => $parameters['name'],
-					]
-				];
-			case self::APP_TOKEN_RENAMED:
-				return [
-					'token' => [
-						'type' => 'highlight',
-						'id' => $event->getObjectId(),
-						'name' => $parameters['name'],
-					],
-					'newToken' => [
-						'type' => 'highlight',
-						'id' => $event->getObjectId(),
-						'name' => $parameters['newName'],
-					]
-				];
-		}
-
-		throw new \InvalidArgumentException('Unknown subject');
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param string $subject
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 */
-	protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			$replacements[] = $parameter['name'];
-		}
-
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
-			->setRichSubject($subject, $parameters);
-	}
-
-	protected function generateUserParameter(string $uid): array {
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->userManager->getDisplayName($uid) ?? $uid,
-		];
-	}
+    public const PASSWORD_CHANGED_BY = 'password_changed_by';
+    public const PASSWORD_CHANGED_SELF = 'password_changed_self';
+    public const PASSWORD_RESET = 'password_changed';
+    public const PASSWORD_RESET_SELF = 'password_reset_self';
+    public const EMAIL_CHANGED_BY = 'email_changed_by';
+    public const EMAIL_CHANGED_SELF = 'email_changed_self';
+    public const EMAIL_CHANGED = 'email_changed';
+    public const APP_TOKEN_CREATED = 'app_token_created';
+    public const APP_TOKEN_DELETED = 'app_token_deleted';
+    public const APP_TOKEN_RENAMED = 'app_token_renamed';
+    public const APP_TOKEN_FILESYSTEM_GRANTED = 'app_token_filesystem_granted';
+    public const APP_TOKEN_FILESYSTEM_REVOKED = 'app_token_filesystem_revoked';
+
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IManager */
+    private $activityManager;
+
+    public function __construct(IFactory $languageFactory,
+                                IURLGenerator $url,
+                                IUserManager $userManager,
+                                IManager $activityManager) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->userManager = $userManager;
+        $this->activityManager = $activityManager;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null): IEvent {
+        if ($event->getApp() !== 'settings') {
+            throw new \InvalidArgumentException('Unknown app');
+        }
+
+        $this->l = $this->languageFactory->get('settings', $language);
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('settings', 'personal.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('settings', 'personal.svg')));
+        }
+
+        if ($event->getSubject() === self::PASSWORD_CHANGED_BY) {
+            $subject = $this->l->t('{actor} changed your password');
+        } elseif ($event->getSubject() === self::PASSWORD_CHANGED_SELF) {
+            $subject = $this->l->t('You changed your password');
+        } elseif ($event->getSubject() === self::PASSWORD_RESET) {
+            $subject = $this->l->t('Your password was reset by an administrator');
+        } elseif ($event->getSubject() === self::PASSWORD_RESET_SELF) {
+            $subject = $this->l->t('Your password was reset');
+        } elseif ($event->getSubject() === self::EMAIL_CHANGED_BY) {
+            $subject = $this->l->t('{actor} changed your email address');
+        } elseif ($event->getSubject() === self::EMAIL_CHANGED_SELF) {
+            $subject = $this->l->t('You changed your email address');
+        } elseif ($event->getSubject() === self::EMAIL_CHANGED) {
+            $subject = $this->l->t('Your email address was changed by an administrator');
+        } elseif ($event->getSubject() === self::APP_TOKEN_CREATED) {
+            if ($event->getAffectedUser() === $event->getAuthor()) {
+                $subject = $this->l->t('You created app password "{token}"');
+            } else {
+                $subject = $this->l->t('An administrator created app password "{token}"');
+            }
+        } elseif ($event->getSubject() === self::APP_TOKEN_DELETED) {
+            $subject = $this->l->t('You deleted app password "{token}"');
+        } elseif ($event->getSubject() === self::APP_TOKEN_RENAMED) {
+            $subject = $this->l->t('You renamed app password "{token}" to "{newToken}"');
+        } elseif ($event->getSubject() === self::APP_TOKEN_FILESYSTEM_GRANTED) {
+            $subject = $this->l->t('You granted filesystem access to app password "{token}"');
+        } elseif ($event->getSubject() === self::APP_TOKEN_FILESYSTEM_REVOKED) {
+            $subject = $this->l->t('You revoked filesystem access from app password "{token}"');
+        } else {
+            throw new \InvalidArgumentException('Unknown subject');
+        }
+
+        $parsedParameters = $this->getParameters($event);
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return array
+     * @throws \InvalidArgumentException
+     */
+    protected function getParameters(IEvent $event): array {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::PASSWORD_CHANGED_SELF:
+            case self::PASSWORD_RESET:
+            case self::PASSWORD_RESET_SELF:
+            case self::EMAIL_CHANGED_SELF:
+            case self::EMAIL_CHANGED:
+                return [];
+            case self::PASSWORD_CHANGED_BY:
+            case self::EMAIL_CHANGED_BY:
+                return [
+                    'actor' => $this->generateUserParameter($parameters[0]),
+                ];
+            case self::APP_TOKEN_CREATED:
+            case self::APP_TOKEN_DELETED:
+            case self::APP_TOKEN_FILESYSTEM_GRANTED:
+            case self::APP_TOKEN_FILESYSTEM_REVOKED:
+                return [
+                    'token' => [
+                        'type' => 'highlight',
+                        'id' => $event->getObjectId(),
+                        'name' => $parameters['name'],
+                    ]
+                ];
+            case self::APP_TOKEN_RENAMED:
+                return [
+                    'token' => [
+                        'type' => 'highlight',
+                        'id' => $event->getObjectId(),
+                        'name' => $parameters['name'],
+                    ],
+                    'newToken' => [
+                        'type' => 'highlight',
+                        'id' => $event->getObjectId(),
+                        'name' => $parameters['newName'],
+                    ]
+                ];
+        }
+
+        throw new \InvalidArgumentException('Unknown subject');
+    }
+
+    /**
+     * @param IEvent $event
+     * @param string $subject
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     */
+    protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            $replacements[] = $parameter['name'];
+        }
+
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
+            ->setRichSubject($subject, $parameters);
+    }
+
+    protected function generateUserParameter(string $uid): array {
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->userManager->getDisplayName($uid) ?? $uid,
+        ];
+    }
 }

apps/settings/lib/Activity/SecuritySetting.php

Indentation +26 added lines, -26 removed lines

@@ -27,39 +27,39 @@
 
 class SecuritySetting implements ISetting {
 
-	/** @var IL10N */
-	private $l10n;
+    /** @var IL10N */
+    private $l10n;
 
-	public function __construct(IL10N $l10n) {
-		$this->l10n = $l10n;
-	}
+    public function __construct(IL10N $l10n) {
+        $this->l10n = $l10n;
+    }
 
-	public function canChangeMail() {
-		return false;
-	}
+    public function canChangeMail() {
+        return false;
+    }
 
-	public function canChangeStream() {
-		return false;
-	}
+    public function canChangeStream() {
+        return false;
+    }
 
-	public function getIdentifier() {
-		return 'security';
-	}
+    public function getIdentifier() {
+        return 'security';
+    }
 
-	public function getName() {
-		return $this->l10n->t('Security');
-	}
+    public function getName() {
+        return $this->l10n->t('Security');
+    }
 
-	public function getPriority() {
-		return 30;
-	}
+    public function getPriority() {
+        return 30;
+    }
 
-	public function isDefaultEnabledMail() {
-		return true;
-	}
+    public function isDefaultEnabledMail() {
+        return true;
+    }
 
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 
 }

apps/settings/composer/composer/ClassLoader.php

Spacing +8 added lines, -8 removed lines

@@ -370,18 +370,18 @@ 
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        if (file_exists($file = $dir.$pathEnd)) {
                             return $file;
                         }
                     }
@@ -391,7 +391,7 @@ 
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -403,14 +403,14 @@ 
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
         }
 
         if (isset($this->prefixesPsr0[$first])) {
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -420,7 +420,7 @@ 
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }

apps/settings/composer/composer/autoload_psr4.php

Spacing +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\Settings\\' => array($baseDir . '/../lib'),
+    'OCA\\Settings\\' => array($baseDir.'/../lib'),
 );

core/Command/Log/Manage.php

Switch Indentation +22 added lines, -22 removed lines

@@ -142,18 +142,18 @@ 
 	protected function convertLevelString($level) {
 		$level = strtolower($level);
 		switch ($level) {
-		case 'debug':
-			return 0;
-		case 'info':
-			return 1;
-		case 'warning':
-		case 'warn':
-			return 2;
-		case 'error':
-		case 'err':
-			return 3;
-		case 'fatal':
-			return 4;
+		    case 'debug':
+			    return 0;
+		    case 'info':
+			    return 1;
+		    case 'warning':
+		    case 'warn':
+			    return 2;
+		    case 'error':
+		    case 'err':
+			    return 3;
+		    case 'fatal':
+			    return 4;
 		}
 		throw new \InvalidArgumentException('Invalid log level string');
 	}
@@ -165,16 +165,16 @@ 
 	 */
 	protected function convertLevelNumber($levelNum) {
 		switch ($levelNum) {
-		case 0:
-			return 'Debug';
-		case 1:
-			return 'Info';
-		case 2:
-			return 'Warning';
-		case 3:
-			return 'Error';
-		case 4:
-			return 'Fatal';
+		    case 0:
+			    return 'Debug';
+		    case 1:
+			    return 'Info';
+		    case 2:
+			    return 'Warning';
+		    case 3:
+			    return 'Error';
+		    case 4:
+			    return 'Fatal';
 		}
 		throw new \InvalidArgumentException('Invalid log level number');
 	}

Indentation +171 added lines, -171 removed lines

@@ -35,175 +35,175 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Manage extends Command implements CompletionAwareInterface {
-	public const DEFAULT_BACKEND = 'file';
-	public const DEFAULT_LOG_LEVEL = 2;
-	public const DEFAULT_TIMEZONE = 'UTC';
-
-	protected IConfig $config;
-
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('log:manage')
-			->setDescription('manage logging configuration')
-			->addOption(
-				'backend',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'set the logging backend [file, syslog, errorlog, systemd]'
-			)
-			->addOption(
-				'level',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'set the log level [debug, info, warning, error, fatal]'
-			)
-			->addOption(
-				'timezone',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'set the logging timezone'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		// collate config setting to the end, to avoid partial configuration
-		$toBeSet = [];
-
-		if ($backend = $input->getOption('backend')) {
-			$this->validateBackend($backend);
-			$toBeSet['log_type'] = $backend;
-		}
-
-		$level = $input->getOption('level');
-		if ($level !== null) {
-			if (is_numeric($level)) {
-				$levelNum = $level;
-				// sanity check
-				$this->convertLevelNumber($levelNum);
-			} else {
-				$levelNum = $this->convertLevelString($level);
-			}
-			$toBeSet['loglevel'] = $levelNum;
-		}
-
-		if ($timezone = $input->getOption('timezone')) {
-			$this->validateTimezone($timezone);
-			$toBeSet['logtimezone'] = $timezone;
-		}
-
-		// set config
-		foreach ($toBeSet as $option => $value) {
-			$this->config->setSystemValue($option, $value);
-		}
-
-		// display configuration
-		$backend = $this->config->getSystemValue('log_type', self::DEFAULT_BACKEND);
-		$output->writeln('Enabled logging backend: '.$backend);
-
-		$levelNum = $this->config->getSystemValue('loglevel', self::DEFAULT_LOG_LEVEL);
-		$level = $this->convertLevelNumber($levelNum);
-		$output->writeln('Log level: '.$level.' ('.$levelNum.')');
-
-		$timezone = $this->config->getSystemValue('logtimezone', self::DEFAULT_TIMEZONE);
-		$output->writeln('Log timezone: '.$timezone);
-		return 0;
-	}
-
-	/**
-	 * @param string $backend
-	 * @throws \InvalidArgumentException
-	 */
-	protected function validateBackend($backend) {
-		if (!class_exists('OC\\Log\\'.ucfirst($backend))) {
-			throw new \InvalidArgumentException('Invalid backend');
-		}
-	}
-
-	/**
-	 * @param string $timezone
-	 * @throws \Exception
-	 */
-	protected function validateTimezone($timezone) {
-		new \DateTimeZone($timezone);
-	}
-
-	/**
-	 * @param string $level
-	 * @return int
-	 * @throws \InvalidArgumentException
-	 */
-	protected function convertLevelString($level) {
-		$level = strtolower($level);
-		switch ($level) {
-		case 'debug':
-			return 0;
-		case 'info':
-			return 1;
-		case 'warning':
-		case 'warn':
-			return 2;
-		case 'error':
-		case 'err':
-			return 3;
-		case 'fatal':
-			return 4;
-		}
-		throw new \InvalidArgumentException('Invalid log level string');
-	}
-
-	/**
-	 * @param int $levelNum
-	 * @return string
-	 * @throws \InvalidArgumentException
-	 */
-	protected function convertLevelNumber($levelNum) {
-		switch ($levelNum) {
-		case 0:
-			return 'Debug';
-		case 1:
-			return 'Info';
-		case 2:
-			return 'Warning';
-		case 3:
-			return 'Error';
-		case 4:
-			return 'Fatal';
-		}
-		throw new \InvalidArgumentException('Invalid log level number');
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		if ($optionName === 'backend') {
-			return ['file', 'syslog', 'errorlog', 'systemd'];
-		} elseif ($optionName === 'level') {
-			return ['debug', 'info', 'warning', 'error', 'fatal'];
-		} elseif ($optionName === 'timezone') {
-			$identifier = \DateTimeZone::listIdentifiers();
-			if ($identifier === false) {
-				return [];
-			}
-			return $identifier;
-		}
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		return [];
-	}
+    public const DEFAULT_BACKEND = 'file';
+    public const DEFAULT_LOG_LEVEL = 2;
+    public const DEFAULT_TIMEZONE = 'UTC';
+
+    protected IConfig $config;
+
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('log:manage')
+            ->setDescription('manage logging configuration')
+            ->addOption(
+                'backend',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'set the logging backend [file, syslog, errorlog, systemd]'
+            )
+            ->addOption(
+                'level',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'set the log level [debug, info, warning, error, fatal]'
+            )
+            ->addOption(
+                'timezone',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'set the logging timezone'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        // collate config setting to the end, to avoid partial configuration
+        $toBeSet = [];
+
+        if ($backend = $input->getOption('backend')) {
+            $this->validateBackend($backend);
+            $toBeSet['log_type'] = $backend;
+        }
+
+        $level = $input->getOption('level');
+        if ($level !== null) {
+            if (is_numeric($level)) {
+                $levelNum = $level;
+                // sanity check
+                $this->convertLevelNumber($levelNum);
+            } else {
+                $levelNum = $this->convertLevelString($level);
+            }
+            $toBeSet['loglevel'] = $levelNum;
+        }
+
+        if ($timezone = $input->getOption('timezone')) {
+            $this->validateTimezone($timezone);
+            $toBeSet['logtimezone'] = $timezone;
+        }
+
+        // set config
+        foreach ($toBeSet as $option => $value) {
+            $this->config->setSystemValue($option, $value);
+        }
+
+        // display configuration
+        $backend = $this->config->getSystemValue('log_type', self::DEFAULT_BACKEND);
+        $output->writeln('Enabled logging backend: '.$backend);
+
+        $levelNum = $this->config->getSystemValue('loglevel', self::DEFAULT_LOG_LEVEL);
+        $level = $this->convertLevelNumber($levelNum);
+        $output->writeln('Log level: '.$level.' ('.$levelNum.')');
+
+        $timezone = $this->config->getSystemValue('logtimezone', self::DEFAULT_TIMEZONE);
+        $output->writeln('Log timezone: '.$timezone);
+        return 0;
+    }
+
+    /**
+     * @param string $backend
+     * @throws \InvalidArgumentException
+     */
+    protected function validateBackend($backend) {
+        if (!class_exists('OC\\Log\\'.ucfirst($backend))) {
+            throw new \InvalidArgumentException('Invalid backend');
+        }
+    }
+
+    /**
+     * @param string $timezone
+     * @throws \Exception
+     */
+    protected function validateTimezone($timezone) {
+        new \DateTimeZone($timezone);
+    }
+
+    /**
+     * @param string $level
+     * @return int
+     * @throws \InvalidArgumentException
+     */
+    protected function convertLevelString($level) {
+        $level = strtolower($level);
+        switch ($level) {
+        case 'debug':
+            return 0;
+        case 'info':
+            return 1;
+        case 'warning':
+        case 'warn':
+            return 2;
+        case 'error':
+        case 'err':
+            return 3;
+        case 'fatal':
+            return 4;
+        }
+        throw new \InvalidArgumentException('Invalid log level string');
+    }
+
+    /**
+     * @param int $levelNum
+     * @return string
+     * @throws \InvalidArgumentException
+     */
+    protected function convertLevelNumber($levelNum) {
+        switch ($levelNum) {
+        case 0:
+            return 'Debug';
+        case 1:
+            return 'Info';
+        case 2:
+            return 'Warning';
+        case 3:
+            return 'Error';
+        case 4:
+            return 'Fatal';
+        }
+        throw new \InvalidArgumentException('Invalid log level number');
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        if ($optionName === 'backend') {
+            return ['file', 'syslog', 'errorlog', 'systemd'];
+        } elseif ($optionName === 'level') {
+            return ['debug', 'info', 'warning', 'error', 'fatal'];
+        } elseif ($optionName === 'timezone') {
+            $identifier = \DateTimeZone::listIdentifiers();
+            if ($identifier === false) {
+                return [];
+            }
+            return $identifier;
+        }
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        return [];
+    }
 }