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

Rename license key constants and vars, optimize error generation [PREMIUM-4]

Browse Source
This commit is contained in:
Alexey Stoletniy
2017-05-05 18:04:52 +03:00
parent d8e1c76155
commit 787e022382
6 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/API/Endpoints/v1/Services.php
View File

@ -108,7 +108,7 @@ class Services extends APIEndpoint {
case Bridge::PREMIUM_KEY_INVALID: case Bridge::PREMIUM_KEY_INVALID:
$error = __('Your license key is invalid.', 'mailpoet'); $error = __('Your license key is invalid.', 'mailpoet');
break; break;
case Bridge::PREMIUM_KEY_USED: case Bridge::PREMIUM_KEY_ALREADY_USED:
$error = __('Your license key is already used on another site.', 'mailpoet'); $error = __('Your license key is already used on another site.', 'mailpoet');
break; break;
default: default:

36
lib/Config/ServicesChecker.php
View File

@ -16,30 +16,30 @@ class ServicesChecker {
return null; return null;
} }
$result = Setting::getValue(Bridge::API_KEY_STATE_SETTING_NAME); $mss_key = Setting::getValue(Bridge::API_KEY_STATE_SETTING_NAME);
if(empty($result['state']) || $result['state'] == Bridge::MAILPOET_KEY_VALID) { if(empty($mss_key['state']) || $mss_key['state'] == Bridge::MAILPOET_KEY_VALID) {
return true; return true;
} }
if($result['state'] == Bridge::MAILPOET_KEY_INVALID) { if($mss_key['state'] == Bridge::MAILPOET_KEY_INVALID) {
if($display_error_notice) {
$error = Helpers::replaceLinkTags( $error = Helpers::replaceLinkTags(
__('All sending is currently paused! Your key to send with MailPoet is invalid. [link]Visit MailPoet.com to purchase a key[/link]', 'mailpoet'), __('All sending is currently paused! Your key to send with MailPoet is invalid. [link]Visit MailPoet.com to purchase a key[/link]', 'mailpoet'),
'https://account.mailpoet.com?s=' . Subscriber::getTotalSubscribers() 'https://account.mailpoet.com?s=' . Subscriber::getTotalSubscribers()
); );
if($display_error_notice) {
WPNotice::displayError($error); WPNotice::displayError($error);
} }
return false; return false;
} elseif($result['state'] == Bridge::MAILPOET_KEY_EXPIRING } elseif($mss_key['state'] == Bridge::MAILPOET_KEY_EXPIRING
&& !empty($result['data']['expire_at']) && !empty($mss_key['data']['expire_at'])
) { ) {
$date = date('Y-m-d', strtotime($result['data']['expire_at'])); if($display_error_notice) {
$date = date('Y-m-d', strtotime($mss_key['data']['expire_at']));
$error = Helpers::replaceLinkTags( $error = Helpers::replaceLinkTags(
__('Your newsletters are awesome! Don\'t forget to [link]upgrade your MailPoet email plan[/link] by %s to keep sending them to your subscribers.', 'mailpoet'), __('Your newsletters are awesome! Don\'t forget to [link]upgrade your MailPoet email plan[/link] by %s to keep sending them to your subscribers.', 'mailpoet'),
'https://account.mailpoet.com?s=' . Subscriber::getTotalSubscribers() 'https://account.mailpoet.com?s=' . Subscriber::getTotalSubscribers()
); );
$error = sprintf($error, $date); $error = sprintf($error, $date);
if($display_error_notice) {
WPNotice::displayWarning($error); WPNotice::displayWarning($error);
} }
return true; return true;
@ -54,35 +54,35 @@ class ServicesChecker {
} }
$premium_plugin_active = License::getLicense(); $premium_plugin_active = License::getLicense();
$result = Setting::getValue(Bridge::PREMIUM_KEY_STATE_SETTING_NAME); $premium_key = Setting::getValue(Bridge::PREMIUM_KEY_STATE_SETTING_NAME);
if(empty($result['state'])) { if(empty($premium_key['state'])) {
return false; return false;
} }
if($result['state'] == Bridge::PREMIUM_KEY_VALID) { if($premium_key['state'] == Bridge::PREMIUM_KEY_VALID) {
return true; return true;
} }
if($result['state'] == Bridge::PREMIUM_KEY_INVALID if($premium_key['state'] == Bridge::PREMIUM_KEY_INVALID
|| $result['state'] == Bridge::PREMIUM_KEY_USED || $premium_key['state'] == Bridge::PREMIUM_KEY_ALREADY_USED
) { ) {
if($premium_plugin_active && $display_error_notice) {
$error = Helpers::replaceLinkTags( $error = Helpers::replaceLinkTags(
__('Warning! Your License Key is either invalid or expired. [link]Renew your License now[/link] to enjoy automatic updates and Premium support.', 'mailpoet'), __('Warning! Your License Key is either invalid or expired. [link]Renew your License now[/link] to enjoy automatic updates and Premium support.', 'mailpoet'),
'https://account.mailpoet.com' 'https://account.mailpoet.com'
); );
if($premium_plugin_active && $display_error_notice) {
WPNotice::displayError($error); WPNotice::displayError($error);
} }
return false; return false;
} elseif($result['state'] == Bridge::PREMIUM_KEY_EXPIRING } elseif($premium_key['state'] == Bridge::PREMIUM_KEY_EXPIRING
&& !empty($result['data']['expire_at']) && !empty($premium_key['data']['expire_at'])
) { ) {
$date = date('Y-m-d', strtotime($result['data']['expire_at'])); if($premium_plugin_active && $display_error_notice) {
$date = date('Y-m-d', strtotime($premium_key['data']['expire_at']));
$error = Helpers::replaceLinkTags( $error = Helpers::replaceLinkTags(
__('Your License Key is expiring! Don\'t forget to [link]renew your license[/link] by %s to keep enjoying automatic updates and Premium support.', 'mailpoet'), __('Your License Key is expiring! Don\'t forget to [link]renew your license[/link] by %s to keep enjoying automatic updates and Premium support.', 'mailpoet'),
'https://account.mailpoet.com' 'https://account.mailpoet.com'
); );
$error = sprintf($error, $date); $error = sprintf($error, $date);
if($premium_plugin_active && $display_error_notice) {
WPNotice::displayWarning($error); WPNotice::displayWarning($error);
} }
return true; return true;

4
lib/Services/Bridge.php
View File

@ -22,7 +22,7 @@ class Bridge {
const PREMIUM_KEY_VALID = 'valid'; const PREMIUM_KEY_VALID = 'valid';
const PREMIUM_KEY_INVALID = 'invalid'; const PREMIUM_KEY_INVALID = 'invalid';
const PREMIUM_KEY_EXPIRING = 'expiring'; const PREMIUM_KEY_EXPIRING = 'expiring';
const PREMIUM_KEY_USED = 'used'; const PREMIUM_KEY_ALREADY_USED = 'already_used';
const PREMIUM_KEY_CHECK_ERROR = 'check_error'; const PREMIUM_KEY_CHECK_ERROR = 'check_error';
@ -102,7 +102,7 @@ class Bridge {
$state_map = array( $state_map = array(
200 => self::PREMIUM_KEY_VALID, 200 => self::PREMIUM_KEY_VALID,
401 => self::PREMIUM_KEY_INVALID, 401 => self::PREMIUM_KEY_INVALID,
402 => self::PREMIUM_KEY_USED 402 => self::PREMIUM_KEY_ALREADY_USED
); );
$update_settings = false; $update_settings = false;

2
tests/unit/API/Endpoints/v1/ServicesTest.php
View File

@ -103,7 +103,7 @@ class ServicesTest extends MailPoetTest {
function testItRespondsWithErrorIfPremiumKeyIsUsed() { function testItRespondsWithErrorIfPremiumKeyIsUsed() {
$this->services_endpoint->bridge = Stub::make( $this->services_endpoint->bridge = Stub::make(
new Bridge(), new Bridge(),
array('checkPremiumKey' => array('state' => Bridge::PREMIUM_KEY_USED)), array('checkPremiumKey' => array('state' => Bridge::PREMIUM_KEY_ALREADY_USED)),
$this $this
); );
$response = $this->services_endpoint->verifyPremiumKey($this->data); $response = $this->services_endpoint->verifyPremiumKey($this->data);

2
tests/unit/Config/ServicesCheckerTest.php
View File

@ -73,7 +73,7 @@ class ServicesCheckerTest extends MailPoetTest {
Setting::setValue( Setting::setValue(
Bridge::PREMIUM_KEY_STATE_SETTING_NAME, Bridge::PREMIUM_KEY_STATE_SETTING_NAME,
array('state' => Bridge::PREMIUM_KEY_USED) array('state' => Bridge::PREMIUM_KEY_ALREADY_USED)
); );
$result = ServicesChecker::isPremiumKeyValid(); $result = ServicesChecker::isPremiumKeyValid();
expect($result)->false(); expect($result)->false();

2
tests/unit/Services/BridgeTest.php
View File

@ -80,7 +80,7 @@ class BridgeTest extends MailPoetTest {
$result = $this->bridge->checkPremiumKey($this->used_premium_key); $result = $this->bridge->checkPremiumKey($this->used_premium_key);
expect($result)->notEmpty(); expect($result)->notEmpty();
expect($result['state'])->equals(Bridge::PREMIUM_KEY_USED); expect($result['state'])->equals(Bridge::PREMIUM_KEY_ALREADY_USED);
$result = $this->bridge->checkPremiumKey($this->expiring_premium_key); $result = $this->bridge->checkPremiumKey($this->expiring_premium_key);
expect($result)->notEmpty(); expect($result)->notEmpty();