Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Uses ValidModel to validate rendered newsletter body

Browse Source 
Removes previous validation method
Does not serialize null values
This commit is contained in:
Vlad
2017-07-24 11:15:00 -04:00
parent 81a2ba8e03
commit 4c898b76b2
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Models/SendingQueue.php
View File

@ -12,6 +12,14 @@ class SendingQueue extends Model {
const PRIORITY_MEDIUM = 5;
const PRIORITY_LOW = 10;
function __construct() {
parent::__construct();
$this->addValidations('newsletter_rendered_body', array(
'validRenderedNewsletterBody' => __('Rendered newsletter body is invalid!', 'mailpoet')
));
}
function newsletter() {
return $this->has_one(__NAMESPACE__ . '\Newsletter', 'id', 'newsletter_id');
}
@ -43,10 +51,10 @@ class SendingQueue extends Model {
}
function save() {
if(!is_serialized($this->subscribers)) {
if(!is_serialized($this->subscribers) && !is_null($this->newsletter_rendered_body)) {
$this->set('subscribers', serialize($this->subscribers));
}
if(!is_serialized($this->newsletter_rendered_body)) {
if(!is_serialized($this->newsletter_rendered_body) && !is_null($this->newsletter_rendered_body)) {
$this->set('newsletter_rendered_body', serialize($this->newsletter_rendered_body));
}
// set the default priority to medium
@ -119,11 +127,6 @@ class SendingQueue extends Model {
$this->updateCount();
}
function isRenderedNewsletterBodyValid() {
$newsletter_body = $this->getNewsletterRenderedBody();
return (is_array($newsletter_body) && !empty($newsletter_body['html']) && !empty($newsletter_body['text']));
}
function updateCount() {
$this->subscribers = $this->getSubscribers();
$this->count_processed = count($this->subscribers['processed']);