Merge pull request #2229 from trob/cron-email2

Cron email: add placeholers to ReplyTo; improve testmode infos
Fabrik · Feb 13, 2021 · f044aed · f044aed
2 parents 79889ec + 73bcde2
commit f044aed
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/plugins/fabrik_cron/email/email.php b/plugins/fabrik_cron/email/email.php
@@ -124,11 +124,15 @@ public function process(&$data, &$listModel)
 							}
 
 							$thisSubject = $w->parseMessageForPlaceHolder($subject, $row);
+							$thisReplyTo = $w->parseMessageForPlaceHolder($replyTo, $row);
+							$thisReplyToName = $w->parseMessageForPlaceHolder($replyToName, $row);
 
 							if ($testMode)
 							{
 								$this->app->enqueueMessage($x . ': Would send subject: ' . $thisSubject);
 								$this->app->enqueueMessage($x . ': Would send to: ' . $thisTo);
+								$this->app->enqueueMessage($x . ': Would send Reply to: ' . $thisReplyTo);
+								$this->app->enqueueMessage($x . ': Would send Reply to name: ' . $thisReplyToName);
 							}
 							else
 							{
@@ -142,20 +146,20 @@ public function process(&$data, &$listModel)
 									null,
 									null,
 									null,
-									$replyTo,
-									$replyToName
+									$thisReplyTo,
+									$thisReplyToName
 								);
 
 								if (!$res)
 								{
 									//$this->log .= "\n failed sending to $thisTo";
-									FabrikWorker::log('plg.cron.email.information', 'Failed sending to: ' . $thisTo);
+									FabrikWorker::log('plg.cron.email.information', $row['__pk_val'].' Failed sending to: ' . $thisTo);
 									$failedIds[] = $row['__pk_val'];
 								}
 								else
 								{
 									//$this->log .= "\n sent to $thisTo";
-									FabrikWorker::log('plg.cron.email.information', 'Sent to: ' . $thisTo);
+									FabrikWorker::log('plg.cron.email.information', $row['__pk_val'].' Sent to: ' . $thisTo.' Replyto: '.$thisReplyTo);
 									$sentIds[] = $row['__pk_val'];
 								}
 							}