Просмотр исходного кода

#2437 Confirmation email is sent to old email when user changes their email

RomanL 6 лет назад
Родитель
Сommit
e494f69e73

+ 3 - 1
install/sql/system.sql

@@ -226,7 +226,9 @@ INSERT INTO `sys_email_templates` (`Module`, `NameSystem`, `Name`, `Subject`, `B
 ('system', '_sys_et_txt_name_upgrade_modules_failed', 't_UpgradeModulesFailed', '_sys_et_txt_subject_upgrade_modules_failed', '_sys_et_txt_body_upgrade_modules_failed'),
 ('system', '_sys_et_txt_name_upgrade_success', 't_UpgradeSuccess', '_sys_et_txt_subject_upgrade_success', '_sys_et_txt_body_upgrade_success'),
 ('system', '_sys_et_txt_name_upgrade_modules_success', 't_UpgradeModulesSuccess', '_sys_et_txt_subject_upgrade_modules_success', '_sys_et_txt_body_upgrade_modules_success'),
-('system', '_sys_et_txt_name_bg_operation_failed', 't_BgOperationFailed', '_sys_et_txt_subject_bg_operation_failed', '_sys_et_txt_body_bg_operation_failed');
+('system', '_sys_et_txt_name_bg_operation_failed', 't_BgOperationFailed', '_sys_et_txt_subject_bg_operation_failed', '_sys_et_txt_body_bg_operation_failed'),
+('system', '_sys_et_txt_name_account_change_status_activate', 't_ChangeStatusAccountActivate', '_sys_et_txt_subject_account_change_status_activate', '_sys_et_txt_body_account_change_status_activate'),
+('system', '_sys_et_txt_name_account_change_status_suspended', 't_ChangeStatusAccountSuspend', '_sys_et_txt_subject_account_change_status_suspended', '_sys_et_txt_body_account_change_status_suspended');
 
 -- --------------------------------------------------------
 

+ 7 - 4
modules/boonex/accounts/classes/BxAccntGridAdministration.php

@@ -333,13 +333,16 @@ class BxAccntGridAdministration extends BxBaseModProfileGridAdministration
 
         $iAction = BX_PROFILE_ACTION_MANUAL;
         $sMethod = $isChecked ? 'activate' : 'suspend';
-        if(!$oProfile->$sMethod($iAction))
+        if(!$oProfile->$sMethod($iAction, 0 ,false))
             return false;
 
+        sendMailTemplate('t_ChangeStatusAccount' . ucfirst($sMethod), $oProfile->getAccountObject()->id(), $oProfile->id(), array(), BX_EMAIL_SYSTEM);
+        
         $aProfiles = $oProfile->getAccountObject()->getProfiles();
-        foreach($aProfiles as $aProfile)
-            BxDolProfile::getInstance($aProfile['id'])->$sMethod($iAction);
-
+        foreach($aProfiles as $aProfile){
+            BxDolProfile::getInstance($aProfile['id'])->$sMethod($iAction, 0 ,false);
+        }
+        
     	return true;
     }
 

+ 16 - 0
modules/boonex/english/data/langs/system/en.xml

@@ -1985,6 +1985,18 @@ If it is not enabled then please consider implement this optimization, since it
 <p>Your profile is currently suspended.</p>
 <p> </p>
 {email_footer}]]></string>
+  <string name="_sys_et_txt_body_account_change_status_activate">
+    <![CDATA[{email_header}
+<p>Your account and all your related profiles are currently activated.</p>
+<p></p>
+{email_footer}]]>
+  </string>
+  <string name="_sys_et_txt_body_account_change_status_suspended">
+    <![CDATA[{email_header}
+<p>Your account and all your related profiles are currently suspended.</p>
+<p> </p>
+{email_footer}]]>
+  </string>
 	<string name="_sys_et_txt_body_account"><![CDATA[{email_header}
 <p>{account_output}</p>
 {email_footer}]]></string>
@@ -2036,6 +2048,8 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_et_txt_name_profile_change_status_active"><![CDATA[Profile status changed to active]]></string>
 	<string name="_sys_et_txt_name_profile_change_status_pending"><![CDATA[Profile status changed to pending]]></string>
 	<string name="_sys_et_txt_name_profile_change_status_suspended"><![CDATA[Profile status changed to suspended]]></string>
+  <string name="_sys_et_txt_name_account_change_status_active"><![CDATA[Account status changed to active]]></string>
+  <string name="_sys_et_txt_name_account_change_status_suspended"><![CDATA[Account status changed to suspended]]></string>
 	<string name="_sys_et_txt_name_system_account"><![CDATA[New Accounts]]></string>
 	<string name="_sys_et_txt_name_system_pruning"><![CDATA[Pruning result]]></string>
 	<string name="_sys_et_txt_name_upgrade_failed"><![CDATA[Upgrade failed]]></string>
@@ -2055,6 +2069,8 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_et_txt_subject_profile_change_status_active"><![CDATA[Profile activated]]></string>
 	<string name="_sys_et_txt_subject_profile_change_status_pending"><![CDATA[Profile pending review]]></string>
 	<string name="_sys_et_txt_subject_profile_change_status_suspended"><![CDATA[Profile suspended]]></string>
+  <string name="_sys_et_txt_subject_account_change_status_activate"><![CDATA[Account activated]]></string>
+  <string name="_sys_et_txt_subject_account_change_status_suspended"><![CDATA[Account suspended]]></string>
 	<string name="_sys_et_txt_subject_account"><![CDATA[{site_name} {account_count} accounts created yesterday]]></string>
 	<string name="_sys_et_txt_subject_pruning"><![CDATA[{site_name} pruning result]]></string>
 	<string name="_sys_et_txt_subject_upgrade_failed"><![CDATA[{site_name} upgrade failed]]></string>

+ 16 - 0
modules/boonex/russian/data/langs/system/ru.xml

@@ -1975,6 +1975,18 @@
 <p>Ваш профиль заблокирован.</p>
 <p> </p>
 {email_footer}]]></string>
+  <string name="_sys_et_txt_body_account_change_status_activate">
+    <![CDATA[{email_header}
+<p>Ваш аккаунт и все связанные с ним профили активированы.</p>
+<p></p>
+{email_footer}]]>
+  </string>
+  <string name="_sys_et_txt_body_account_change_status_suspended">
+    <![CDATA[{email_header}
+<p>Ваш аккаунт и все связанные с ним профили заблокированы.</p>
+<p> </p>
+{email_footer}]]>
+  </string>
 	<string name="_sys_et_txt_body_account"><![CDATA[{email_header}
 <p>{account_output}</p>
 {email_footer}]]></string>
@@ -2026,6 +2038,8 @@
 	<string name="_sys_et_txt_name_profile_change_status_active"><![CDATA[Статус профиля изменён на Активный]]></string>
 	<string name="_sys_et_txt_name_profile_change_status_pending"><![CDATA[Статус профиля изменён на Ожидающий]]></string>
 	<string name="_sys_et_txt_name_profile_change_status_suspended"><![CDATA[Статус профиля изменён на Заблокированный]]></string>
+  <string name="_sys_et_txt_name_account_change_status_active"><![CDATA[Статус аккаунта изменён на Активный]]></string>
+  <string name="_sys_et_txt_name_account_change_status_suspended"><![CDATA[Статус аккаунта изменён на Заблокированный]]></string>
 	<string name="_sys_et_txt_name_system_account"><![CDATA[Новые аккаунты]]></string>
 	<string name="_sys_et_txt_name_system_pruning"><![CDATA[Результат очистки]]></string>
 	<string name="_sys_et_txt_name_upgrade_failed"><![CDATA[Обновление не удалось]]></string>
@@ -2045,6 +2059,8 @@
 	<string name="_sys_et_txt_subject_profile_change_status_active"><![CDATA[Профиль активирован]]></string>
 	<string name="_sys_et_txt_subject_profile_change_status_pending"><![CDATA[Профиль в ожидании одобрения]]></string>
 	<string name="_sys_et_txt_subject_profile_change_status_suspended"><![CDATA[Профиль заблокирован]]></string>
+  <string name="_sys_et_txt_subject_account_change_status_activate"><![CDATA[Аккаунт активирован]]></string>
+  <string name="_sys_et_txt_subject_account_change_status_suspended"><![CDATA[Аккаунт заблокирован]]></string>
 	<string name="_sys_et_txt_subject_account"><![CDATA[{site_name} - {account_count} аккаунтов, созданных вчера]]></string>
 	<string name="_sys_et_txt_subject_pruning"><![CDATA[{site_name} - результат очистки]]></string>
 	<string name="_sys_et_txt_subject_upgrade_failed"><![CDATA[{site_name} - обновление не удалось]]></string>