nextcloud / server

apps/settings/lib/AppInfo/Application.php

Indentation +117 added lines, -117 removed lines

@@ -98,133 +98,133 @@
 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);
-		$context->registerSearchProvider(UserSearch::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);
+        $context->registerSearchProvider(UserSearch::class);
 
-		$context->registerConfigLexicon(ConfigLexicon::class);
+        $context->registerConfigLexicon(ConfigLexicon::class);
 
-		// Register listeners
-		$context->registerEventListener(AppPasswordCreatedEvent::class, AppPasswordCreatedActivityListener::class);
-		$context->registerEventListener(UserAddedEvent::class, UserAddedToGroupActivityListener::class);
-		$context->registerEventListener(UserRemovedEvent::class, UserRemovedFromGroupActivityListener::class);
-		$context->registerEventListener(GroupDeletedEvent::class, GroupRemovedListener::class);
-		$context->registerEventListener(PasswordUpdatedEvent::class, Hooks::class);
-		$context->registerEventListener(UserChangedEvent::class, Hooks::class);
+        // Register listeners
+        $context->registerEventListener(AppPasswordCreatedEvent::class, AppPasswordCreatedActivityListener::class);
+        $context->registerEventListener(UserAddedEvent::class, UserAddedToGroupActivityListener::class);
+        $context->registerEventListener(UserRemovedEvent::class, UserRemovedFromGroupActivityListener::class);
+        $context->registerEventListener(GroupDeletedEvent::class, GroupRemovedListener::class);
+        $context->registerEventListener(PasswordUpdatedEvent::class, Hooks::class);
+        $context->registerEventListener(UserChangedEvent::class, Hooks::class);
 
-		// Register Mail Provider listeners
-		$context->registerEventListener(DeclarativeSettingsGetValueEvent::class, MailProviderListener::class);
-		$context->registerEventListener(DeclarativeSettingsSetValueEvent::class, MailProviderListener::class);
+        // Register Mail Provider listeners
+        $context->registerEventListener(DeclarativeSettingsGetValueEvent::class, MailProviderListener::class);
+        $context->registerEventListener(DeclarativeSettingsSetValueEvent::class, MailProviderListener::class);
 
-		// Register well-known handlers
-		$context->registerWellKnownHandler(SecurityTxtHandler::class);
-		$context->registerWellKnownHandler(ChangePasswordHandler::class);
+        // Register well-known handlers
+        $context->registerWellKnownHandler(SecurityTxtHandler::class);
+        $context->registerWellKnownHandler(ChangePasswordHandler::class);
 
-		// Register Settings Form(s)
-		$context->registerDeclarativeSettings(MailProvider::class);
+        // Register Settings Form(s)
+        $context->registerDeclarativeSettings(MailProvider::class);
 
