upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-16 23:53:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge pull request #5508 from nextcloud/no-activity-before-login

Browse source 
Don't create activities for email and password change before login
This commit is contained in:
blizzz 2017-06-23 12:04:49 +02:00 committed by GitHub
commit d9beeaec90
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
settings/Hooks.php
View file

@ -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;
}