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

Refactor checking settings change into separate method

Browse Source 
[MAILPOET-2079]
This commit is contained in:
Ján Mikláš
2019-05-21 15:02:31 +02:00
committed by M. Shull
parent a55d2fc69f
commit 54527ecfb4
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/API/JSON/v1/Settings.php
View File

@ -40,17 +40,15 @@ class Settings extends APIEndpoint {
WPFunctions::get()->__('You have not specified any settings to be saved.', 'mailpoet'), WPFunctions::get()->__('You have not specified any settings to be saved.', 'mailpoet'),
]); ]);
} else { } else {
$original_inactivation_interval = (int)$this->settings->get('deactivate_subscriber_after_inactive_days'); $old_settings = $this->settings->getAll();
// Will be uncommented on task [MAILPOET-1998] // Will be uncommented on task [MAILPOET-1998]
// $signup_confirmation = $this->settings->get('signup_confirmation.enabled'); // $signup_confirmation = $this->settings->get('signup_confirmation.enabled');
foreach ($settings as $name => $value) { foreach ($settings as $name => $value) {
$this->settings->set($name, $value); $this->settings->set($name, $value);
} }
if (isset($settings['deactivate_subscriber_after_inactive_days'])
&& $original_inactivation_interval !== (int)$settings['deactivate_subscriber_after_inactive_days'] $this->onSettingsChange($old_settings, $this->settings->getAll());
) {
$this->onInactiveSubscribersIntervalChange();
}
$bridge = new Bridge(); $bridge = new Bridge();
$bridge->onSettingsSave($settings); $bridge->onSettingsSave($settings);
// Will be uncommented on task [MAILPOET-1998] // Will be uncommented on task [MAILPOET-1998]
@ -61,6 +59,15 @@ class Settings extends APIEndpoint {
} }
} }
private function onSettingsChange($old_settings, $new_settings) {
// Recalculate inactive subscribers
$old_inactivation_interval = $old_settings['deactivate_subscriber_after_inactive_days'];
$new_inactivation_interval = $new_settings['deactivate_subscriber_after_inactive_days'];
if ($old_inactivation_interval !== $new_inactivation_interval) {
$this->onInactiveSubscribersIntervalChange();
}
}
private function onInactiveSubscribersIntervalChange() { private function onInactiveSubscribersIntervalChange() {
$task = ScheduledTask::where('type', InactiveSubscribers::TASK_TYPE) $task = ScheduledTask::where('type', InactiveSubscribers::TASK_TYPE)
->whereRaw('status = ?', [ScheduledTask::STATUS_SCHEDULED]) ->whereRaw('status = ?', [ScheduledTask::STATUS_SCHEDULED])