Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-02 22:17:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Deprecate Account->Login() and Account->Password()

Browse source
This commit is contained in:
the-djmaze 2022-12-08 10:35:20 +01:00
parent 6af4ead706
commit 682af34d53
8 changed files with 25 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/change-password/drivers/ldap.php
View file

@ -64,11 +64,11 @@ class ChangePasswordDriverLDAP
'{email}' => $oAccount->Email(),
'{email:user}' => \MailSo\Base\Utils::GetAccountNameFromEmail($oAccount->Email()),
'{email:domain}' => $sDomain,
'{login}' => $oAccount->Login(),
'{imap:login}' => $oAccount->Login(),
'{login}' => $oAccount->IncLogin(),
'{imap:login}' => $oAccount->IncLogin(),
'{imap:host}' => $oAccount->Domain()->IncHost(),
'{imap:port}' => $oAccount->Domain()->IncPort(),
'{gecos}' => \function_exists('posix_getpwnam') ? \posix_getpwnam($oAccount->Login()) : ''
'{gecos}' => \function_exists('posix_getpwnam') ? \posix_getpwnam($oAccount->IncLogin()) : ''
));
$oCon = \ldap_connect($this->sLdapUri);

2
plugins/change-password/drivers/pdo.php
View file

@ -89,7 +89,7 @@ class ChangePasswordDriverPDO
':newpass' => $encrypt_prefix . \ChangePasswordPlugin::encrypt($encrypt, $sNewPassword),
':domain' => \MailSo\Base\Utils::GetDomainFromEmail($sEmail),
':username' => \MailSo\Base\Utils::GetAccountNameFromEmail($sEmail),
':login_name' => $oAccount->Login()
':login_name' => $oAccount->IncLogin()
);
$sql = $this->oConfig->Get('plugin', 'pdo_sql', '');

2
plugins/change-password/index.php
View file

@ -146,7 +146,7 @@ class ChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
}
$sPrevPassword = $this->jsonParam('PrevPassword');
if ($sPrevPassword !== $oAccount->Password()) {
if ($sPrevPassword !== $oAccount->IncPassword()) {
throw new ClientException(static::CurrentPasswordIncorrect, null, $oActions->StaticI18N('NOTIFICATIONS/CURRENT_PASSWORD_INCORRECT'));
}