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

- Addresses issues identified during code review

Browse Source
This commit is contained in:
Vlad
2016-01-06 19:19:06 -05:00
parent f1bf2bb097
commit 0dbe04c3f8
29 changed files with 493 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/Router/Cron.php
View File

@ -1,8 +1,10 @@
<?php
namespace MailPoet\Router;
use Carbon\Carbon;
use MailPoet\Cron\Daemon;
use MailPoet\Cron\Supervisor;
use MailPoet\Models\Setting;
if(!defined('ABSPATH')) exit;
@ -19,13 +21,12 @@ class Cron {
function stop() {
$daemon = new Daemon();
if(!$daemon->daemon ||
$daemon->daemonData['status'] !== 'started'
$daemon->daemon['status'] !== 'started'
) {
$result = false;
} else {
$daemon->daemonData['status'] = 'stopping';
$daemon->daemon->value = json_encode($daemon->daemonData);
$result = $daemon->daemon->save();
$daemon->daemon['status'] = 'stopping';
$result = $daemon->saveDaemon($daemon->daemon);
}
wp_send_json(
array(
@ -35,7 +36,28 @@ class Cron {
}
function getStatus() {
$daemon = new \MailPoet\Cron\BootStrapMenu();
wp_send_json($daemon->bootStrap());
$daemon = Setting::where('name', 'cron_daemon')
->findOne();
wp_send_json(
($daemon) ?
array_merge(
array(
'timeSinceStart' =>
Carbon::createFromFormat(
'Y-m-d H:i:s',
$daemon->created_at,
'UTC'
)->diffForHumans(),
'timeSinceUpdate' =>
Carbon::createFromFormat(
'Y-m-d H:i:s',
$daemon->updated_at,
'UTC'
)->diffForHumans()
),
unserialize($daemon->value)
) :
"false"
);
}
}

6
lib/Router/Newsletters.php
View File

@ -188,12 +188,12 @@ class Newsletters {
));
}
// TO REMOVE once we add the columns from/reply_to
// TODO: TO REMOVE once we add the columns from/reply_to
$newsletter = array_merge($newsletter, $data['newsletter']);
// END - TO REMOVE
$renderer = new Renderer(json_decode($newsletter['body'], true));
$newsletter['body']['html'] = $renderer->renderAll();
$newsletter['body']['html'] = $renderer->render();
$newsletter['body']['text'] = '';
$subscribers = Subscriber::find_array();
@ -218,7 +218,7 @@ class Newsletters {
wp_send_json(false);
}
$renderer = new Renderer(json_decode($data['body'], true));
wp_send_json(array('rendered_body' => $renderer->renderAll()));
wp_send_json(array('rendered_body' => $renderer->render()));
}
function listing($data = array()) {