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

Fix indentation issues

Browse Source
This commit is contained in:
Tautvidas Sipavičius
2016-06-30 13:29:23 +03:00
parent 8a9d14319b
commit b7d8d482fe
14 changed files with 97 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Config/Localizer.php
View File

@ -37,7 +37,7 @@ class Localizer {
Env::$plugin_name,
false,
dirname(plugin_basename(Env::$file)) . '/lang/'
);
);
}
function setGlobalRtl() {

2
lib/Config/Widget.php
View File

@ -87,7 +87,7 @@ class Widget {
function setupDependencies() {
wp_enqueue_style('mailpoet_public', Env::$assets_url.'/css/public.css');
wp_enqueue_script('mailpoet_vendor',
wp_enqueue_script('mailpoet_vendor',
Env::$assets_url.'/js/vendor.js',
array(),
Env::$version,

24
lib/Cron/BootStrapMenu.php
View File

@ -14,20 +14,16 @@ class BootStrapMenu {
return ($this->daemon) ?
array_merge(
array(
'timeSinceStart' =>
Carbon::createFromFormat(
'Y-m-d H:i:s',
$this->daemon->created_at,
'UTC'
)
->diffForHumans(),
'timeSinceUpdate' =>
Carbon::createFromFormat(
'Y-m-d H:i:s',
$this->daemon->updated_at,
'UTC'
)
->diffForHumans()
'timeSinceStart' => Carbon::createFromFormat(
'Y-m-d H:i:s',
$this->daemon->created_at,
'UTC'
)->diffForHumans(),
'timeSinceUpdate' => Carbon::createFromFormat(
'Y-m-d H:i:s',
$this->daemon->updated_at,
'UTC'
)->diffForHumans()
),
json_decode($this->daemon->value, true)
) :

20
lib/Form/Renderer.php
View File

@ -53,43 +53,43 @@ class Renderer {
switch($block['type']) {
case 'html':
$html .= Block\Html::render($block);
break;
break;
case 'divider':
$html .= Block\Divider::render();
break;
break;
case 'checkbox':
$html .= Block\Checkbox::render($block);
break;
break;
case 'radio':
$html .= Block\Radio::render($block);
break;
break;
case 'segment':
$html .= Block\Segment::render($block);
break;
break;
case 'date':
$html .= Block\Date::render($block);
break;
break;
case 'select':
$html .= Block\Select::render($block);
break;
break;
case 'text':
$html .= Block\Text::render($block);
break;
break;
case 'textarea':
$html .= Block\Textarea::render($block);
break;
break;
case 'submit':
$html .= Block\Submit::render($block);
break;
break;
}
return $html;
}

4
lib/Models/Model.php
View File

@ -55,7 +55,7 @@ class Model extends \Sudzy\ValidModel {
} else {
$this->setError($e->getMessage());
}
break;
break;
default:
$this->setError($e->getMessage());
}
@ -94,7 +94,7 @@ class Model extends \Sudzy\ValidModel {
static function bulkRestore($orm) {
$model = get_called_class();
return self::bulkAction($orm, function($ids) use($model) {
self::rawExecute(join(' ', array(
self::rawExecute(join(' ', array(
'UPDATE `'.$model::$_table.'`',
'SET `deleted_at` = NULL',
'WHERE `id` IN ('.rtrim(str_repeat('?,', count($ids)), ',').')'

24
lib/Models/Newsletter.php
View File

@ -287,12 +287,20 @@ class Newsletter extends Model {
$orm = $orm
->left_outer_join(
MP_NEWSLETTER_OPTION_TABLE,
array(MP_NEWSLETTERS_TABLE.'.id', '=',
MP_NEWSLETTER_OPTION_TABLE.'.newsletter_id'))
array(
MP_NEWSLETTERS_TABLE.'.id',
'=',
MP_NEWSLETTER_OPTION_TABLE.'.newsletter_id'
)
)
->left_outer_join(
MP_NEWSLETTER_OPTION_FIELDS_TABLE,
array(MP_NEWSLETTER_OPTION_FIELDS_TABLE.'.id','=',
MP_NEWSLETTER_OPTION_TABLE.'.option_field_id'))
array(
MP_NEWSLETTER_OPTION_FIELDS_TABLE.'.id',
'=',
MP_NEWSLETTER_OPTION_TABLE.'.option_field_id'
)
)
->group_by(MP_NEWSLETTERS_TABLE.'.id');
return $orm;
}
@ -346,7 +354,7 @@ class Newsletter extends Model {
->count()
)
));
break;
break;
case self::TYPE_WELCOME:
case self::TYPE_NOTIFICATION:
@ -368,7 +376,7 @@ class Newsletter extends Model {
->count()
)
));
break;
break;
}
$groups[] = array(
@ -394,11 +402,11 @@ class Newsletter extends Model {
$orm
->whereNull('deleted_at')
->filter('filterStatus', $group);
break;
break;
case 'trash':
$orm->whereNotNull('deleted_at');
break;
break;
default:
$orm->whereNull('deleted_at');

38
lib/Models/Subscriber.php
View File

@ -322,12 +322,20 @@ class Subscriber extends Model {
$orm = $orm
->leftOuterJoin(
MP_SUBSCRIBER_CUSTOM_FIELD_TABLE,
array(MP_SUBSCRIBERS_TABLE.'.id', '=',
MP_SUBSCRIBER_CUSTOM_FIELD_TABLE.'.subscriber_id'))
array(
MP_SUBSCRIBERS_TABLE.'.id',
'=',
MP_SUBSCRIBER_CUSTOM_FIELD_TABLE.'.subscriber_id'
)
)
->leftOuterJoin(
MP_CUSTOM_FIELDS_TABLE,
array(MP_CUSTOM_FIELDS_TABLE.'.id','=',
MP_SUBSCRIBER_CUSTOM_FIELD_TABLE.'.custom_field_id'))
array(
MP_CUSTOM_FIELDS_TABLE.'.id',
'=',
MP_SUBSCRIBER_CUSTOM_FIELD_TABLE.'.custom_field_id'
)
)
->groupBy(MP_SUBSCRIBERS_TABLE.'.id');
return $orm;
}
@ -345,12 +353,18 @@ class Subscriber extends Model {
$orm = $orm
->leftOuterJoin(
MP_SUBSCRIBER_CUSTOM_FIELD_TABLE,
array(MP_SUBSCRIBERS_TABLE.'.id', '=',
MP_SUBSCRIBER_CUSTOM_FIELD_TABLE.'.subscriber_id'))
array(
MP_SUBSCRIBERS_TABLE.'.id', '=',
MP_SUBSCRIBER_CUSTOM_FIELD_TABLE.'.subscriber_id'
)
)
->leftOuterJoin(
MP_CUSTOM_FIELDS_TABLE,
array(MP_CUSTOM_FIELDS_TABLE.'.id','=',
MP_SUBSCRIBER_CUSTOM_FIELD_TABLE.'.custom_field_id'));
array(
MP_CUSTOM_FIELDS_TABLE.'.id','=',
MP_SUBSCRIBER_CUSTOM_FIELD_TABLE.'.custom_field_id'
)
);
return $orm;
}
@ -532,7 +546,8 @@ class Subscriber extends Model {
SubscriberSegment::subscribeManyToSegments(
$subscriber_ids, array($segment->id)
);
});
}
);
return array(
'subscribers' => $subscribers_count,
@ -653,8 +668,9 @@ class Subscriber extends Model {
str_repeat(
'(' . rtrim(str_repeat('?,', count($columns)), ',') . ')' . ', '
, count($values)
)
, ', '),
),
', '
),
Helpers::flattenArray($values)
);
}

