Skip to content

lib/private/User: always pass old value to 'triggerChange' in User class, do not change user properties if value has not changed #14566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
leonklingele-work wants to merge 4 commits into from
Closed

lib/private/User: always pass old value to 'triggerChange' in User class, do not change user properties if value has not changed #14566

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8cd34d1
lib/private/User,apps/user_ldap/lib/User: always pass old value to Us…
Mar 6, 2019
edef164
lib/private/User: do not change user properties if value has not changed
Mar 6, 2019
569e280
lib/private/User: add reminder to first change 'enabled' property, th…
Mar 6, 2019
fe9f121
Try to fix unit tests
Apr 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
lib/private/User: do not change user properties if value has not changed
  • Loading branch information
Leon Klingele committed Apr 1, 2019
commit edef164fc70d9f9b1418e49a99da496f4cbf7b1d
17 changes: 8 additions & 9 deletions lib/private/User/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,16 +139,15 @@ public function getDisplayName() {
public function setDisplayName($displayName) {
$displayName = trim($displayName);
$oldDisplayName = $this->getDisplayName();
if ($this->backend->implementsActions(Backend::SET_DISPLAYNAME) && !empty($displayName)) {
if ($this->backend->implementsActions(Backend::SET_DISPLAYNAME) && !empty($displayName) && $displayName !== $oldDisplayName) {
$result = $this->backend->setDisplayName($this->uid, $displayName);
if ($result) {
$this->displayName = $displayName;
$this->triggerChange('displayName', $displayName, $oldDisplayName);
Copy link
Member

@blizzz blizzz Mar 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please check the other places where this hook is triggered:

  • lib/private/User/User.php (remove or adapt?)

Also there is

  • apps/user_ldap/lib/User/User.php

because it is not called externally, but when changes in LDAP were discovered. This cannot be removed, should be adopted. It should not intervene with User:setDisplayName.

Copy link
Author

@leonklingele-work leonklingele-work Mar 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated.

}
return $result !== false;
} else {
return false;
}
return false;
}

/**
Expand All @@ -160,12 +159,12 @@ public function setDisplayName($displayName) {
*/
public function setEMailAddress($mailAddress) {
$oldMailAddress = $this->getEMailAddress();
if($mailAddress === '') {
$this->config->deleteUserValue($this->uid, 'settings', 'email');
} else {
$this->config->setUserValue($this->uid, 'settings', 'email', $mailAddress);
}
if($oldMailAddress !== $mailAddress) {
if($mailAddress === '') {
$this->config->deleteUserValue($this->uid, 'settings', 'email');
} else {
$this->config->setUserValue($this->uid, 'settings', 'email', $mailAddress);
}
$this->triggerChange('eMailAddress', $mailAddress, $oldMailAddress);
}
}
Expand Down Expand Up @@ -408,8 +407,8 @@ public function setQuota($quota) {
$quota = OC_Helper::computerFileSize($quota);
$quota = OC_Helper::humanFileSize($quota);
}
$this->config->setUserValue($this->uid, 'files', 'quota', $quota);
if($quota !== $oldQuota) {
$this->config->setUserValue($this->uid, 'files', 'quota', $quota);
$this->triggerChange('quota', $quota, $oldQuota);
}
}
Expand Down