- Corrects code comments

- Resets mailer log on each run
This commit is contained in:
Vlad
2016-11-11 19:02:30 -05:00
parent 90a0061233
commit 57dff5ff00

View File

@@ -2,6 +2,7 @@
namespace MailPoet\Config; namespace MailPoet\Config;
use MailPoet\Cron\CronTrigger; use MailPoet\Cron\CronTrigger;
use MailPoet\Mailer\MailerLog;
use \MailPoet\Models\Segment; use \MailPoet\Models\Segment;
use \MailPoet\Segments\WP; use \MailPoet\Segments\WP;
use \MailPoet\Models\Setting; use \MailPoet\Models\Setting;
@@ -85,26 +86,26 @@ class Populator {
private function createDefaultSettings() { private function createDefaultSettings() {
$current_user = wp_get_current_user(); $current_user = wp_get_current_user();
// set cron trigger option to default method
if(!Setting::getValue(CronTrigger::SETTING_NAME)) { if(!Setting::getValue(CronTrigger::SETTING_NAME)) {
// disable task scheduler (cron) be default
Setting::setValue(CronTrigger::SETTING_NAME, array( Setting::setValue(CronTrigger::SETTING_NAME, array(
'method' => CronTrigger::DEFAULT_METHOD 'method' => CronTrigger::DEFAULT_METHOD
)); ));
} }
// default sender info based on current user // set default sender info based on current user
$sender = array( $sender = array(
'name' => $current_user->display_name, 'name' => $current_user->display_name,
'address' => $current_user->user_email 'address' => $current_user->user_email
); );
// set default from name & address
if(!Setting::getValue('sender')) { if(!Setting::getValue('sender')) {
// default from name & address
Setting::setValue('sender', $sender); Setting::setValue('sender', $sender);
} }
if(!Setting::getValue('signup_confirmation')) {
// enable signup confirmation by default // enable signup confirmation by default
if(!Setting::getValue('signup_confirmation')) {
Setting::setValue('signup_confirmation', array( Setting::setValue('signup_confirmation', array(
'enabled' => true, 'enabled' => true,
'from' => array( 'from' => array(
@@ -115,9 +116,13 @@ class Populator {
)); ));
} }
// set installation date
if(!Setting::getValue('installed_at')) { if(!Setting::getValue('installed_at')) {
Setting::setValue('installed_at', date("Y-m-d H:i:s")); Setting::setValue('installed_at', date("Y-m-d H:i:s"));
} }
// reset mailer log
MailerLog::resetMailerLog();
} }
private function createDefaultSegments() { private function createDefaultSegments() {