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

Tweak Sending Service key validation after a code review [MAILPOET-743]

Browse Source 
* Abstract key state to unbound it from the API response codes
* Rename SendingServiceKeyCheck task for clarity
* Add a setter for the API key in the Bridge API class
* Make some smaller fixes
This commit is contained in:
Alexey Stoletniy
2017-01-23 23:40:20 +03:00
parent 425d45a862
commit 98d6f55a6e
13 changed files with 123 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Config/ServicesChecker.php
View File

@@ -15,12 +15,12 @@ class ServicesChecker {
return null;
}
$state = Setting::getValue(Bridge::API_KEY_STATE_SETTING_NAME);
if(empty($state['code']) || $state['code'] == Bridge::MAILPOET_KEY_VALID) {
$result = Setting::getValue(Bridge::API_KEY_STATE_SETTING_NAME);
if(empty($result['state']) || $result['state'] == Bridge::MAILPOET_KEY_VALID) {
return true;
}
if($state['code'] == Bridge::MAILPOET_KEY_INVALID) {
if($result['state'] == Bridge::MAILPOET_KEY_INVALID) {
$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'),
'https://account.mailpoet.com?s=' . Subscriber::getTotalSubscribers()
@@ -29,10 +29,10 @@ class ServicesChecker {
WPNotice::displayError($error);
}
return false;
} elseif($state['code'] == Bridge::MAILPOET_KEY_EXPIRING
&& !empty($state['data']['expire_at'])
} elseif($result['state'] == Bridge::MAILPOET_KEY_EXPIRING
&& !empty($result['data']['expire_at'])
) {
$date = date('Y-m-d', strtotime($state['data']['expire_at']));
$date = date('Y-m-d', strtotime($result['data']['expire_at']));
$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'),
'https://account.mailpoet.com?s=' . Subscriber::getTotalSubscribers()