diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2017-06-23 12:04:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-23 12:04:49 +0200 |
| commit | d9beeaec90303e909bca574e489817739b9be869 (patch) | |
| tree | 0c3d3af8611bc89b1a2eafb42e0facc604114bee /settings/Hooks.php | |
| parent | c935f1f9cc5421280509eb96ec233e94c1f4ceb8 (diff) | |
| parent | c50cb6ad81e8760709b7b91106ae886b59572379 (diff) | |
| download | nextcloud-server-d9beeaec90303e909bca574e489817739b9be869.tar.gz nextcloud-server-d9beeaec90303e909bca574e489817739b9be869.zip | |
Merge pull request #5508 from nextcloud/no-activity-before-login
Don't create activities for email and password change before login
Diffstat (limited to 'settings/Hooks.php')
| -rw-r--r-- | settings/Hooks.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/settings/Hooks.php b/settings/Hooks.php index daf3a40cf1b..2cc5ce30bbe 100644 --- a/settings/Hooks.php +++ b/settings/Hooks.php @@ -78,7 +78,8 @@ class Hooks { public function onChangePassword($uid) { $user = $this->userManager->get($uid); - if (!$user instanceof IUser || $user->getEMailAddress() === null) { + if (!$user instanceof IUser || $user->getLastLogin() === 0) { + // User didn't login, so don't create activities and emails. return; } @@ -141,8 +142,10 @@ class Hooks { */ public function onChangeEmail(IUser $user, $oldMailAddress) { - if ($oldMailAddress === $user->getEMailAddress()) { - // Email didn't really change, so don't create activities and emails + 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; } |