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

- Capitalizes CONST values

Browse Source
This commit is contained in:
Vlad
2016-04-25 09:42:02 -04:00
parent 5efa9f65c6
commit f624c891ab
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Cron/Workers/Scheduler.php
View File

@ -123,7 +123,7 @@ class Scheduler {
return false; return false;
} }
$wp_user = (array) get_userdata($subscriber->wp_user_id); $wp_user = (array) get_userdata($subscriber->wp_user_id);
if($newsletter->role !== \MailPoet\Newsletter\Scheduler\Scheduler::wp_all_roles if($newsletter->role !== \MailPoet\Newsletter\Scheduler\Scheduler::WORDPRESS_ALL_ROLES
&& !in_array($newsletter->role, $wp_user['roles'])) { && !in_array($newsletter->role, $wp_user['roles'])) {
return false; return false;
} }

14
lib/Newsletter/Scheduler/Scheduler.php
View File

@ -8,19 +8,19 @@ use MailPoet\Models\NewsletterOptionField;
use MailPoet\Models\SendingQueue; use MailPoet\Models\SendingQueue;
class Scheduler { class Scheduler {
const seconds_in_hour = 3600; const SECONDS_IN_HOUR = 3600;
const last_weekday_format = 'L'; const LAST_WEEKDAY_FORMAT = 'L';
const wp_all_roles = 'mailpoet_all'; const WORDPRESS_ALL_ROLES = 'mailpoet_all';
static function postNotification($newsletter_id) { static function postNotification($newsletter_id) {
$newsletter = Newsletter::filter('filterWithOptions') $newsletter = Newsletter::filter('filterWithOptions')
->findOne($newsletter_id) ->findOne($newsletter_id)
->asArray(); ->asArray();
$interval_type = $newsletter['intervalType']; $interval_type = $newsletter['intervalType'];
$hour = (int) $newsletter['timeOfDay'] / self::seconds_in_hour; $hour = (int) $newsletter['timeOfDay'] / self::SECONDS_IN_HOUR;
$week_day = $newsletter['weekDay']; $week_day = $newsletter['weekDay'];
$month_day = $newsletter['monthDay']; $month_day = $newsletter['monthDay'];
$nth_week_day = ($newsletter['nthWeekDay'] === self::last_weekday_format) ? $nth_week_day = ($newsletter['nthWeekDay'] === self::LAST_WEEKDAY_FORMAT) ?
$newsletter['nthWeekDay'] : $newsletter['nthWeekDay'] :
'#' . $newsletter['nthWeekDay']; '#' . $newsletter['nthWeekDay'];
switch($interval_type) { switch($interval_type) {
@ -77,13 +77,13 @@ class Scheduler {
// do not schedule welcome newsletter if roles have not changed // do not schedule welcome newsletter if roles have not changed
$old_role = (array) $old_user_data->roles; $old_role = (array) $old_user_data->roles;
$new_role = (array) $wp_user->roles; $new_role = (array) $wp_user->roles;
if($newsletter['role'] === self::wp_all_roles || if($newsletter['role'] === self::WORDPRESS_ALL_ROLES ||
!array_diff($old_role, $new_role) !array_diff($old_role, $new_role)
) { ) {
continue; continue;
} }
} }
if($newsletter['role'] === self::wp_all_roles || if($newsletter['role'] === self::WORDPRESS_ALL_ROLES ||
in_array($newsletter['role'], $wp_user['roles']) in_array($newsletter['role'], $wp_user['roles'])
) { ) {
self::createSendingQueueEntry($newsletter, $subscriber_id); self::createSendingQueueEntry($newsletter, $subscriber_id);