Commit 133c9e70 by Denis Chenu

[feature] Allowing 0 in invite/remind survey batch size

parent a47c7a03
...@@ -251,7 +251,7 @@ class sendMailCron extends PluginBase ...@@ -251,7 +251,7 @@ class sendMailCron extends PluginBase
'maxSurveyBatchSize_invite'=>array( 'maxSurveyBatchSize_invite'=>array(
'type'=>'int', 'type'=>'int',
'htmlOptions'=>array( 'htmlOptions'=>array(
'min'=>1, 'min'=>0,
), ),
'label'=>$this->translate->gT("Max email to send for invitation in one batch for this survey."), 'label'=>$this->translate->gT("Max email to send for invitation in one batch for this survey."),
'help'=>$this->translate->gT("The max email setting can not be exceeded."), 'help'=>$this->translate->gT("The max email setting can not be exceeded."),
...@@ -260,7 +260,7 @@ class sendMailCron extends PluginBase ...@@ -260,7 +260,7 @@ class sendMailCron extends PluginBase
'maxSurveyBatchSize_remind'=>array( 'maxSurveyBatchSize_remind'=>array(
'type'=>'int', 'type'=>'int',
'htmlOptions'=>array( 'htmlOptions'=>array(
'min'=>1, 'min'=>0,
), ),
'label'=>$this->translate->gT("Max email to send for reminder in one batch for this survey."), 'label'=>$this->translate->gT("Max email to send for reminder in one batch for this survey."),
'help'=>$this->translate->gT("The max email setting can not be exceeded. Reminders are sent after invitation, using the remainder of sends available."), 'help'=>$this->translate->gT("The max email setting can not be exceeded. Reminders are sent after invitation, using the remainder of sends available."),
...@@ -913,7 +913,7 @@ class sendMailCron extends PluginBase ...@@ -913,7 +913,7 @@ class sendMailCron extends PluginBase
private function stopSendMailAction($aCountMail,$iSurvey,$sType) private function stopSendMailAction($aCountMail,$iSurvey,$sType)
{ {
$maxThisType=$this->getSetting('maxSurveyBatchSize_'.$sType,'survey',$iSurvey,""); $maxThisType=$this->getSetting('maxSurveyBatchSize_'.$sType,'survey',$iSurvey,"");
if( $maxThisType && $aCountMail['sent'] >= $maxThisType){ if( $maxThisType!=='' && $aCountMail['sent'] >= $maxThisType){
$stillToSend=$aCountMail['total']*2-array_sum($aCountMail); $stillToSend=$aCountMail['total']*2-array_sum($aCountMail);
$this->sendMailCronLog("Survey {$iSurvey}, {$sType} survey batch size achieved. {$stillToSend} email to send at next batch.",1); $this->sendMailCronLog("Survey {$iSurvey}, {$sType} survey batch size achieved. {$stillToSend} email to send at next batch.",1);
return true; return true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment