From 08a77315b45821ee50a549cbe7b22e9f2c8444c0 Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Mon, 19 Sep 2022 12:42:44 +0200 Subject: [PATCH] check disable_activity.email_address_changed_by_admin when email is changed by admin via the OCS API Signed-off-by: Julien Veyssier --- apps/settings/lib/Hooks.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/settings/lib/Hooks.php b/apps/settings/lib/Hooks.php index b7b78c49b121f..a5be30be53f30 100644 --- a/apps/settings/lib/Hooks.php +++ b/apps/settings/lib/Hooks.php @@ -178,12 +178,17 @@ public function onChangeEmail(IUser $user, $oldMailAddress) { 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; }