Ticket #435

inc/classes/BxDolAccount.php

@@ -135,18 +135,20 @@ class BxDolAccount extends BxDol
      */
     public function sendConfirmationEmail($iAccountId = false)
     {
+    	$sName = $this->getDisplayName($iAccountId); 
         $sEmail = $this->getEmail($iAccountId);
 
         $oKey = BxDolKey::getInstance();
         $sConfirmationCode = $oKey->getNewKey(array('account_id' => $iAccountId));
-
         $sConfirmationLink = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=confirm-email') . '&code=' . urlencode($sConfirmationCode);
 
-        $aPlus = array();
-        $aPlus['email'] = $sEmail;
-        $aPlus['conf_code'] = $sConfirmationCode;
-        $aPlus['conf_link'] = $sConfirmationLink;
-        $aPlus['conf_form_link'] = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=confirm-email');
+        $aPlus = array(
+        	'name' => $sName,
+        	'email' => $sEmail,
+        	'conf_code' => $sConfirmationCode,
+        	'conf_link' => $sConfirmationLink,
+        	'conf_form_link' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=confirm-email')
+        );
 
         $aTemplate = BxDolEmailTemplates::getInstance()->parseTemplate('t_Confirmation', $aPlus);
         return $aTemplate && sendMail($sEmail, $aTemplate['Subject'], $aTemplate['Body'], 0, array(), BX_EMAIL_SYSTEM);

modules/boonex/english/data/langs/system/en.xml

@@ -1593,10 +1593,9 @@ If it is not enabled then please consider implement this optimization, since it
 <p>Please refer to content page for more details <a href="{report_url}">here</a>.</p>
 <bx_include_auto:_email_footer.html />]]></string>
 	<string name="_sys_et_txt_body_confirmation"><![CDATA[<bx_include_auto:_email_header.html />
-<p>Hello!</p>
-<p>Please, click email confirmation link:</p>
-<p><a href="{conf_link}">{conf_link}</a></p>
-<p>Thank you.</p>
+<p>Hello, {name}.</p>
+<p>Please verify your email address by clicking on the link below:</p>
+<p><a href="{conf_link}">Verify email address</a></p>
 <bx_include_auto:_email_footer.html />]]></string>
 	<string name="_sys_et_txt_body_delayed_module_uninstall"><![CDATA[<bx_include_auto:_email_header.html />
 <p>Module: <b>{Module}</b></p>

modules/boonex/russian/data/langs/system/ru.xml

@@ -1591,10 +1591,9 @@
 <p>Для получения дополнительной информации, пожалуйста, перейдите на <a href="{report_url}">страницу контента</a>.</p>
 <bx_include_auto:_email_footer.html />]]></string>
 	<string name="_sys_et_txt_body_confirmation"><![CDATA[<bx_include_auto:_email_header.html />
-<p>Привет!</p>
-<p>Пожалуйста, перейдите по ссылке подтверждения имейла:</p>
-<p><a href="{conf_link}">{conf_link}</a></p>
-<p>Спасибо.</p>
+<p>Привет, {name}.</p>
+<p>Пожалуйста, подтвердите ваш имейл, перейдя по ссылке:</p>
+<p><a href="{conf_link}">Подтвердить имейл</a></p>
 <bx_include_auto:_email_footer.html />]]></string>
 	<string name="_sys_et_txt_body_delayed_module_uninstall"><![CDATA[<bx_include_auto:_email_header.html />
 <p>Модуль: <b>{Module}</b></p>