nextcloud / server

apps/settings/lib/Listener/UserRemovedFromGroupActivityListener.php

Indentation +56 added lines, -56 removed lines

@@ -37,60 +37,60 @@
 
 class UserRemovedFromGroupActivityListener implements IEventListener {
 
-	/** @var Manager */
-	private $groupManager;
-
-	/** @var IManager */
-	private $activityManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	public function __construct(
-		Manager $groupManager,
-		IManager $activityManager,
-		IUserSession $userSession
-	) {
-		$this->groupManager = $groupManager;
-		$this->activityManager = $activityManager;
-		$this->userSession = $userSession;
-	}
-
-	public function handle(Event $event): void {
-		if (!($event instanceof UserRemovedEvent)) {
-			return;
-		}
-
-		$user = $event->getUser();
-		$group = $event->getGroup();
-
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		$usersToNotify = $subAdminManager->getGroupsSubAdmins($group);
-		$usersToNotify[] = $user;
-
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('settings')
-			->setType('group_settings');
-
-		$actor = $this->userSession->getUser();
-		if ($actor instanceof IUser) {
-			$event->setAuthor($actor->getUID())
-				->setSubject(GroupProvider::REMOVED_FROM_GROUP, [
-					'user' => $user->getUID(),
-					'group' => $group->getGID(),
-					'actor' => $actor->getUID(),
-				]);
-		} else {
-			$event->setSubject(GroupProvider::REMOVED_FROM_GROUP, [
-				'user' => $user->getUID(),
-				'group' => $group->getGID(),
-			]);
-		}
-
-		foreach ($usersToNotify as $userToNotify) {
-			$event->setAffectedUser($userToNotify->getUID());
-			$this->activityManager->publish($event);
-		}
-	}
+    /** @var Manager */
+    private $groupManager;
+
+    /** @var IManager */
+    private $activityManager;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    public function __construct(
+        Manager $groupManager,
+        IManager $activityManager,
+        IUserSession $userSession
+    ) {
+        $this->groupManager = $groupManager;
+        $this->activityManager = $activityManager;
+        $this->userSession = $userSession;
+    }
+
+    public function handle(Event $event): void {
+        if (!($event instanceof UserRemovedEvent)) {
+            return;
+        }
+
+        $user = $event->getUser();
+        $group = $event->getGroup();
+
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        $usersToNotify = $subAdminManager->getGroupsSubAdmins($group);
+        $usersToNotify[] = $user;
+
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('settings')
+            ->setType('group_settings');
+
+        $actor = $this->userSession->getUser();
+        if ($actor instanceof IUser) {
+            $event->setAuthor($actor->getUID())
+                ->setSubject(GroupProvider::REMOVED_FROM_GROUP, [
+                    'user' => $user->getUID(),
+                    'group' => $group->getGID(),
+                    'actor' => $actor->getUID(),
+                ]);
+        } else {
+            $event->setSubject(GroupProvider::REMOVED_FROM_GROUP, [
+                'user' => $user->getUID(),
+                'group' => $group->getGID(),
+            ]);
+        }
+
+        foreach ($usersToNotify as $userToNotify) {
+            $event->setAffectedUser($userToNotify->getUID());
+            $this->activityManager->publish($event);
+        }
+    }
 }

apps/settings/lib/Listener/UserAddedToGroupActivityListener.php

Indentation +56 added lines, -56 removed lines

