GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Undefined user in passwordsettings by XRevan86

This commit is contained in:
Diogo Cordeiro 2019-04-27 15:15:11 +01:00
parent 6cf674f8f8
commit f6dbf66983
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
actions/passwordsettings.php
View File

@ -28,7 +28,9 @@
* @link http://status.net/ * @link http://status.net/
*/ */
if (!defined('STATUSNET')) { exit(1); } if (!defined('STATUSNET')) {
exit(1);
}
/** /**
* Change password * Change password
@ -40,7 +42,6 @@ if (!defined('STATUSNET')) { exit(1); }
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/ * @link http://status.net/
*/ */
class PasswordsettingsAction extends SettingsAction class PasswordsettingsAction extends SettingsAction
{ {
/** /**
@ -49,7 +50,7 @@ class PasswordsettingsAction extends SettingsAction
* @return string Title of the page * @return string Title of the page
*/ */
function title() public function title()
{ {
// TRANS: Title for page where to change password. // TRANS: Title for page where to change password.
return _m('TITLE', 'Change password'); return _m('TITLE', 'Change password');
@ -58,28 +59,27 @@ class PasswordsettingsAction extends SettingsAction
/** /**
* Instructions for use * Instructions for use
* *
* @return instructions for use * @return string instructions for use
*/ */
function getInstructions() public function getInstructions()
{ {
// TRANS: Instructions for page where to change password. // TRANS: Instructions for page where to change password.
return _('Change your password.'); return _('Change your password.');
} }
function showScripts() public function showScripts()
{ {
parent::showScripts(); parent::showScripts();
$this->autofocus('oldpassword'); $this->autofocus('oldpassword');
} }
function showContent() public function showContent()
{ {
$this->elementStart('form', array('method' => 'POST', $this->elementStart('form', ['method' => 'POST',
'id' => 'form_password', 'id' => 'form_password',
'class' => 'form_settings', 'class' => 'form_settings',
'action' => 'action' => common_local_url('passwordsettings')]);
common_local_url('passwordsettings')));
$this->elementStart('fieldset'); $this->elementStart('fieldset');
// TRANS: Fieldset legend on page where to change password. // TRANS: Fieldset legend on page where to change password.
$this->element('legend', null, _('Password change')); $this->element('legend', null, _('Password change'));
@ -142,11 +142,12 @@ class PasswordsettingsAction extends SettingsAction
} }
} }
if (Event::handle('StartChangePassword', array($this->scoped, $oldpassword, $newpassword))) { if (Event::handle('StartChangePassword', [$this->scoped, $oldpassword, $newpassword])) {
// no handler changed the password, so change the password internally // no handler changed the password, so change the password internally
$user = $this->scoped->getUser();
$user->setPassword($newpassword); $user->setPassword($newpassword);
Event::handle('EndChangePassword', array($this->scoped)); Event::handle('EndChangePassword', [$this->scoped]);
} }
// TRANS: Form validation notice on page where to change password. // TRANS: Form validation notice on page where to change password.