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

Add Settings page class

Browse Source 
[MAILPOET-2200]
This commit is contained in:
Rostislav Wolny
2019-07-15 15:41:16 +02:00
committed by M. Shull
parent 073b88979e
commit 3c87713830
4 changed files with 130 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
lib/AdminPages/Pages/Settings.php Normal file
View File

@ -0,0 +1,124 @@
<?php
namespace MailPoet\AdminPages\Pages;
use MailPoet\AdminPages\PageRenderer;
use MailPoet\Config\Installer;
use MailPoet\Config\ServicesChecker;
use MailPoet\Cron\CronTrigger;
use MailPoet\Features\FeaturesController;
use MailPoet\Models\Segment;
use MailPoet\Models\Subscriber;
use MailPoet\Services\Bridge;
use MailPoet\Settings\Hosts;
use MailPoet\Settings\Pages;
use MailPoet\Settings\SettingsController;
use MailPoet\Util\Installation;
use MailPoet\Util\License\License;
use MailPoet\WooCommerce\Helper as WooCommerceHelper;
use MailPoet\WP\Functions as WPFunctions;
if (!defined('ABSPATH')) exit;
class Settings {
/** @var PageRenderer */
private $page_renderer;
/** @var SettingsController */
private $settings;
/** @var WooCommerceHelper */
private $woocommerce_helper;
/** @var WPFunctions */
private $wp;
/** @var ServicesChecker */
private $services_checker;
/** @var FeaturesController */
private $features_controller;
/** @var Installation */
private $installation;
function __construct(
PageRenderer $page_renderer,
SettingsController $settings,
WooCommerceHelper $woocommerce_helper,
WPFunctions $wp,
ServicesChecker $services_checker,
FeaturesController $features_controller,
Installation $installation
) {
$this->page_renderer = $page_renderer;
$this->settings = $settings;
$this->woocommerce_helper = $woocommerce_helper;
$this->wp = $wp;
$this->services_checker = $services_checker;
$this->features_controller = $features_controller;
$this->installation = $installation;
}
function render() {
$settings = $this->settings->getAll();
$flags = $this->getFlags();
// force MSS key check even if the method isn't active
$mp_api_key_valid = $this->services_checker->isMailPoetAPIKeyValid(false, true);
$data = [
'settings' => $settings,
'segments' => Segment::getSegmentsWithSubscriberCount(),
'cron_trigger' => CronTrigger::getAvailableMethods(),
'total_subscribers' => Subscriber::getTotalSubscribers(),
'premium_plugin_active' => License::getLicense(),
'premium_key_valid' => !empty($this->premium_key_valid),
'mss_active' => Bridge::isMPSendingServiceEnabled(),
'mss_key_valid' => !empty($mp_api_key_valid),
'members_plugin_active' => $this->wp->isPluginActive('members/members.php'),
'pages' => Pages::getAll(),
'flags' => $flags,
'current_user' => $this->wp->wpGetCurrentUser(),
'linux_cron_path' => dirname(dirname(__DIR__)),
'is_woocommerce_active' => $this->woocommerce_helper->isWooCommerceActive(),
'display_revenues' => $this->features_controller->isSupported(FeaturesController::FEATURE_DISPLAY_WOOCOMMERCE_REVENUES),
'ABSPATH' => ABSPATH,
'hosts' => [
'web' => Hosts::getWebHosts(),
'smtp' => Hosts::getSMTPHosts(),
],
];
$data['is_new_user'] = $this->installation->isNewInstallation();
$data = array_merge($data, Installer::getPremiumStatus());
$this->page_renderer->displayPage('settings.html', $data);
}
private function getFlags() {
// flags (available features on WP install)
$flags = [];
if ($this->wp->isMultisite()) {
// get multisite registration option
$registration = $this->wp->applyFilters(
'wpmu_registration_enabled',
$this->wp->getSiteOption('registration', 'all')
);
// check if users can register
$flags['registration_enabled'] =
!(in_array($registration, [
'none',
'blog',
]));
} else {
// check if users can register
$flags['registration_enabled'] =
(bool)$this->wp->getOption('users_can_register', false);
}
return $flags;
}
}

72
lib/Config/Menu.php
View File