-		/**
-		 * Core class wrappers
-		 */
-		$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
+         */
+        $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')
-			);
-		});
-		$context->registerSetupCheck(AllowedAdminRanges::class);
-		$context->registerSetupCheck(AppDirsWithDifferentOwner::class);
-		$context->registerSetupCheck(BruteForceThrottler::class);
-		$context->registerSetupCheck(CheckUserCertificates::class);
-		$context->registerSetupCheck(CodeIntegrity::class);
-		$context->registerSetupCheck(CronErrors::class);
-		$context->registerSetupCheck(CronInfo::class);
-		$context->registerSetupCheck(DatabaseHasMissingColumns::class);
-		$context->registerSetupCheck(DatabaseHasMissingIndices::class);
-		$context->registerSetupCheck(DatabaseHasMissingPrimaryKeys::class);
-		$context->registerSetupCheck(DatabasePendingBigIntConversions::class);
-		$context->registerSetupCheck(DataDirectoryProtected::class);
-		$context->registerSetupCheck(DebugMode::class);
-		$context->registerSetupCheck(DefaultPhoneRegionSet::class);
-		$context->registerSetupCheck(EmailTestSuccessful::class);
-		$context->registerSetupCheck(FileLocking::class);
-		$context->registerSetupCheck(ForwardedForHeaders::class);
-		$context->registerSetupCheck(HttpsUrlGeneration::class);
-		$context->registerSetupCheck(InternetConnectivity::class);
-		$context->registerSetupCheck(JavaScriptSourceMaps::class);
-		$context->registerSetupCheck(JavaScriptModules::class);
-		$context->registerSetupCheck(LegacySSEKeyFormat::class);
-		$context->registerSetupCheck(MaintenanceWindowStart::class);
-		$context->registerSetupCheck(MemcacheConfigured::class);
-		$context->registerSetupCheck(MimeTypeMigrationAvailable::class);
-		$context->registerSetupCheck(MysqlRowFormat::class);
-		$context->registerSetupCheck(MysqlUnicodeSupport::class);
-		$context->registerSetupCheck(OcxProviders::class);
-		$context->registerSetupCheck(OverwriteCliUrl::class);
-		$context->registerSetupCheck(PhpDefaultCharset::class);
-		$context->registerSetupCheck(PhpDisabledFunctions::class);
-		$context->registerSetupCheck(PhpFreetypeSupport::class);
-		$context->registerSetupCheck(PhpApcuConfig::class);
-		$context->registerSetupCheck(PhpGetEnv::class);
-		// Temporarily disabled $context->registerSetupCheck(PhpMaxFileSize::class);
-		$context->registerSetupCheck(PhpMemoryLimit::class);
-		$context->registerSetupCheck(PhpModules::class);
-		$context->registerSetupCheck(PhpOpcacheSetup::class);
-		$context->registerSetupCheck(PhpOutdated::class);
-		$context->registerSetupCheck(PhpOutputBuffering::class);
-		$context->registerSetupCheck(RandomnessSecure::class);
-		$context->registerSetupCheck(ReadOnlyConfig::class);
-		$context->registerSetupCheck(SecurityHeaders::class);
-		$context->registerSetupCheck(ServerIdConfig::class);
-		$context->registerSetupCheck(SchedulingTableSize::class);
-		$context->registerSetupCheck(SupportedDatabase::class);
-		$context->registerSetupCheck(SystemIs64bit::class);
-		$context->registerSetupCheck(TaskProcessingPickupSpeed::class);
-		$context->registerSetupCheck(TempSpaceAvailable::class);
-		$context->registerSetupCheck(TransactionIsolation::class);
-		$context->registerSetupCheck(PushService::class);
-		$context->registerSetupCheck(WellKnownUrls::class);
-		$context->registerSetupCheck(Woff2Loading::class);
+            return new NewUserMailHelper(
+                $defaults,
+                $server->getURLGenerator(),
+                $server->getL10NFactory(),
+                $server->getMailer(),
+                $server->getSecureRandom(),
+                new TimeFactory(),
+                $server->getConfig(),
+                $server->getCrypto(),
+                Util::getDefaultEmailAddress('no-reply')
+            );
+        });
+        $context->registerSetupCheck(AllowedAdminRanges::class);
+        $context->registerSetupCheck(AppDirsWithDifferentOwner::class);
+        $context->registerSetupCheck(BruteForceThrottler::class);
+        $context->registerSetupCheck(CheckUserCertificates::class);
+        $context->registerSetupCheck(CodeIntegrity::class);
+        $context->registerSetupCheck(CronErrors::class);
+        $context->registerSetupCheck(CronInfo::class);
+        $context->registerSetupCheck(DatabaseHasMissingColumns::class);
+        $context->registerSetupCheck(DatabaseHasMissingIndices::class);
+        $context->registerSetupCheck(DatabaseHasMissingPrimaryKeys::class);
+        $context->registerSetupCheck(DatabasePendingBigIntConversions::class);
+        $context->registerSetupCheck(DataDirectoryProtected::class);
+        $context->registerSetupCheck(DebugMode::class);
+        $context->registerSetupCheck(DefaultPhoneRegionSet::class);
+        $context->registerSetupCheck(EmailTestSuccessful::class);
+        $context->registerSetupCheck(FileLocking::class);
+        $context->registerSetupCheck(ForwardedForHeaders::class);
+        $context->registerSetupCheck(HttpsUrlGeneration::class);
+        $context->registerSetupCheck(InternetConnectivity::class);
+        $context->registerSetupCheck(JavaScriptSourceMaps::class);
+        $context->registerSetupCheck(JavaScriptModules::class);
+        $context->registerSetupCheck(LegacySSEKeyFormat::class);
+        $context->registerSetupCheck(MaintenanceWindowStart::class);
+        $context->registerSetupCheck(MemcacheConfigured::class);
+        $context->registerSetupCheck(MimeTypeMigrationAvailable::class);
+        $context->registerSetupCheck(MysqlRowFormat::class);
+        $context->registerSetupCheck(MysqlUnicodeSupport::class);
+        $context->registerSetupCheck(OcxProviders::class);
+        $context->registerSetupCheck(OverwriteCliUrl::class);
+        $context->registerSetupCheck(PhpDefaultCharset::class);
+        $context->registerSetupCheck(PhpDisabledFunctions::class);
+        $context->registerSetupCheck(PhpFreetypeSupport::class);
+        $context->registerSetupCheck(PhpApcuConfig::class);
+        $context->registerSetupCheck(PhpGetEnv::class);
+        // Temporarily disabled $context->registerSetupCheck(PhpMaxFileSize::class);
+        $context->registerSetupCheck(PhpMemoryLimit::class);
+        $context->registerSetupCheck(PhpModules::class);
+        $context->registerSetupCheck(PhpOpcacheSetup::class);
+        $context->registerSetupCheck(PhpOutdated::class);
+        $context->registerSetupCheck(PhpOutputBuffering::class);
+        $context->registerSetupCheck(RandomnessSecure::class);
+        $context->registerSetupCheck(ReadOnlyConfig::class);
+        $context->registerSetupCheck(SecurityHeaders::class);
+        $context->registerSetupCheck(ServerIdConfig::class);
+        $context->registerSetupCheck(SchedulingTableSize::class);
+        $context->registerSetupCheck(SupportedDatabase::class);
+        $context->registerSetupCheck(SystemIs64bit::class);
+        $context->registerSetupCheck(TaskProcessingPickupSpeed::class);
+        $context->registerSetupCheck(TempSpaceAvailable::class);
+        $context->registerSetupCheck(TransactionIsolation::class);
+        $context->registerSetupCheck(PushService::class);
+        $context->registerSetupCheck(WellKnownUrls::class);
+        $context->registerSetupCheck(Woff2Loading::class);
 
