From d390ea325e2dbfd87a830cfe40991f58e07a87a1 Mon Sep 17 00:00:00 2001 From: slawkens Date: Sat, 18 Jan 2025 19:12:08 +0100 Subject: [PATCH] Fix exception $account->getName --- system/pages/lostaccount.php | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/system/pages/lostaccount.php b/system/pages/lostaccount.php index d9e1529b..76217a37 100644 --- a/system/pages/lostaccount.php +++ b/system/pages/lostaccount.php @@ -93,7 +93,7 @@ elseif($action == 'sendcode') $newcode = generateRandomString(30, true, false, true); $mailBody = ' You asked to reset your ' . $config['lua']['serverName'] . ' password.
-

Account name: '.$account->getName().'

+

Account ' . (USE_ACCOUNT_NAME ? 'Name' : 'Number') . ' ' .(USE_ACCOUNT_NAME ? $account->getName() : $account->getId()).'


To do so, please click this link:

'.BASE_URL.'/?subtopic=lostaccount&action=checkcode&code='.$newcode.'&character='.urlencode($nick).'

@@ -150,7 +150,7 @@ elseif($action == 'step1' && $action_type == 'reckey') $account_key = $account->getCustomField('key'); if(!empty($account_key)) { - echo 'If you enter right recovery key you will see form to set new e-mail and password to account. To this e-mail will be send your new password and account name.
+ echo 'If you enter right recovery key you will see form to set new e-mail and password to account. To this e-mail will be send your new password and account ' . (USE_ACCOUNT_NAME ? 'Name' : 'Number') . '.
@@ -304,21 +304,22 @@ elseif($action == 'step3') if($config_salt_enabled) $account->setCustomField('salt', $salt); - echo 'Your account name, new password and new e-mail.
+ echo 'Your account ' . (USE_ACCOUNT_NAME ? 'name' : 'number') . ', new password and new e-mail.
Please enter your recovery key
- +
Your account name, new password and new e-mail
Your account ' . (USE_ACCOUNT_NAME ? 'Name' : 'Number') . ', new password and new e-mail
- Account name:     '.$account->getName().'
+ Account ' . (USE_ACCOUNT_NAME ? 'Name' : 'Number') . ':     '.(USE_ACCOUNT_NAME ? $account->getName() : $account->getId()).'
New password:        '.$new_pass.'
New e-mail address: '.$new_email.'
'; + if($account->getCustomField('email_next') < time()) { $mailBody = ' -

Your account name and new password!

+

Your account ' . (USE_ACCOUNT_NAME ? 'name' : 'number') . ' and new password!

Changed password and e-mail to your account in Lost Account Interface on server '.$config['lua']['serverName'].'

-

Account name: '.$account->getName().'

+

Account ' . (USE_ACCOUNT_NAME ? 'Name' : 'Number') . ': '.(USE_ACCOUNT_NAME ? $account->getName() : $account->getId()).'

New password: '.$new_pass.'

E-mail: '.$new_email.' (this e-mail)


@@ -326,7 +327,7 @@ elseif($action == 'step3') if(_mail($account->getCustomField('email'), $config['lua']['serverName']." - New password to your account", $mailBody)) { - echo '
Sent e-mail with your account name and password to new e-mail. You should receive this e-mail in 15 minutes. You can login now with new password!'; + echo '
Sent e-mail with your account ' . (USE_ACCOUNT_NAME ? 'Name' : 'Number') . ' and password to new e-mail. You should receive this e-mail in 15 minutes. You can login now with new password!'; } else { @@ -423,7 +424,7 @@ elseif($action == 'checkcode') - +
Code & account name
Code & account ' . (USE_ACCOUNT_NAME ? 'Name' : 'Number') . '
New password:      
Repeat new password: 
@@ -497,19 +498,19 @@ elseif($action == 'setnewpassword')
Changed password
New password: '.$newpassword.'
- Account name:   (Already on your e-mail)
'; + Account ' . (USE_ACCOUNT_NAME ? 'Name' : 'Number') . ':   (Already on your e-mail)
'; $mailBody = ' -

Your account name and password!

+

Your account ' . (USE_ACCOUNT_NAME ? 'Name' : 'Number') . ' and password!

Changed password to your account in Lost Account Interface on server '.$config['lua']['serverName'].'

-

Account name: '.$account->getName().'

+

Account ' . (USE_ACCOUNT_NAME ? 'Name' : 'Number') . ': '.(USE_ACCOUNT_NAME ? $account->getName() : $account->getId()).'

New password: '.$newpassword.'


It\'s automatic e-mail from OTS Lost Account System. Do not reply!

'; if(_mail($account->getCustomField('email'), $config['lua']['serverName']." - Your new password", $mailBody)) { - echo '
New password work! Sent e-mail with your password and account name. You should receive this e-mail in 15 minutes. You can login now with new password!'; + echo '
New password work! Sent e-mail with your password and account ' . (USE_ACCOUNT_NAME ? 'Name' : 'Number') . '. You should receive this e-mail in 15 minutes. You can login now with new password!'; } else {