@@ -37,60 +37,60 @@
 
 class UserAddedToGroupActivityListener implements IEventListener {
 
-	/** @var Manager */
-	private $groupManager;
-
-	/** @var IManager */
-	private $activityManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	public function __construct(
-		Manager $groupManager,
-		IManager $activityManager,
-		IUserSession $userSession
-	) {
-		$this->groupManager = $groupManager;
-		$this->activityManager = $activityManager;
-		$this->userSession = $userSession;
-	}
-
-	public function handle(Event $event): void {
-		if (!($event instanceof UserAddedEvent)) {
-			return;
-		}
-
-		$user = $event->getUser();
-		$group = $event->getGroup();
-
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		$usersToNotify = $subAdminManager->getGroupsSubAdmins($group);
-		$usersToNotify[] = $user;
-
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('settings')
-			->setType('group_settings');
-
-		$actor = $this->userSession->getUser();
-		if ($actor instanceof IUser) {
-			$event->setAuthor($actor->getUID())
-				->setSubject(GroupProvider::ADDED_TO_GROUP, [
-					'user' => $user->getUID(),
-					'group' => $group->getGID(),
-					'actor' => $actor->getUID(),
-				]);
-		} else {
-			$event->setSubject(GroupProvider::ADDED_TO_GROUP, [
-				'user' => $user->getUID(),
-				'group' => $group->getGID(),
-			]);
-		}
-
-		foreach ($usersToNotify as $userToNotify) {
-			$event->setAffectedUser($userToNotify->getUID());
-			$this->activityManager->publish($event);
-		}
-	}
+    /** @var Manager */
+    private $groupManager;
+
+    /** @var IManager */
+    private $activityManager;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    public function __construct(
+        Manager $groupManager,
+        IManager $activityManager,
+        IUserSession $userSession
+    ) {
+        $this->groupManager = $groupManager;
+        $this->activityManager = $activityManager;
+        $this->userSession = $userSession;
+    }
+
+    public function handle(Event $event): void {
+        if (!($event instanceof UserAddedEvent)) {
+            return;
+        }
+
+        $user = $event->getUser();
+        $group = $event->getGroup();
+
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        $usersToNotify = $subAdminManager->getGroupsSubAdmins($group);
+        $usersToNotify[] = $user;
+
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('settings')
+            ->setType('group_settings');
+
+        $actor = $this->userSession->getUser();
+        if ($actor instanceof IUser) {
+            $event->setAuthor($actor->getUID())
+                ->setSubject(GroupProvider::ADDED_TO_GROUP, [
+                    'user' => $user->getUID(),
+                    'group' => $group->getGID(),
+                    'actor' => $actor->getUID(),
+                ]);
+        } else {
+            $event->setSubject(GroupProvider::ADDED_TO_GROUP, [
+                'user' => $user->getUID(),
+                'group' => $group->getGID(),
+            ]);
+        }
+
+        foreach ($usersToNotify as $userToNotify) {
+            $event->setAffectedUser($userToNotify->getUID());
+            $this->activityManager->publish($event);
+        }
+    }
 }

apps/settings/lib/AppInfo/Application.php

Indentation +92 added lines, -92 removed lines

@@ -60,106 +60,106 @@
 use OCP\Util;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'settings';
+    public const APP_ID = 'settings';
 
