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

Move WPHooks methods to WPFunctions

Browse Source
This commit is contained in:
Amine Ben hammou
2019-01-28 19:00:19 +01:00
parent d452cfcae7
commit 8b602bd947
49 changed files with 354 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Config/AccessControl.php
View File

@@ -2,7 +2,7 @@
namespace MailPoet\Config;
use MailPoet\WP\Hooks as WPHooks;
use MailPoet\WP\Functions as WPFunctions;
if(!defined('ABSPATH')) exit;
@@ -24,40 +24,41 @@ class AccessControl {
}
static function getDefaultPermissions() {
$wp = new WPFunctions;
return array(
self::PERMISSION_ACCESS_PLUGIN_ADMIN => WPHooks::applyFilters(
self::PERMISSION_ACCESS_PLUGIN_ADMIN => $wp->applyFilters(
'mailpoet_permission_access_plugin_admin',
array(
'administrator',
'editor'
)
),
self::PERMISSION_MANAGE_SETTINGS => WPHooks::applyFilters(
self::PERMISSION_MANAGE_SETTINGS => $wp->applyFilters(
'mailpoet_permission_manage_settings',
array(
'administrator'
)
),
self::PERMISSION_MANAGE_EMAILS => WPHooks::applyFilters(
self::PERMISSION_MANAGE_EMAILS => $wp->applyFilters(
'mailpoet_permission_manage_emails',
array(
'administrator',
'editor'
)
),
self::PERMISSION_MANAGE_SUBSCRIBERS => WPHooks::applyFilters(
self::PERMISSION_MANAGE_SUBSCRIBERS => $wp->applyFilters(
'mailpoet_permission_manage_subscribers',
array(
'administrator'
)
),
self::PERMISSION_MANAGE_FORMS => WPHooks::applyFilters(
self::PERMISSION_MANAGE_FORMS => $wp->applyFilters(
'mailpoet_permission_manage_forms',
array(
'administrator'
)
),
self::PERMISSION_MANAGE_SEGMENTS => WPHooks::applyFilters(
self::PERMISSION_MANAGE_SEGMENTS => $wp->applyFilters(
'mailpoet_permission_manage_segments',
array(
'administrator'

15
lib/Config/Capabilities.php
View File

@@ -2,17 +2,22 @@
namespace MailPoet\Config;
use MailPoet\WP\Hooks as WPHooks;
use MailPoet\WP\Functions as WPFunctions;
class Capabilities {
const MEMBERS_CAP_GROUP_NAME = 'mailpoet';
private $renderer = null;
private $wp;
function __construct($renderer = null) {
function __construct($renderer = null, WPFunctions $wp = null) {
if($renderer !== null) {
$this->renderer = $renderer;
}
if($wp == null) {
$wp = new WPFunctions;
}
$this->wp = $wp;
}
function init() {
@@ -48,9 +53,9 @@ class Capabilities {
}
function setupMembersCapabilities() {
WPHooks::addAction('admin_enqueue_scripts', array($this, 'enqueueMembersStyles'));
WPHooks::addAction('members_register_cap_groups', array($this, 'registerMembersCapGroup'));
WPHooks::addAction('members_register_caps', array($this, 'registerMembersCapabilities'));
$this->wp->addAction('admin_enqueue_scripts', array($this, 'enqueueMembersStyles'));
$this->wp->addAction('members_register_cap_groups', array($this, 'registerMembersCapGroup'));
$this->wp->addAction('members_register_caps', array($this, 'registerMembersCapabilities'));
}
function enqueueMembersStyles() {

10
lib/Config/Changelog.php
View File

@@ -4,9 +4,15 @@ namespace MailPoet\Config;
use MailPoet\Models\Setting;
use MailPoet\Util\Url;
use MailPoet\WP\Hooks as WPHooks;
use MailPoet\WP\Functions as WPFunctions;
class Changelog {
private $wp;
function __construct() {
$this->wp = new WPFunctions;
}
function init() {
$doing_ajax = (bool)(defined('DOING_AJAX') && DOING_AJAX);
@@ -45,7 +51,7 @@ class Changelog {
// Migration from MP2
$redirect_url = admin_url('admin.php?page=mailpoet-migration');
} else {
$skip_wizard = WPHooks::applyFilters('mailpoet_skip_welcome_wizard', false);
$skip_wizard = $this->wp->applyFilters('mailpoet_skip_welcome_wizard', false);
$redirect_url = $skip_wizard ? null : admin_url('admin.php?page=mailpoet-welcome-wizard');
// ensure there was no MP2 migration (migration resets $version so it must be checked)

20
lib/Config/Shortcodes.php
View File

@@ -7,9 +7,15 @@ use MailPoet\Models\Subscriber;
use MailPoet\Models\SubscriberSegment;
use MailPoet\Newsletter\Url as NewsletterUrl;
use MailPoet\Subscription\Pages;
use MailPoet\WP\Hooks as WPHooks;
use MailPoet\WP\Functions as WPFunctions;
class Shortcodes {
private $wp;
function __construct() {
$this->wp = new WPFunctions;
}
function init() {
// form widget shortcode
add_shortcode('mailpoet_form', array($this, 'formWidget'));
@@ -27,10 +33,10 @@ class Shortcodes {
$this, 'getArchive'
));
WPHooks::addFilter('mailpoet_archive_date', array(
$this->wp->addFilter('mailpoet_archive_date', array(
$this, 'renderArchiveDate'
), 2);
WPHooks::addFilter('mailpoet_archive_subject', array(
$this->wp->addFilter('mailpoet_archive_subject', array(
$this, 'renderArchiveSubject'
), 2, 3);
@@ -86,12 +92,12 @@ class Shortcodes {
$subscriber = Subscriber::getCurrentWPUser();
if(empty($newsletters)) {
return WPHooks::applyFilters(
return $this->wp->applyFilters(
'mailpoet_archive_no_newsletters',
__('Oops! There are no newsletters to display.', 'mailpoet')
);
} else {
$title = WPHooks::applyFilters('mailpoet_archive_title', '');
$title = $this->wp->applyFilters('mailpoet_archive_title', '');
if(!empty($title)) {
$html .= '<h3 class="mailpoet_archive_title">'.$title.'</h3>';
}
@@ -100,10 +106,10 @@ class Shortcodes {
$queue = $newsletter->queue()->findOne();
$html .= '<li>'.
'<span class="mailpoet_archive_date">'.
WPHooks::applyFilters('mailpoet_archive_date', $newsletter).
$this->wp->applyFilters('mailpoet_archive_date', $newsletter).
'</span>
<span class="mailpoet_archive_subject">'.
WPHooks::applyFilters('mailpoet_archive_subject', $newsletter, $subscriber, $queue).
$this->wp->applyFilters('mailpoet_archive_subject', $newsletter, $subscriber, $queue).
'</span>
</li>';
}