diff --git a/lib/AdminPages/Pages/SubscribersLimitExceeded.php b/lib/AdminPages/Pages/SubscribersLimitExceeded.php deleted file mode 100644 index 91613d666e..0000000000 --- a/lib/AdminPages/Pages/SubscribersLimitExceeded.php +++ /dev/null @@ -1,21 +0,0 @@ -page_renderer = $page_renderer; - } - - function render() { - $this->page_renderer->displayPage('limit.html', [ - 'limit' => SubscribersFeature::SUBSCRIBERS_LIMIT, - ]); - } -} diff --git a/lib/Config/Menu.php b/lib/Config/Menu.php index c4b991d05d..713069c890 100644 --- a/lib/Config/Menu.php +++ b/lib/Config/Menu.php @@ -18,14 +18,11 @@ use MailPoet\AdminPages\Pages\Subscribers; use MailPoet\AdminPages\Pages\SubscribersAPIKeyInvalid; use MailPoet\AdminPages\Pages\SubscribersExport; use MailPoet\AdminPages\Pages\SubscribersImport; -use MailPoet\AdminPages\Pages\SubscribersLimitExceeded; use MailPoet\AdminPages\Pages\Update; use MailPoet\AdminPages\Pages\WelcomeWizard; use MailPoet\AdminPages\Pages\WooCommerceListImport; use MailPoet\DI\ContainerWrapper; use MailPoet\Features\FeaturesController; -use MailPoet\Settings\SettingsController; -use MailPoet\Util\License\Features\Subscribers as SubscribersFeature; use MailPoet\Util\License\License; use MailPoet\WP\Functions as WPFunctions; @@ -50,8 +47,6 @@ class Menu { /** @var FeaturesController */ private $features_controller; - private $subscribers_over_limit; - function __construct( AccessControl $access_control, WPFunctions $wp, @@ -67,8 +62,6 @@ class Menu { } function init() { - $subscribers_feature = new SubscribersFeature($this->container->get(SettingsController::class)); - $this->subscribers_over_limit = $subscribers_feature->check(); $this->checkMailPoetAPIKey(); $this->checkPremiumKey(); @@ -473,12 +466,10 @@ class Menu { } function forms() { - if ($this->subscribers_over_limit) return $this->displaySubscriberLimitExceeded(); $this->container->get(Forms::class)->render(); } function newsletters() { - if ($this->subscribers_over_limit) return $this->displaySubscriberLimitExceeded(); if (isset($this->mp_api_key_valid) && $this->mp_api_key_valid === false) { return $this->displayMailPoetAPIKeyInvalid(); } @@ -501,11 +492,6 @@ class Menu { $this->container->get(FormEditor::class)->render(); } - private function displaySubscriberLimitExceeded() { - $this->container->get(SubscribersLimitExceeded::class)->render(); - exit; - } - private function displayMailPoetAPIKeyInvalid() { $this->container->get(SubscribersAPIKeyInvalid::class)->render(); exit; diff --git a/lib/DI/ContainerConfigurator.php b/lib/DI/ContainerConfigurator.php index cde8aaf371..21bedfe90e 100644 --- a/lib/DI/ContainerConfigurator.php +++ b/lib/DI/ContainerConfigurator.php @@ -51,7 +51,6 @@ class ContainerConfigurator implements IContainerConfigurator { $container->autowire(\MailPoet\AdminPages\Pages\SubscribersAPIKeyInvalid::class)->setPublic(true); $container->autowire(\MailPoet\AdminPages\Pages\SubscribersExport::class)->setPublic(true); $container->autowire(\MailPoet\AdminPages\Pages\SubscribersImport::class)->setPublic(true); - $container->autowire(\MailPoet\AdminPages\Pages\SubscribersLimitExceeded::class)->setPublic(true); $container->autowire(\MailPoet\AdminPages\Pages\Update::class)->setPublic(true); $container->autowire(\MailPoet\AdminPages\Pages\WelcomeWizard::class)->setPublic(true); $container->autowire(\MailPoet\AdminPages\Pages\WooCommerceListImport::class)->setPublic(true); diff --git a/views/limit.html b/views/limit.html deleted file mode 100644 index ba8f7bd30c..0000000000 --- a/views/limit.html +++ /dev/null @@ -1,33 +0,0 @@ -<% extends 'layout.html' %> - -<% block content %> - -
- <%= __("Our free version is limited to %s subscribers.") | format(number_format_i18n(limit)) %> -
- -