8
lib/Newsletter/Renderer/Renderer.php
View File

@ -61,16 +61,16 @@ class Renderer {
switch($selector) {
case 'text':
$selector = 'td.mailpoet_paragraph, td.mailpoet_blockquote, li.mailpoet_paragraph';
break;
break;
case 'body':
$selector = 'body, .mailpoet-wrapper';
break;
break;
case 'link':
$selector = '.mailpoet-wrapper a';
break;
break;
case 'wrapper':
$selector = '.mailpoet_content-wrapper';
break;
break;
}
$css .= StylesHelper::setStyle($style, $selector);
}

8
lib/Newsletter/Shortcodes/Categories/Link.php
View File

@ -99,13 +99,13 @@ class Link {
$unsubscribe->track($newsletter['id'], $subscriber['id'], $queue['id']);
}
$url = SubscriptionUrl::getUnsubscribeUrl($subscriber);
break;
break;
case 'subscription_manage_url':
$url = SubscriptionUrl::getManageUrl($subscriber);
break;
break;
case 'newsletter_view_in_browser_url':
$url = NewsletterUrl::getViewInBrowserUrl($newsletter, $subscriber, $queue);
break;
break;
default:
$shortcode = self::getShortcode($shortcode_action);
$url = apply_filters(
@ -116,7 +116,7 @@ class Link {
$queue
);
$url = ($url !== $shortcode_action) ? $url : false;
break;
break;
}
return $url;
}

4
lib/Router/Subscribers.php
View File

@ -124,7 +124,7 @@ class Subscribers {
Url::redirectTo($success_page_url);
}
}
break;
break;
case 'message':
default:
@ -143,7 +143,7 @@ class Subscribers {
Url::redirectBack($params);
}
break;
break;
}
}
}

10
lib/Subscribers/ImportExport/Export/Export.php
View File

@ -179,23 +179,25 @@ class Export {
function getSubscribers($offset, $limit) {
// JOIN subscribers on segment and subscriber_segment tables
$subscribers = Subscriber::
left_outer_join(
$subscribers = Subscriber::left_outer_join(
SubscriberSegment::$_table,
array(
Subscriber::$_table . '.id',
'=',
SubscriberSegment::$_table . '.subscriber_id'
))
)
)
->left_outer_join(
Segment::$_table,
array(
Segment::$_table . '.id',
'=',
SubscriberSegment::$_table . '.segment_id'
))
)
)
->filter('filterWithCustomFieldsForExport')
->groupBy(Subscriber::$_table . '.id');
if($this->subscribers_without_segment !== false) {
// if there are subscribers who do not belong to any segment, use
// a CASE function to group them under "Not In Segment"

9
lib/Subscribers/ImportExport/Import/Import.php
View File

@ -293,11 +293,10 @@ class Import {
);
}
}
$query = Subscriber::selectMany(
array(
'id',
'email'
));
$query = Subscriber::selectMany(array(
'id',
'email'
));
$query = ($action === 'update') ?
$query->where('updated_at', $this->updated_at) :
$query->where('created_at', $this->created_at);

6
lib/Subscription/Pages.php
View File

@ -114,13 +114,13 @@ class Pages {
switch($this->action) {
case 'confirm':
$content = $this->getConfirmContent();
break;
break;
case 'manage':
$content = $this->getManageContent();
break;
break;
case 'unsubscribe':
$content = $this->getUnsubscribeContent();
break;
break;
}
if(strpos($page_content, '[mailpoet_page]') !== false) {

4
lib/Twig/Handlebars.php
View File

@ -34,10 +34,10 @@ class Handlebars extends \Twig_Extension {
switch($args_count) {
case 2:
list($id, $file) = $args;
break;
break;
case 3:
list($id, $file, $alias) = $args;
break;
break;
default:
return;
}