refactor pages

lib/Settings/Pages.php

@@ -65,7 +65,9 @@ class Pages {
     return array(
       'id' => $page->ID,
       'title' => $page->post_title,
-      'preview_url' => get_permalink($page->ID),
+      'preview_url' => add_query_arg(array(
+        'preview' => 1
+      ), get_permalink($page->ID)),
       'edit_url' => get_edit_post_link($page->ID)
     );
   }

lib/Subscription/Pages.php

@@ -8,10 +8,7 @@ use \MailPoet\Models\Segment;
 use \MailPoet\Util\Helpers;
 
 class Pages {
-  const DEMO_EMAIL = 'demo@mailpoet.com';
-
   function __construct() {
-
   }
 
   function init() {
@@ -22,6 +19,10 @@ class Pages {
     }
   }
 
+  function isPreview() {
+    return (array_key_exists('preview', $_GET));
+  }
+
   function setWindowTitle() {
     // TODO
   }
@@ -39,13 +40,13 @@ class Pages {
       break;
 
       case 'unsubscribe':
-        if($subscriber !== false && $subscriber->email !== self::DEMO_EMAIL) {
+        if($subscriber !== false) {
           if($subscriber->status !== Subscriber::STATUS_UNSUBSCRIBED) {
             $subscriber->status = Subscriber::STATUS_UNSUBSCRIBED;
             $subscriber->save();
           }
         }
-        return $this->getUnsubscribeTitle();
+        return $this->getUnsubscribeTitle($subscriber);
       break;
     }
     return $title;
@@ -70,24 +71,23 @@ class Pages {
   }
 
   private function getConfirmTitle($subscriber) {
-    if($subscriber === false) {
+    if($this->isPreview()) {
+      $title = sprintf(
+        __("You've subscribed to: %s"),
+        'demo 1, demo 2'
+      );
+    } else if($subscriber === false) {
       $title = __('Your confirmation link expired, please subscribe again.');
     } else {
-      if($subscriber->email === self::DEMO_EMAIL) {
+      if($subscriber->status !== Subscriber::STATUS_SUBSCRIBED) {
-        $segment_names = array('demo 1', 'demo 2');
+        $subscriber->status = Subscriber::STATUS_SUBSCRIBED;
-      } else {
+        $subscriber->save();
-        if($subscriber->status !== Subscriber::STATUS_SUBSCRIBED) {
-          $subscriber->status = Subscriber::STATUS_SUBSCRIBED;
-          $subscriber->save();
-        }
-
-        $segments = $subscriber->segments()->findMany();
-
-        $segment_names = array_map(function($segment) {
-          return $segment->name;
-        }, $segments);
       }
 
+      $segment_names = array_map(function($segment) {
+        return $segment->name;
+      }, $subscriber->segments()->findMany());
+
       if(empty($segment_names)) {
         $title = __("You've subscribed!");
       } else {
@@ -109,13 +109,15 @@ class Pages {
     }
   }
 
-  private function getUnsubscribeTitle() {
+  private function getUnsubscribeTitle($subscriber) {
-    return __("You've unsubscribed!");
+    if($this->isPreview() || $subscriber !== false) {
+      return __("You've unsubscribed!");
+    }
   }
 
 
   private function getConfirmContent($subscriber) {
-    if($subscriber !== false) {
+    if($this->isPreview() || $subscriber !== false) {
       return __("Yup, we've added you to our list. You'll hear from us shortly.");
     }
   }
@@ -242,15 +244,18 @@ class Pages {
   }
 
   private function getUnsubscribeContent($subscriber) {
-    $content = '<p>'.__("Great, you'll never hear from us again!").'</p>';
+    $content = '';
-    if($subscriber !== false) {
+    if($this->isPreview() || $subscriber !== false) {
-      $content .= '<p><strong>'.
+      $content = '<p>'.__("Great, you'll never hear from us again!").'</p>';
-        str_replace(
+      if($subscriber !== false) {
-          array('[link]', '[/link]'),
+        $content .= '<p><strong>'.
-          array('<a href="'.$subscriber->getConfirmationUrl().'">', '</a>'),
+          str_replace(
-          __('You made a mistake? [link]Undo unsubscribe.[/link]')
+            array('[link]', '[/link]'),
-        ).
+            array('<a href="'.$subscriber->getConfirmationUrl().'">', '</a>'),
-      '</strong></p>';
+            __('You made a mistake? [link]Undo unsubscribe.[/link]')
+          ).
+        '</strong></p>';
+      }
     }
     return $content;
   }
@@ -263,12 +268,6 @@ class Pages {
       ? $_GET['mailpoet_email']
       : null;
 
-    if(empty($token) || empty($email) || $email === self::DEMO_EMAIL) {
-      $subscriber = Subscriber::create();
-      $subscriber->email = self::DEMO_EMAIL;
-      return $subscriber;
-    }
-
     if(md5(AUTH_KEY.$email) === $token) {
       $subscriber = Subscriber::findOne($email);
       if($subscriber !== false) {

views/settings/basics.html

@@ -214,7 +214,7 @@
             <% for page in pages %>
               <option
                 value="<%= page.id %>"
-                data-preview-url="<%= page.preview_url|raw %>&amp;mailpoet_action=edit"
+                data-preview-url="<%= page.preview_url|raw %>&amp;mailpoet_action=unsubscribe"
                 data-edit-url="<%= page.edit_url|raw %>"
                 <% if(page.id == settings.subscription.page) %>
                   selected="selected"