-		$context->registerUserMigrator(AccountMigrator::class);
-	}
+        $context->registerUserMigrator(AccountMigrator::class);
+    }
 
-	public function boot(IBootContext $context): void {
-	}
+    public function boot(IBootContext $context): void {
+    }
 }

apps/settings/lib/Hooks.php

Indentation +162 added lines, -162 removed lines

@@ -29,166 +29,166 @@
  */
 class Hooks implements IEventListener {
 
-	public function __construct(
-		protected IActivityManager $activityManager,
-		protected IGroupManager $groupManager,
-		protected IUserManager $userManager,
-		protected IUserSession $userSession,
-		protected IURLGenerator $urlGenerator,
-		protected IMailer $mailer,
-		protected IConfig $config,
-		protected IFactory $languageFactory,
-		protected Defaults $defaults,
-	) {
-	}
-
-	public function handle(Event $event): void {
-		if ($event instanceof PasswordUpdatedEvent) {
-			$this->onChangePassword($event);
-		}
-		if ($event instanceof UserChangedEvent) {
-			$this->onChangeEmail($event);
-		}
-	}
-
-	public function onChangePassword(PasswordUpdatedEvent $handle): void {
-		$user = $handle->getUser();
-
-		if ($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());
-
-		$instanceName = $this->defaults->getName();
-		$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,
-				'event' => $handle,
-			]);
-
-			$template->setSubject($l->t('Password for %1$s changed on %2$s', [$user->getDisplayName(), $instanceName]));
-			$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);
-		}
-	}
-
-	public function onChangeEmail(UserChangedEvent $handle): void {
-		if ($handle->getFeature() !== 'eMailAddress') {
-			return;
-		}
-
-		$oldMailAddress = $handle->getOldValue();
-		$user = $handle->getUser();
-
-		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());
-
-		$instanceName = $this->defaults->getName();
-		$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()) {
-				// set via the OCS API
-				if ($this->config->getAppValue('settings', 'disable_activity.email_address_changed_by_admin', 'no') === 'yes') {
-					return;
-				}
-				$subject = Provider::EMAIL_CHANGED;
-			}
-			$text = $l->t('Your email address on %s was changed.', [$instanceUrl]);
-			$event->setAuthor($actor->getUID())
-				->setSubject($subject);
-		} else {
-			// set with occ
-			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(), $instanceName]));
-			$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);
-		}
-	}
+    public function __construct(
+        protected IActivityManager $activityManager,
+        protected IGroupManager $groupManager,
+        protected IUserManager $userManager,
+        protected IUserSession $userSession,
+        protected IURLGenerator $urlGenerator,
+        protected IMailer $mailer,
+        protected IConfig $config,
+        protected IFactory $languageFactory,
+        protected Defaults $defaults,
+    ) {
+    }
+
+    public function handle(Event $event): void {
+        if ($event instanceof PasswordUpdatedEvent) {
+            $this->onChangePassword($event);
+        }
+        if ($event instanceof UserChangedEvent) {
+            $this->onChangeEmail($event);
+        }
+    }
+
+    public function onChangePassword(PasswordUpdatedEvent $handle): void {
+        $user = $handle->getUser();
+
+        if ($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());
+
+        $instanceName = $this->defaults->getName();
+        $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,
+                'event' => $handle,
+            ]);
+
+            $template->setSubject($l->t('Password for %1$s changed on %2$s', [$user->getDisplayName(), $instanceName]));
+            $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);
+        }
+    }
+
+    public function onChangeEmail(UserChangedEvent $handle): void {
+        if ($handle->getFeature() !== 'eMailAddress') {
+            return;
+        }
+
+        $oldMailAddress = $handle->getOldValue();
+        $user = $handle->getUser();
+
+        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());
+
+        $instanceName = $this->defaults->getName();
+        $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()) {
+                // set via the OCS API
+                if ($this->config->getAppValue('settings', 'disable_activity.email_address_changed_by_admin', 'no') === 'yes') {
+                    return;
+                }
+                $subject = Provider::EMAIL_CHANGED;
+            }
+            $text = $l->t('Your email address on %s was changed.', [$instanceUrl]);
+            $event->setAuthor($actor->getUID())
+                ->setSubject($subject);
+        } else {
+            // set with occ
+            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(), $instanceName]));
+            $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);
+        }
+    }
 }