diff --git a/core/parcel_types/DefaultParcelType.php b/core/parcel_types/DefaultParcelType.php index 91157e0..3767c2e 100644 --- a/core/parcel_types/DefaultParcelType.php +++ b/core/parcel_types/DefaultParcelType.php @@ -48,7 +48,9 @@ public function init() 'isNewEntry' => $isNewEntry )); - if($parcelType->validateEntry($entry, $event->params['isNewEntry'])) + $isNew = isset($event->params['isNewEntry']) || isset($event->params['isNewDraft']); + + if($parcelType->validateEntry($entry, $isNew)) { $obj = new Postmaster_TransportModel(array( 'service' => $parcelType->getParcelModel()->service, @@ -199,4 +201,4 @@ public function getEvents() return array(); } -} \ No newline at end of file +} diff --git a/core/services/CraftService.php b/core/services/CraftService.php index 081cc6a..b74a7cb 100644 --- a/core/services/CraftService.php +++ b/core/services/CraftService.php @@ -25,8 +25,16 @@ public function getId() public function send(Postmaster_TransportModel $model) { $emailModel = new EmailModel($model->settings->getAttributes()); - $emailModel->cc = explode(',', $model->settings->cc); - $emailModel->bcc = explode(',', $model->settings->bcc); + + $cc = explode(',', $model->settings->cc); + $emailModel->cc = array_map(function($ele){ + return array('email'=> $ele); + }, $cc); + + $bcc = explode(',', $model->settings->bcc); + $emailModel->bcc = array_map(function($ele){ + return array('email'=> $ele); + }, $bcc); $success = $this->craft()->email->sendEmail($emailModel); @@ -50,4 +58,4 @@ public function getSettingsModelClassName() return '\Craft\Postmaster_ServiceSettingsModel'; } -} \ No newline at end of file +}