diff options
| author | Julien Veyssier <eneiluj@posteo.net> | 2022-09-19 13:42:44 +0300 |
|---|---|---|
| committer | backportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com> | 2022-10-14 12:18:58 +0300 |
| commit | 65d86fb3c4c7fb311799e07ad05fd3b303b40257 (patch) | |
| tree | 05ded7ea0b5f45f810d6c7ed8d5062d408e75739 | |
| parent | bc555448fbe5faf66d2978065f7be1fd18721efd (diff) | |
check disable_activity.email_address_changed_by_admin when email is changed by admin via the OCS API
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
| -rw-r--r-- | apps/settings/lib/Hooks.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/settings/lib/Hooks.php b/apps/settings/lib/Hooks.php index b7b78c49b12..a5be30be53f 100644 --- a/apps/settings/lib/Hooks.php +++ b/apps/settings/lib/Hooks.php @@ -178,12 +178,17 @@ class Hooks { 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; } |