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

- Replaces model arrays with model objects

Browse Source
This commit is contained in:
Vlad
2016-11-03 20:45:53 -04:00
parent 9f288ae11a
commit 0d32c09df3
5 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Newsletter/Shortcodes/Categories/Date.php
View File

@@ -14,4 +14,4 @@ class Date {
); );
return (isset($actions[$action])) ? $actions[$action] : false; return (isset($actions[$action])) ? $actions[$action] : false;
} }
} }

2
lib/Newsletter/Shortcodes/Categories/Link.php
View File

@@ -125,4 +125,4 @@ class Link {
private static function getShortcode($action) { private static function getShortcode($action) {
return sprintf('[link:%s]', $action); return sprintf('[link:%s]', $action);
} }
} }

9
lib/Newsletter/Shortcodes/Categories/Newsletter.php
View File

@@ -1,9 +1,10 @@
<?php <?php
namespace MailPoet\Newsletter\Shortcodes\Categories; namespace MailPoet\Newsletter\Shortcodes\Categories;
use MailPoet\Models\Newsletter as NewsletterModel; use MailPoet\Models\Newsletter as NewsletterModel;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
require_once( ABSPATH . "wp-includes/pluggable.php" ); require_once(ABSPATH . "wp-includes/pluggable.php");
class Newsletter { class Newsletter {
static function process($action, static function process($action,
@@ -15,7 +16,7 @@ class Newsletter {
) { ) {
switch($action) { switch($action) {
case 'subject': case 'subject':
return ($newsletter) ? $newsletter['subject'] : false; return ($newsletter) ? $newsletter->subject : false;
case 'total': case 'total':
return substr_count($content, 'data-post-id'); return substr_count($content, 'data-post-id');
@@ -27,9 +28,9 @@ class Newsletter {
return ($latest_post) ? $latest_post['post_title'] : false; return ($latest_post) ? $latest_post['post_title'] : false;
case 'number': case 'number':
if($newsletter['type'] !== NewsletterModel::TYPE_NOTIFICATION_HISTORY) return false; if($newsletter->type !== NewsletterModel::TYPE_NOTIFICATION_HISTORY) return false;
$sent_newsletters = $sent_newsletters =
NewsletterModel::where('parent_id', $newsletter['parent_id']) NewsletterModel::where('parent_id', $newsletter->parent_id)
->where('status', NewsletterModel::STATUS_SENT) ->where('status', NewsletterModel::STATUS_SENT)
->count(); ->count();
return ++$sent_newsletters; return ++$sent_newsletters;

15
lib/Newsletter/Shortcodes/Categories/Subscriber.php
View File

@@ -1,5 +1,6 @@
<?php <?php
namespace MailPoet\Newsletter\Shortcodes\Categories; namespace MailPoet\Newsletter\Shortcodes\Categories;
use MailPoet\Models\Subscriber as SubscriberModel; use MailPoet\Models\Subscriber as SubscriberModel;
use MailPoet\Models\SubscriberCustomField; use MailPoet\Models\SubscriberCustomField;
@@ -15,14 +16,14 @@ class Subscriber {
) { ) {
switch($action) { switch($action) {
case 'firstname': case 'firstname':
return ($subscriber) ? $subscriber['first_name'] : $default_value; return ($subscriber) ? $subscriber->first_name : $default_value;
case 'lastname': case 'lastname':
return ($subscriber) ? $subscriber['last_name'] : $default_value; return ($subscriber) ? $subscriber->last_name : $default_value;
case 'email': case 'email':
return ($subscriber) ? $subscriber['email'] : false; return ($subscriber) ? $subscriber->email : false;
case 'displayname': case 'displayname':
if($subscriber && $subscriber['wp_user_id']) { if($subscriber && $subscriber->wp_user_id) {
$wp_user = get_userdata($subscriber['wp_user_id']); $wp_user = get_userdata($subscriber->wp_user_id);
return $wp_user->user_login; return $wp_user->user_login;
} }
return $default_value; return $default_value;
@@ -31,10 +32,10 @@ class Subscriber {
->count(); ->count();
default: default:
if(preg_match('/cf_(\d+)/', $action, $custom_field) && if(preg_match('/cf_(\d+)/', $action, $custom_field) &&
!empty($subscriber['id']) !empty($subscriber->id)
) { ) {
$custom_field = SubscriberCustomField $custom_field = SubscriberCustomField
::where('subscriber_id', $subscriber['id']) ::where('subscriber_id', $subscriber->id)
->where('custom_field_id', $custom_field[1]) ->where('custom_field_id', $custom_field[1])
->findOne(); ->findOne();
return ($custom_field) ? $custom_field->value : false; return ($custom_field) ? $custom_field->value : false;

12
lib/Newsletter/Shortcodes/Shortcodes.php
View File

@@ -12,15 +12,9 @@ class Shortcodes {
$subscriber = false, $subscriber = false,
$queue = false $queue = false
) { ) {
$this->newsletter = (is_object($newsletter)) ? $this->newsletter = $newsletter;
$newsletter->asArray() : $this->subscriber = $subscriber;
$newsletter; $this->queue = $queue;
$this->subscriber = (is_object($subscriber)) ?
$subscriber->asArray() :
$subscriber;
$this->queue = (is_object($queue)) ?
$queue->asArray() :
$queue;
} }
function extract($content, $categories = false) { function extract($content, $categories = false) {