@ -5,9 +5,9 @@ namespace MailPoet\Config;
use Carbon\Carbon;
use MailPoet\AdminPages\PageRenderer;
use MailPoet\AdminPages\Pages\Newsletters;
use MailPoet\AdminPages\Pages\Settings;
use MailPoet\AdminPages\Pages\WelcomeWizard;
use MailPoet\Cron\CronHelper;
use MailPoet\Cron\CronTrigger;
use MailPoet\DI\ContainerWrapper;
use MailPoet\Features\FeaturesController;
use MailPoet\Form\Block;
@ -23,7 +23,6 @@ use MailPoet\Models\Subscriber;
use MailPoet\Newsletter\Shortcodes\ShortcodesHelper;
use MailPoet\Router\Endpoints\CronDaemon;
use MailPoet\Services\Bridge;
use MailPoet\Settings\Hosts;
use MailPoet\Settings\Pages;
use MailPoet\Settings\SettingsController;
use MailPoet\Settings\UserFlagsController;
@ -33,7 +32,6 @@ use MailPoet\Tasks\State;
use MailPoet\Util\Installation;
use MailPoet\Util\License\Features\Subscribers as SubscribersFeature;
use MailPoet\Util\License\License;
use MailPoet\WooCommerce\Helper as WooCommerceHelper;
use MailPoet\WP\Readme;
use MailPoet\WP\Functions as WPFunctions;
@ -42,9 +40,6 @@ if (!defined('ABSPATH')) exit;
class Menu {
const MAIN_PAGE_SLUG = 'mailpoet-newsletters';
/** @var WooCommerceHelper */
private $woocommerce_helper;
/** @var Renderer */
public $renderer;
public $mp_api_key_valid;
@ -84,7 +79,6 @@ class Menu {
SettingsController $settings,
FeaturesController $featuresController,
WPFunctions $wp,
WooCommerceHelper $woocommerce_helper,
ServicesChecker $servicesChecker,
UserFlagsController $user_flags,
PageRenderer $page_renderer,
@ -96,7 +90,6 @@ class Menu {
$this->wp = $wp;
$this->settings = $settings;
$this->features_controller = $featuresController;
$this->woocommerce_helper = $woocommerce_helper;
$this->servicesChecker = $servicesChecker;
$this->user_flags = $user_flags;
$this->page_renderer = $page_renderer;
@ -522,45 +515,10 @@ class Menu {
$this->page_renderer->displayPage('premium.html', $data);
}
function settings() {
$settings = $this->settings->getAll();
$flags = $this->_getFlags();
// force MSS key check even if the method isn't active
$mp_api_key_valid = $this->servicesChecker->isMailPoetAPIKeyValid(false, true);
$data = [
'settings' => $settings,
'segments' => Segment::getSegmentsWithSubscriberCount(),
'cron_trigger' => CronTrigger::getAvailableMethods(),
'total_subscribers' => Subscriber::getTotalSubscribers(),
'premium_plugin_active' => License::getLicense(),
'premium_key_valid' => !empty($this->premium_key_valid),
'mss_active' => Bridge::isMPSendingServiceEnabled(),
'mss_key_valid' => !empty($mp_api_key_valid),
'members_plugin_active' => $this->wp->isPluginActive('members/members.php'),
'pages' => Pages::getAll(),
'flags' => $flags,
'current_user' => $this->wp->wpGetCurrentUser(),
'linux_cron_path' => dirname(dirname(__DIR__)),
'is_woocommerce_active' => $this->woocommerce_helper->isWooCommerceActive(),
'display_revenues' => $this->features_controller->isSupported(FeaturesController::FEATURE_DISPLAY_WOOCOMMERCE_REVENUES),
'ABSPATH' => ABSPATH,
'hosts' => [
'web' => Hosts::getWebHosts(),
'smtp' => Hosts::getSMTPHosts(),
],
];
$data['is_new_user'] = $this->installation->isNewInstallation();
$data = array_merge($data, Installer::getPremiumStatus());
$this->page_renderer->displayPage('settings.html', $data);
$this->container->get(Settings::class)->render();
}
function help() {
$tasks_state = new State();
$system_info_data = Beacon::getData();
@ -593,32 +551,6 @@ class Menu {
$this->page_renderer->displayPage('experimental-features.html', []);
}
private function _getFlags() {
// flags (available features on WP install)
$flags = [];
if (is_multisite()) {
// get multisite registration option
$registration = $this->wp->applyFilters(
'wpmu_registration_enabled',
$this->wp->getSiteOption('registration', 'all')
);
// check if users can register
$flags['registration_enabled'] =
!(in_array($registration, [
'none',
'blog',
]));
} else {
// check if users can register
$flags['registration_enabled'] =
(bool)get_option('users_can_register', false);
}
return $flags;
}
function subscribers() {
$data = [];

1
lib/DI/ContainerConfigurator.php
View File

@ -31,6 +31,7 @@ class ContainerConfigurator implements IContainerConfigurator {
// AdminPages
$container->autowire(\MailPoet\AdminPages\PageRenderer::class);
$container->autowire(\MailPoet\AdminPages\Pages\Newsletters::class);
$container->autowire(\MailPoet\AdminPages\Pages\Settings::class);
$container->autowire(\MailPoet\AdminPages\Pages\WelcomeWizard::class);
// Analytics
$container->autowire(\MailPoet\Analytics\Reporter::class)->setPublic(true);

6
tests/integration/Config/MenuTest.php
View File

@ -7,12 +7,12 @@ use MailPoet\AdminPages\PageRenderer;
use MailPoet\Config\AccessControl;
use MailPoet\Config\Menu;
use MailPoet\Config\ServicesChecker;
use MailPoet\DI\ContainerWrapper;
use MailPoet\Features\FeaturesController;
use MailPoet\Listing\PageLimit;
use MailPoet\Settings\SettingsController;
use MailPoet\Settings\UserFlagsController;
use MailPoet\Util\Installation;
use MailPoet\WooCommerce\Helper as WooCommerceHelper;
use MailPoet\WP\Functions as WPFunctions;
class MenuTest extends \MailPoetTest {
@ -97,12 +97,12 @@ class MenuTest extends \MailPoetTest {
$settings,
new FeaturesController(),
$wp,
new WooCommerceHelper($wp),
new ServicesChecker,
new UserFlagsController,
$renderer,
new PageLimit($wp),
new Installation($settings, $wp)
new Installation($settings, $wp),
ContainerWrapper::getInstance()
);
}
}