Ticket #639

inc/classes/BxDolCronAccount.php

@@ -9,23 +9,31 @@
 
 class BxDolCronAccount extends BxDolCron
 {
-    protected function start()
+    protected $_aParseParams;
+
+    public function __construct()
     {
-        set_time_limit(0);
-        ignore_user_abort();
-        ob_start();
+        parent::__construct();
+
+        $this->_aParseParams = array(
+            'site_title' => getParam('site_title')
+        );
     }
 
-    protected function finish()
+    public function processing()
     {
-        $sOutput = ob_get_clean();
-		if(!$sOutput || getParam('enable_notification_account') != 'on')
+        if(getParam('enable_notification_account') != 'on')
+            return;
+
+        set_time_limit(0);
+        ignore_user_abort();
+
+        $this->processNewlyJoined();
+
+        if(empty($this->_aParseParams['account_count']) || empty($this->_aParseParams['account_output']))
 			return;
 
-        $aTemplate = BxDolEmailTemplates::getInstance()->parseTemplate('t_Account', array(
-        	'site_title' => getParam('site_title'),
-        	'account_output' => $sOutput
-        ));
+        $aTemplate = BxDolEmailTemplates::getInstance()->parseTemplate('t_Account', $this->_aParseParams);
         if(empty($aTemplate))
         	return;
 
@@ -58,6 +66,7 @@ class BxDolCronAccount extends BxDolCron
         if(empty($aAccounts) || !is_array($aAccounts))
             return;
 
+        $iAccounts = 0;
         $sAccounts = "";
         foreach($aAccounts as $aAccount) {
         	$oProfile = BxDolProfile::getInstance($aAccount['profile_id']);
@@ -65,21 +74,14 @@ class BxDolCronAccount extends BxDolCron
         	    continue;
 
         	$sAccounts .= _t('_sys_notification_account_link', $oProfile->getUrl(), $oProfile->getDisplayName(), $aAccount['email']);
+        	$iAccounts += 1;
         }
 
         if(!$sAccounts)
             return;
 
-        echo _t('_sys_notification_account', $sAccounts);
-    }
-
-    public function processing()
-    {
-        $this->start();
-
-        $this->processNewlyJoined();
-
-        $this->finish();
+        $this->_aParseParams['account_count'] = $iAccounts;
+        $this->_aParseParams['account_output'] = _t('_sys_notification_account', $sAccounts);
     }
 }
 

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

@@ -1744,7 +1744,7 @@ 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 was Suspended]]></string>
-	<string name="_sys_et_txt_subject_account"><![CDATA[New members joined to {site_name}]]></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>
 	<string name="_sys_et_txt_subject_upgrade_modules_failed"><![CDATA[Modules upgrade failed on {site_name}]]></string>
@@ -2115,7 +2115,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_mobile_status"><![CDATA[Status]]></string>
     <string name="_sys_name"><![CDATA[Name]]></string>
     <string name="_sys_next"><![CDATA[Next]]></string>
-    <string name="_sys_notification_account"><![CDATA[<h3>Newly joined members:</h3><ul>{0}</ul>]]></string>
+    <string name="_sys_notification_account"><![CDATA[<h3>Accounts created in the last 24 hours:</h3><ul>{0}</ul>]]></string>
 	<string name="_sys_notification_account_link"><![CDATA[<li><a href="{0}">{1}</a> ({2})</li>]]></string>
     <string name="_sys_on"><![CDATA[on]]></string>
     <string name="_sys_off"><![CDATA[off]]></string>

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

@@ -1742,7 +1742,7 @@
 	<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"><![CDATA[Новые пользователи на {site_name} сайте]]></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>
 	<string name="_sys_et_txt_subject_upgrade_modules_failed"><![CDATA[Не удалось обновить модули на сайте {site_name}]]></string>
@@ -2113,7 +2113,7 @@
 	<string name="_sys_mobile_status"><![CDATA[Статус]]></string>
     <string name="_sys_name"><![CDATA[Имя]]></string>
     <string name="_sys_next"><![CDATA[Ещё]]></string>
-    <string name="_sys_notification_account"><![CDATA[<h3>Недавно присоединившиеся пользователи:</h3><ul>{0}</ul>]]></string>
+    <string name="_sys_notification_account"><![CDATA[<h3>Аккаунты, созданные за последние 24 часа:</h3><ul>{0}</ul>]]></string>
 	<string name="_sys_notification_account_link"><![CDATA[<li><a href="{0}">{1}</a> ({2})</li>]]></string>
     <string name="_sys_on"><![CDATA[вкл.]]></string>
     <string name="_sys_off"><![CDATA[выкл.]]></string>