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

- Resolves issues identified by @rafaehlers during testing

Browse Source
This commit is contained in:
Vlad
2016-01-07 22:47:59 -05:00
parent 5c7e11076d
commit 0c73c0fadc
11 changed files with 445 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
lib/Subscribers/ImportExport/BootStrapMenu.php
View File

@ -6,14 +6,16 @@ use MailPoet\Models\Segment;
use MailPoet\Util\Helpers;
class BootStrapMenu {
public $action;
function __construct($action = null) {
$this->action = $action;
}
function getSegments($withConfirmedSubscribers = false) {
function getSegments($with_confirmed_subscribers = false) {
$segments = ($this->action === 'import') ?
Segment::getSegmentsWithSubscriberCount() :
Segment::getSegmentsForExport($withConfirmedSubscribers);
Segment::getSegmentsForExport($with_confirmed_subscribers);
return array_map(function ($segment) {
return array(
'id' => $segment['id'],
@ -29,6 +31,7 @@ class BootStrapMenu {
'first_name' => __('First name'),
'last_name' => __('Last name'),
'status' => __('Status')
// TODO: add additional fiels from MP2
/*
'confirmed_ip' => __('IP address')
'confirmed_at' => __('Subscription date')
@ -36,22 +39,22 @@ class BootStrapMenu {
);
}
function formatSubscriberFields($subscriberFields) {
return array_map(function ($fieldId, $fieldName) {
function formatSubscriberFields($subscriber_fields) {
return array_map(function ($field_id, $field_name) {
return array(
'id' => $fieldId,
'name' => $fieldName,
'type' => ($fieldId === 'confirmed_at') ? 'date' : null,
'id' => $field_id,
'name' => $field_name,
'type' => ($field_id === 'confirmed_at') ? 'date' : null,
'custom' => false
);
}, array_keys($subscriberFields), $subscriberFields);
}, array_keys($subscriber_fields), $subscriber_fields);
}
function getSubscriberCustomFields() {
return CustomField::findArray();
}
function formatSubscriberCustomFields($subscriberCustomFields) {
function formatSubscriberCustomFields($subscriber_custom_fields) {
return array_map(function ($field) {
return array(
'id' => $field['id'],
@ -59,12 +62,12 @@ class BootStrapMenu {
'type' => $field['type'],
'custom' => true
);
}, $subscriberCustomFields);
}, $subscriber_custom_fields);
}
function formatFieldsForSelect2(
$subscriberFields,
$subscriberCustomFields) {
$subscriber_fields,
$subscriber_custom_fields) {
$actions = ($this->action === 'import') ?
array(
array(
@ -93,14 +96,14 @@ class BootStrapMenu {
),
array(
'name' => __('System columns'),
'children' => $this->formatSubscriberFields($subscriberFields)
'children' => $this->formatSubscriberFields($subscriber_fields)
)
);
if($subscriberCustomFields) {
if($subscriber_custom_fields) {
array_push($select2Fields, array(
'name' => __('User columns'),
'children' => $this->formatSubscriberCustomFields(
$subscriberCustomFields
$subscriber_custom_fields
)
));
}
@ -108,28 +111,28 @@ class BootStrapMenu {
}
function bootstrap() {
$subscriberFields = $this->getSubscriberFields();
$subscriberCustomFields = $this->getSubscriberCustomFields();
$subscriber_fields = $this->getSubscriberFields();
$subscriber_custom_fields = $this->getSubscriberCustomFields();
$data['segments'] = json_encode($this->getSegments());
$data['subscriberFieldsSelect2'] = json_encode(
$this->formatFieldsForSelect2(
$subscriberFields,
$subscriberCustomFields
$subscriber_fields,
$subscriber_custom_fields
)
);
if($this->action === 'import') {
$data['subscriberFields'] = json_encode(
array_merge(
$this->formatSubscriberFields($subscriberFields),
$this->formatSubscriberCustomFields($subscriberCustomFields)
$this->formatSubscriberFields($subscriber_fields),
$this->formatSubscriberCustomFields($subscriber_custom_fields)
)
);
$data['maxPostSizeBytes'] = Helpers::getMaxPostSize('bytes');
$data['maxPostSize'] = Helpers::getMaxPostSize();
} else {
$data['segmentsWithConfirmedSubscribers'] =
json_encode($this->getSegments($withConfirmedSubscribers = true));
json_encode($this->getSegments($with_confirmed_subscribers = true));
}
return $data;
}
}
}