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

- Changes location for the main view in browser class

Browse Source 
- Updates code formattign for case statements
This commit is contained in:
Vlad
2016-06-07 09:28:29 -04:00
parent 03eb4ad0fc
commit 14c2b4d90f
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Config/PublicAPI.php
View File

@@ -2,7 +2,7 @@
namespace MailPoet\Config; namespace MailPoet\Config;
use MailPoet\Cron\Daemon; use MailPoet\Cron\Daemon;
use MailPoet\Newsletter\Viewer\ViewInBrowser; use MailPoet\Newsletter\ViewInBrowser;
use MailPoet\Statistics\Track\Clicks; use MailPoet\Statistics\Track\Clicks;
use MailPoet\Statistics\Track\Opens; use MailPoet\Statistics\Track\Opens;
use MailPoet\Subscription; use MailPoet\Subscription;

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

@@ -26,7 +26,7 @@ class Link {
$url, $url,
__('Unsubscribe') __('Unsubscribe')
); );
break; break;
case 'subscription_unsubscribe_url': case 'subscription_unsubscribe_url':
return self::processUrl( return self::processUrl(
@@ -34,7 +34,7 @@ class Link {
SubscriptionUrl::getUnsubscribeUrl($subscriber), SubscriptionUrl::getUnsubscribeUrl($subscriber),
$queue $queue
); );
break; break;
case 'subscription_manage': case 'subscription_manage':
$url = self::processUrl( $url = self::processUrl(
@@ -47,7 +47,7 @@ class Link {
$url, $url,
__('Manage subscription') __('Manage subscription')
); );
break; break;
case 'subscription_manage_url': case 'subscription_manage_url':
return self::processUrl( return self::processUrl(
@@ -55,7 +55,7 @@ class Link {
SubscriptionUrl::getManageUrl($subscriber), SubscriptionUrl::getManageUrl($subscriber),
$queue $queue
); );
break; break;
case 'newsletter_view_in_browser': case 'newsletter_view_in_browser':
$action = 'view_in_browser_url'; $action = 'view_in_browser_url';
@@ -66,12 +66,12 @@ class Link {
$url, $url,
__('View in your browser') __('View in your browser')
); );
break; break;
case 'newsletter_view_in_browser_url': case 'newsletter_view_in_browser_url':
$url = ViewInBrowserUrl::getViewInBrowserUrl($newsletter, $subscriber, $queue); $url = ViewInBrowserUrl::getViewInBrowserUrl($newsletter, $subscriber, $queue);
return self::processUrl($action, $url, $queue); return self::processUrl($action, $url, $queue);
break; break;
default: default:
$shortcode = self::getShortcode($action); $shortcode = self::getShortcode($action);
@@ -85,7 +85,7 @@ class Link {
return ($url !== $shortcode) ? return ($url !== $shortcode) ?
self::processUrl($action, $url, $queue) : self::processUrl($action, $url, $queue) :
false; false;
break; break;
} }
} }
@@ -106,13 +106,13 @@ class Link {
$unsubscribe->track($subscriber['id'], $queue['id'], $newsletter['id']); $unsubscribe->track($subscriber['id'], $queue['id'], $newsletter['id']);
} }
$url = SubscriptionUrl::getUnsubscribeUrl($subscriber); $url = SubscriptionUrl::getUnsubscribeUrl($subscriber);
break; break;
case 'subscription_manage_url': case 'subscription_manage_url':
$url = SubscriptionUrl::getManageUrl($subscriber); $url = SubscriptionUrl::getManageUrl($subscriber);
break; break;
case 'newsletter_view_in_browser_url': case 'newsletter_view_in_browser_url':
$url = Link::getViewInBrowserUrl($newsletter, $subscriber, $queue); $url = Link::getViewInBrowserUrl($newsletter, $subscriber, $queue);
break; break;
default: default:
$shortcode = self::getShortcode($shortcode_action); $shortcode = self::getShortcode($shortcode_action);
$url = apply_filters( $url = apply_filters(
@@ -123,7 +123,7 @@ class Link {
$queue $queue
); );
$url = ($url !== $shortcode_action) ? $url : false; $url = ($url !== $shortcode_action) ? $url : false;
break; break;
} }
return $url; return $url;
} }

2
lib/Newsletter/Viewer/ViewInBrowser.php → lib/Newsletter/ViewInBrowser.php
View File

@@ -1,5 +1,5 @@
<?php <?php
namespace MailPoet\Newsletter\Viewer; namespace MailPoet\Newsletter;
use MailPoet\Models\Newsletter; use MailPoet\Models\Newsletter;
use MailPoet\Models\SendingQueue; use MailPoet\Models\SendingQueue;