-	/**
-	 * @param array $urlParams
-	 */
-	public function __construct(array $urlParams = []) {
-		parent::__construct(self::APP_ID, $urlParams);
-	}
+    /**
+     * @param array $urlParams
+     */
+    public function __construct(array $urlParams = []) {
+        parent::__construct(self::APP_ID, $urlParams);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		// Register Middleware
-		$context->registerServiceAlias('SubadminMiddleware', SubadminMiddleware::class);
-		$context->registerMiddleware(SubadminMiddleware::class);
-		$context->registerSearchProvider(SectionSearch::class);
-		$context->registerSearchProvider(AppSearch::class);
+    public function register(IRegistrationContext $context): void {
+        // Register Middleware
+        $context->registerServiceAlias('SubadminMiddleware', SubadminMiddleware::class);
+        $context->registerMiddleware(SubadminMiddleware::class);
+        $context->registerSearchProvider(SectionSearch::class);
+        $context->registerSearchProvider(AppSearch::class);
 
-		// Register listeners
-		$context->registerEventListener(AppPasswordCreatedEvent::class, AppPasswordCreatedActivityListener::class);
-		$context->registerEventListener(UserAddedEvent::class, UserAddedToGroupActivityListener::class);
-		$context->registerEventListener(UserRemovedEvent::class, UserRemovedFromGroupActivityListener::class);
+        // Register listeners
+        $context->registerEventListener(AppPasswordCreatedEvent::class, AppPasswordCreatedActivityListener::class);
+        $context->registerEventListener(UserAddedEvent::class, UserAddedToGroupActivityListener::class);
+        $context->registerEventListener(UserRemovedEvent::class, UserRemovedFromGroupActivityListener::class);
 
-		/**
-		 * Core class wrappers
-		 */
-		/** FIXME: Remove once OC_User is non-static and mockable */
-		$context->registerService('isAdmin', function () {
-			return \OC_User::isAdminUser(\OC_User::getUser());
-		});
-		/** FIXME: Remove once OC_SubAdmin is non-static and mockable */
-		$context->registerService('isSubAdmin', function () {
-			$userObject = \OC::$server->getUserSession()->getUser();
-			$isSubAdmin = false;
-			if ($userObject !== null) {
-				$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
-			}
-			return $isSubAdmin;
-		});
-		$context->registerService(IProvider::class, function (IAppContainer $appContainer) {
-			/** @var IServerContainer $serverContainer */
-			$serverContainer = $appContainer->query(IServerContainer::class);
-			return $serverContainer->query(IProvider::class);
-		});
-		$context->registerService(IManager::class, function (IAppContainer $appContainer) {
-			/** @var IServerContainer $serverContainer */
-			$serverContainer = $appContainer->query(IServerContainer::class);
-			return $serverContainer->getSettingsManager();
-		});
+        /**
+         * Core class wrappers
+         */
+        /** FIXME: Remove once OC_User is non-static and mockable */
+        $context->registerService('isAdmin', function () {
+            return \OC_User::isAdminUser(\OC_User::getUser());
+        });
+        /** FIXME: Remove once OC_SubAdmin is non-static and mockable */
+        $context->registerService('isSubAdmin', function () {
+            $userObject = \OC::$server->getUserSession()->getUser();
+            $isSubAdmin = false;
+            if ($userObject !== null) {
+                $isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
+            }
+            return $isSubAdmin;
+        });
+        $context->registerService(IProvider::class, function (IAppContainer $appContainer) {
+            /** @var IServerContainer $serverContainer */
+            $serverContainer = $appContainer->query(IServerContainer::class);
+            return $serverContainer->query(IProvider::class);
+        });
+        $context->registerService(IManager::class, function (IAppContainer $appContainer) {
+            /** @var IServerContainer $serverContainer */
+            $serverContainer = $appContainer->query(IServerContainer::class);
+            return $serverContainer->getSettingsManager();
+        });
 
-		$context->registerService(NewUserMailHelper::class, function (IAppContainer $appContainer) {
-			/** @var Server $server */
-			$server = $appContainer->query(IServerContainer::class);
-			/** @var Defaults $defaults */
-			$defaults = $server->query(Defaults::class);
+        $context->registerService(NewUserMailHelper::class, function (IAppContainer $appContainer) {
+            /** @var Server $server */
+            $server = $appContainer->query(IServerContainer::class);
+            /** @var Defaults $defaults */
+            $defaults = $server->query(Defaults::class);
 
-			return new NewUserMailHelper(
-				$defaults,
-				$server->getURLGenerator(),
-				$server->getL10NFactory(),
-				$server->getMailer(),
-				$server->getSecureRandom(),
-				new TimeFactory(),
-				$server->getConfig(),
-				$server->getCrypto(),
-				Util::getDefaultEmailAddress('no-reply')
-			);
-		});
-	}
+            return new NewUserMailHelper(
+                $defaults,
+                $server->getURLGenerator(),
+                $server->getL10NFactory(),
+                $server->getMailer(),
+                $server->getSecureRandom(),
+                new TimeFactory(),
+                $server->getConfig(),
+                $server->getCrypto(),
+                Util::getDefaultEmailAddress('no-reply')
+            );
+        });
+    }
 
-	public function boot(IBootContext $context): void {
-		Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
-		Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
-	}
+    public function boot(IBootContext $context): void {
+        Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
+        Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
+    }
 
-	/**
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 * @throws \Exception
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function onChangePassword(array $parameters) {
-		/** @var Hooks $hooks */
-		$hooks = $this->getContainer()->query(Hooks::class);
-		$hooks->onChangePassword($parameters['uid']);
-	}
+    /**
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     * @throws \Exception
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function onChangePassword(array $parameters) {
+        /** @var Hooks $hooks */
+        $hooks = $this->getContainer()->query(Hooks::class);
+        $hooks->onChangePassword($parameters['uid']);
+    }
 
-	/**
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 * @throws \Exception
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function onChangeInfo(array $parameters) {
-		if ($parameters['feature'] !== 'eMailAddress') {
-			return;
-		}
+    /**
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     * @throws \Exception
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function onChangeInfo(array $parameters) {
+        if ($parameters['feature'] !== 'eMailAddress') {
+            return;
+        }
 
-		/** @var Hooks $hooks */
-		$hooks = $this->getContainer()->query(Hooks::class);
-		$hooks->onChangeEmail($parameters['user'], $parameters['old_value']);
-	}
+        /** @var Hooks $hooks */
+        $hooks = $this->getContainer()->query(Hooks::class);
+        $hooks->onChangeEmail($parameters['user'], $parameters['old_value']);
+    }
 }

