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

Convert variable names to camel case

Browse Source 
[MAILPOET-1796]
This commit is contained in:
Jan Jakeš
2020-01-09 15:02:58 +01:00
committed by Jan Jakeš
parent f5da704106
commit 54549ff037
687 changed files with 15890 additions and 15887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
lib/API/JSON/v1/SendingTaskSubscribers.php
View File

@ -32,75 +32,75 @@ class SendingTaskSubscribers extends APIEndpoint {
private $wp;
public function __construct(
Listing\Handler $listing_handler,
Listing\Handler $listingHandler,
SettingsController $settings,
CronHelper $cron_helper,
CronHelper $cronHelper,
WPFunctions $wp
) {
$this->listing_handler = $listing_handler;
$this->listingHandler = $listingHandler;
$this->settings = $settings;
$this->cron_helper = $cron_helper;
$this->cronHelper = $cronHelper;
$this->wp = $wp;
}
public function listing($data = []) {
$newsletter_id = !empty($data['params']['id']) ? (int)$data['params']['id'] : false;
$tasks_ids = SendingQueueModel::select('task_id')
->where('newsletter_id', $newsletter_id)
$newsletterId = !empty($data['params']['id']) ? (int)$data['params']['id'] : false;
$tasksIds = SendingQueueModel::select('task_id')
->where('newsletter_id', $newsletterId)
->findArray();
if (empty($tasks_ids)) {
if (empty($tasksIds)) {
return $this->errorResponse([
APIError::NOT_FOUND => __('This email has not been sent yet.', 'mailpoet'),
]);
}
$data['params']['task_ids'] = array_column($tasks_ids, 'task_id');
$listing_data = $this->listing_handler->get('\MailPoet\Models\ScheduledTaskSubscriber', $data);
$data['params']['task_ids'] = array_column($tasksIds, 'task_id');
$listingData = $this->listingHandler->get('\MailPoet\Models\ScheduledTaskSubscriber', $data);
$items = [];
foreach ($listing_data['items'] as $item) {
foreach ($listingData['items'] as $item) {
$items[] = $item->asArray();
}
return $this->successResponse($items, [
'count' => $listing_data['count'],
'filters' => $listing_data['filters'],
'groups' => $listing_data['groups'],
'count' => $listingData['count'],
'filters' => $listingData['filters'],
'groups' => $listingData['groups'],
'mta_log' => $this->settings->get('mta_log'),
'mta_method' => $this->settings->get('mta.method'),
'cron_accessible' => $this->cron_helper->isDaemonAccessible(),
'cron_accessible' => $this->cronHelper->isDaemonAccessible(),
'current_time' => $this->wp->currentTime('mysql'),
]);
}
public function resend($data = []) {
$task_id = !empty($data['taskId']) ? (int)$data['taskId'] : false;
$subscriber_id = !empty($data['subscriberId']) ? (int)$data['subscriberId'] : false;
$task_subscriber = ScheduledTaskSubscriber::where('task_id', $task_id)
->where('subscriber_id', $subscriber_id)
$taskId = !empty($data['taskId']) ? (int)$data['taskId'] : false;
$subscriberId = !empty($data['subscriberId']) ? (int)$data['subscriberId'] : false;
$taskSubscriber = ScheduledTaskSubscriber::where('task_id', $taskId)
->where('subscriber_id', $subscriberId)
->findOne();
$task = ScheduledTask::findOne($task_id);
$sending_queue = SendingQueueModel::where('task_id', $task_id)->findOne();
$task = ScheduledTask::findOne($taskId);
$sendingQueue = SendingQueueModel::where('task_id', $taskId)->findOne();
if (
!($task instanceof ScheduledTask)
|| !($task_subscriber instanceof ScheduledTaskSubscriber)
|| !($sending_queue instanceof SendingQueueModel)
|| $task_subscriber->failed != 1
|| !($taskSubscriber instanceof ScheduledTaskSubscriber)
|| !($sendingQueue instanceof SendingQueueModel)
|| $taskSubscriber->failed != 1
) {
return $this->errorResponse([
APIError::NOT_FOUND => __('Failed sending task not found!', 'mailpoet'),
]);
}
$newsletter = Newsletter::findOne($sending_queue->newsletter_id);
$newsletter = Newsletter::findOne($sendingQueue->newsletterId);
if (!($newsletter instanceof Newsletter)) {
return $this->errorResponse([
APIError::NOT_FOUND => __('Newsletter not found!', 'mailpoet'),
]);
}
$task_subscriber->error = '';
$task_subscriber->failed = 0;
$task_subscriber->processed = 0;
$task_subscriber->save();
$taskSubscriber->error = '';
$taskSubscriber->failed = 0;
$taskSubscriber->processed = 0;
$taskSubscriber->save();
$task->status = null;
$task->save();