apps/settings/lib/Hooks.php

Indentation +172 added lines, -172 removed lines

@@ -40,176 +40,176 @@
 
 class Hooks {
 
-	/** @var IActivityManager */
-	protected $activityManager;
-	/** @var IGroupManager|\OC\Group\Manager */
-	protected $groupManager;
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IUserSession */
-	protected $userSession;
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-	/** @var IMailer */
-	protected $mailer;
-	/** @var IConfig */
-	protected $config;
-	/** @var IFactory */
-	protected $languageFactory;
-
-	public function __construct(IActivityManager $activityManager,
-								IGroupManager $groupManager,
-								IUserManager $userManager,
-								IUserSession $userSession,
-								IURLGenerator $urlGenerator,
-								IMailer $mailer,
-								IConfig $config,
-								IFactory $languageFactory) {
-		$this->activityManager = $activityManager;
-		$this->groupManager = $groupManager;
-		$this->userManager = $userManager;
-		$this->userSession = $userSession;
-		$this->urlGenerator = $urlGenerator;
-		$this->mailer = $mailer;
-		$this->config = $config;
-		$this->languageFactory = $languageFactory;
-	}
-
-	/**
-	 * @param string $uid
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 * @throws \Exception
-	 */
-	public function onChangePassword($uid) {
-		$user = $this->userManager->get($uid);
-
-		if (!$user instanceof IUser || $user->getLastLogin() === 0) {
-			// User didn't login, so don't create activities and emails.
-			return;
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('settings')
-			->setType('personal_settings')
-			->setAffectedUser($user->getUID());
-
-		$instanceUrl = $this->urlGenerator->getAbsoluteURL('/');
-		$language = $this->languageFactory->getUserLanguage($user);
-		$l = $this->languageFactory->get('settings', $language);
-
-		$actor = $this->userSession->getUser();
-		if ($actor instanceof IUser) {
-			if ($actor->getUID() !== $user->getUID()) {
-				// Admin changed the password through the user panel
-				$text = $l->t('%1$s changed your password on %2$s.', [$actor->getDisplayName(), $instanceUrl]);
-				$event->setAuthor($actor->getUID())
-					->setSubject(Provider::PASSWORD_CHANGED_BY, [$actor->getUID()]);
-			} else {
-				// User changed their password themselves through settings
-				$text = $l->t('Your password on %s was changed.', [$instanceUrl]);
-				$event->setAuthor($actor->getUID())
-					->setSubject(Provider::PASSWORD_CHANGED_SELF);
-			}
-		} else {
-			if (\OC::$CLI) {
-				// Admin used occ to reset the password
-				$text = $l->t('Your password on %s was reset by an administrator.', [$instanceUrl]);
-				$event->setSubject(Provider::PASSWORD_RESET);
-			} else {
-				// User reset their password from Lost page
-				$text = $l->t('Your password on %s was reset.', [$instanceUrl]);
-				$event->setSubject(Provider::PASSWORD_RESET_SELF);
-			}
-		}
-
-		$this->activityManager->publish($event);
-
-		if ($user->getEMailAddress() !== null) {
-			$template = $this->mailer->createEMailTemplate('settings.PasswordChanged', [
-				'displayname' => $user->getDisplayName(),
-				'emailAddress' => $user->getEMailAddress(),
-				'instanceUrl' => $instanceUrl,
-			]);
-
-			$template->setSubject($l->t('Password for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
-			$template->addHeader();
-			$template->addHeading($l->t('Password changed for %s', [$user->getDisplayName()]), false);
-			$template->addBodyText($text . ' ' . $l->t('If you did not request this, please contact an administrator.'));
-			$template->addFooter();
-
-
-			$message = $this->mailer->createMessage();
-			$message->setTo([$user->getEMailAddress() => $user->getDisplayName()]);
-			$message->useTemplate($template);
-			$this->mailer->send($message);
-		}
-	}
-
-	/**
-	 * @param IUser $user
-	 * @param string|null $oldMailAddress
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 */
-	public function onChangeEmail(IUser $user, $oldMailAddress) {
-		if ($oldMailAddress === $user->getEMailAddress() ||
-			$user->getLastLogin() === 0) {
-			// Email didn't really change or user didn't login,
-			// so don't create activities and emails.
-			return;
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('settings')
-			->setType('personal_settings')
-			->setAffectedUser($user->getUID());
-
-		$instanceUrl = $this->urlGenerator->getAbsoluteURL('/');
-		$language = $this->languageFactory->getUserLanguage($user);
-		$l = $this->languageFactory->get('settings', $language);
-
-		$actor = $this->userSession->getUser();
-		if ($actor instanceof IUser) {
-			$subject = Provider::EMAIL_CHANGED_SELF;
-			if ($actor->getUID() !== $user->getUID()) {
-				$subject = Provider::EMAIL_CHANGED;
-			}
-			$text = $l->t('Your email address on %s was changed.', [$instanceUrl]);
-			$event->setAuthor($actor->getUID())
-				->setSubject($subject);
-		} else {
-			if ($this->config->getAppValue('settings', 'disable_activity.email_address_changed_by_admin', 'no') === 'yes') {
-				return;
-			}
-			$text = $l->t('Your email address on %s was changed by an administrator.', [$instanceUrl]);
-			$event->setSubject(Provider::EMAIL_CHANGED);
-		}
-		$this->activityManager->publish($event);
-
-
-		if ($oldMailAddress !== null) {
-			$template = $this->mailer->createEMailTemplate('settings.EmailChanged', [
-				'displayname' => $user->getDisplayName(),
-				'newEMailAddress' => $user->getEMailAddress(),
-				'oldEMailAddress' => $oldMailAddress,
-				'instanceUrl' => $instanceUrl,
-			]);
-
-			$template->setSubject($l->t('Email address for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
-			$template->addHeader();
-			$template->addHeading($l->t('Email address changed for %s', [$user->getDisplayName()]), false);
-			$template->addBodyText($text . ' ' . $l->t('If you did not request this, please contact an administrator.'));
-			if ($user->getEMailAddress()) {
-				$template->addBodyText($l->t('The new email address is %s', [$user->getEMailAddress()]));
-			}
-			$template->addFooter();
-
-
-			$message = $this->mailer->createMessage();
-			$message->setTo([$oldMailAddress => $user->getDisplayName()]);
-			$message->useTemplate($template);
-			$this->mailer->send($message);
-		}
-	}
+    /** @var IActivityManager */
+    protected $activityManager;
+    /** @var IGroupManager|\OC\Group\Manager */
+    protected $groupManager;
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var IUserSession */
+    protected $userSession;
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+    /** @var IMailer */
+    protected $mailer;
+    /** @var IConfig */
+    protected $config;
+    /** @var IFactory */
+    protected $languageFactory;
+
+    public function __construct(IActivityManager $activityManager,
+                                IGroupManager $groupManager,
+                                IUserManager $userManager,
+                                IUserSession $userSession,
+                                IURLGenerator $urlGenerator,
+                                IMailer $mailer,
+                                IConfig $config,
+                                IFactory $languageFactory) {
+        $this->activityManager = $activityManager;
+        $this->groupManager = $groupManager;
+        $this->userManager = $userManager;
+        $this->userSession = $userSession;
+        $this->urlGenerator = $urlGenerator;
+        $this->mailer = $mailer;
+        $this->config = $config;
+        $this->languageFactory = $languageFactory;
+    }
+
+    /**
+     * @param string $uid
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     * @throws \Exception
+     */
+    public function onChangePassword($uid) {
+        $user = $this->userManager->get($uid);
+
+        if (!$user instanceof IUser || $user->getLastLogin() === 0) {
+            // User didn't login, so don't create activities and emails.
+            return;
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('settings')
+            ->setType('personal_settings')
+            ->setAffectedUser($user->getUID());
+
+        $instanceUrl = $this->urlGenerator->getAbsoluteURL('/');
+        $language = $this->languageFactory->getUserLanguage($user);
+        $l = $this->languageFactory->get('settings', $language);
+
+        $actor = $this->userSession->getUser();
+        if ($actor instanceof IUser) {
+            if ($actor->getUID() !== $user->getUID()) {
+                // Admin changed the password through the user panel
+                $text = $l->t('%1$s changed your password on %2$s.', [$actor->getDisplayName(), $instanceUrl]);
+                $event->setAuthor($actor->getUID())
+                    ->setSubject(Provider::PASSWORD_CHANGED_BY, [$actor->getUID()]);
+            } else {
+                // User changed their password themselves through settings
+                $text = $l->t('Your password on %s was changed.', [$instanceUrl]);
+                $event->setAuthor($actor->getUID())
+                    ->setSubject(Provider::PASSWORD_CHANGED_SELF);
+            }
+        } else {
+            if (\OC::$CLI) {
+                // Admin used occ to reset the password
+                $text = $l->t('Your password on %s was reset by an administrator.', [$instanceUrl]);
+                $event->setSubject(Provider::PASSWORD_RESET);
+            } else {
+                // User reset their password from Lost page
+                $text = $l->t('Your password on %s was reset.', [$instanceUrl]);
+                $event->setSubject(Provider::PASSWORD_RESET_SELF);
+            }
+        }
+
+        $this->activityManager->publish($event);
+
+        if ($user->getEMailAddress() !== null) {
+            $template = $this->mailer->createEMailTemplate('settings.PasswordChanged', [
+                'displayname' => $user->getDisplayName(),
+                'emailAddress' => $user->getEMailAddress(),
+                'instanceUrl' => $instanceUrl,
+            ]);
+
+            $template->setSubject($l->t('Password for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
+            $template->addHeader();
+            $template->addHeading($l->t('Password changed for %s', [$user->getDisplayName()]), false);
+            $template->addBodyText($text . ' ' . $l->t('If you did not request this, please contact an administrator.'));
+            $template->addFooter();
+
+
+            $message = $this->mailer->createMessage();
+            $message->setTo([$user->getEMailAddress() => $user->getDisplayName()]);
+            $message->useTemplate($template);
+            $this->mailer->send($message);
+        }
+    }
+
+    /**
+     * @param IUser $user
+     * @param string|null $oldMailAddress
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     */
+    public function onChangeEmail(IUser $user, $oldMailAddress) {
+        if ($oldMailAddress === $user->getEMailAddress() ||
+            $user->getLastLogin() === 0) {
+            // Email didn't really change or user didn't login,
+            // so don't create activities and emails.
+            return;
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('settings')
+            ->setType('personal_settings')
+            ->setAffectedUser($user->getUID());
+
+        $instanceUrl = $this->urlGenerator->getAbsoluteURL('/');
+        $language = $this->languageFactory->getUserLanguage($user);
+        $l = $this->languageFactory->get('settings', $language);
+
+        $actor = $this->userSession->getUser();
+        if ($actor instanceof IUser) {
+            $subject = Provider::EMAIL_CHANGED_SELF;
+            if ($actor->getUID() !== $user->getUID()) {
+                $subject = Provider::EMAIL_CHANGED;
+            }
+            $text = $l->t('Your email address on %s was changed.', [$instanceUrl]);
+            $event->setAuthor($actor->getUID())
+                ->setSubject($subject);
+        } else {
+            if ($this->config->getAppValue('settings', 'disable_activity.email_address_changed_by_admin', 'no') === 'yes') {
+                return;
+            }
+            $text = $l->t('Your email address on %s was changed by an administrator.', [$instanceUrl]);
+            $event->setSubject(Provider::EMAIL_CHANGED);
+        }
+        $this->activityManager->publish($event);
+
+
+        if ($oldMailAddress !== null) {
+            $template = $this->mailer->createEMailTemplate('settings.EmailChanged', [
+                'displayname' => $user->getDisplayName(),
+                'newEMailAddress' => $user->getEMailAddress(),
+                'oldEMailAddress' => $oldMailAddress,
+                'instanceUrl' => $instanceUrl,
+            ]);
+
+            $template->setSubject($l->t('Email address for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
+            $template->addHeader();
+            $template->addHeading($l->t('Email address changed for %s', [$user->getDisplayName()]), false);
+            $template->addBodyText($text . ' ' . $l->t('If you did not request this, please contact an administrator.'));
+            if ($user->getEMailAddress()) {
+                $template->addBodyText($l->t('The new email address is %s', [$user->getEMailAddress()]));
+            }
+            $template->addFooter();
+
+
+            $message = $this->mailer->createMessage();
+            $message->setTo([$oldMailAddress => $user->getDisplayName()]);
+            $message->useTemplate($template);
+            $this->mailer->send($message);
+        }
+    }
 }