List selection & subscribe

- fixed list selection widget (form editor & rendered form)
- ajax subscription works (minus sending the confirmation email)
- bug fixes / polishing / refactoring / cleanup

lib/Router/Forms.php

@@ -34,7 +34,11 @@ class Forms {
     // fetch segments relations for each returned item
     foreach($listing_data['items'] as &$item) {
       // form's segments
-      $form_settings = unserialize($item['settings']);
+      $form_settings = (
+        (is_serialized($item['settings']))
+        ? unserialize($item['settings'])
+        : array()
+      );
 
       $item['segments'] = (
         !empty($form_settings['segments'])
@@ -128,7 +132,7 @@ class Forms {
     }
   }
 
-  function save_editor($data = array()) {
+  function saveEditor($data = array()) {
     $form_id = (isset($data['id']) ? (int)$data['id'] : 0);
     $body = (isset($data['body']) ? $data['body'] : array());
     $settings = (isset($data['settings']) ? $data['settings'] : array());
@@ -149,6 +153,31 @@ class Forms {
           }
         }
       }
+
+      // check if the user gets to pick his own lists
+      // or if it's selected by the admin
+      $has_segment_selection = false;
+
+      foreach ($body as $i => $block) {
+        if($block['type'] === 'segment') {
+          $has_segment_selection = true;
+          if(!empty($block['params']['values'])) {
+            $list_selection = array_map(function($segment) {
+              if(!empty($segment)) {
+                return (int)$segment['id'];
+              }
+            }, $block['params']['values']);
+          }
+          break;
+        }
+      }
+
+      // check list selectio
+      if($has_segment_selection === true) {
+        $settings['segments_selected_by'] = 'user';
+      } else {
+        $settings['segments_selected_by'] = 'admin';
+      }
     }
 
     $form = Form::createOrUpdate(array(
@@ -213,7 +242,7 @@ class Forms {
     wp_send_json($result);
   }
 
-  function item_action($data = array()) {
+  function itemAction($data = array()) {
     $item_action = new Listing\ItemAction(
       '\MailPoet\Models\Form',
       $data
@@ -222,7 +251,7 @@ class Forms {
     wp_send_json($item_action->apply());
   }
 
-  function bulk_action($data = array()) {
+  function bulkAction($data = array()) {
     $bulk_action = new Listing\BulkAction(
       '\MailPoet\Models\Form',
       $data

lib/Router/Newsletters.php

@@ -204,7 +204,15 @@ class Newsletters {
     wp_send_json($listing_data);
   }
 
-  function bulk_action($data = array()) {
+  function itemAction($data = array()) {
+    $item_action = new Listing\ItemAction(
+      '\MailPoet\Models\Newsletter',
+      $data
+    );
+    wp_send_json($item_action->apply());
+  }
+
+  function bulkAction($data = array()) {
     $bulk_action = new Listing\BulkAction(
       '\MailPoet\Models\Newsletter',
       $data

lib/Router/Segments.php

@@ -128,16 +128,7 @@ class Segments {
     wp_send_json($result);
   }
 
-  function item_action($data = array()) {
-    $item_action = new Listing\ItemAction(
-      '\MailPoet\Models\Segment',
-      $data
-    );
-
-    wp_send_json($item_action->apply());
-  }
-
-  function bulk_action($data = array()) {
+  function bulkAction($data = array()) {
     $bulk_action = new Listing\BulkAction(
       '\MailPoet\Models\Segment',
       $data

lib/Router/Subscribers.php

@@ -4,6 +4,9 @@ namespace MailPoet\Router;
 use MailPoet\Listing;
 use MailPoet\Models\Subscriber;
 use MailPoet\Models\SubscriberSegment;
+use MailPoet\Models\Segment;
+use MailPoet\Models\Setting;
+use MailPoet\Models\Form;
 
 if(!defined('ABSPATH')) exit;
 
@@ -55,10 +58,188 @@ class Subscribers {
   }
 
   function save($data = array()) {
-    $result = Subscriber::createOrUpdate($data);
+    $result = false;
+
+    $subscriber = Subscriber::createOrUpdate($data);
+
+    if($subscriber !== false && !$subscriber->id()) {
+      $result = array(
+        'errors' => $subscriber->getValidationErrors()
+      );
+    } else {
+      $result = true;
+    }
     wp_send_json($result);
   }
 
+  function subscribe($data = array()) {
+    $doing_ajax = (bool)(defined('DOING_AJAX') && DOING_AJAX);
+    $errors = array();
+
+    $form = Form::findOne($data['form_id']);
+    unset($data['form_id']);
+    if($form === false || !$form->id()) {
+      $errors[] = __('This form does not exist.');
+    }
+
+    $segments = Segment::whereIn('id', (array)$data['segments'])->findMany();
+    unset($data['segments']);
+    if(empty($segments)) {
+      $errors[] = __('You need to select a list');
+    }
+
+    if(!empty($errors)) {
+      wp_send_json(array('errors' => $errors));
+    } else {
+      $subscriber = Subscriber::where('email', $data['email'])->findOne();
+    }
+
+    $signup_confirmation = Setting::getValue('signup_confirmation', array());
+
+    if($subscriber === false) {
+      // create new subscriber
+      $data['status'] = (
+        (!empty($signup_confirmation['enabled']))
+        ? 'unconfirmed' : 'subscribed'
+      );
+
+      // // set custom fields
+      // $meta_fields = $mailpoet->getOption('mailpoet_subscriber_meta', array());
+      // if(!empty($meta_fields)) {
+      //   // loop through data to see if any meta field has been passed
+      //   foreach($meta_fields as $field => $field_data) {
+      //     // check if it's a mandatory field
+      //     $is_required = (isset($field_data['params']['required']) && (bool)$field_data['params']['required'] === true);
+
+      //     if(array_key_exists($field, $data)) {
+      //       // check if it's a mandatory field
+      //       if($is_required === true && empty($data[$field])) {
+      //         // if it's missing, throw an error
+      //         $errors[] = sprintf(__('"%s" is required'), $field_data['name']);
+      //       } else {
+      //         // assign field to subscriber
+      //         $subscriber[$field] = $data[$field];
+      //       }
+      //     }
+      //   }
+      // }
+
+      // insert new subscriber
+      $subscriber = Subscriber::createOrUpdate($data);
+
+      if($subscriber === false || !$subscriber->id()) {
+        $errors = array_merge($errors, $subscriber->getValidationErrors());
+      }
+    } else {
+      $subscriber->set('status', (
+        !empty($signup_confirmation['enabled'])
+        ? 'unconfirmed' : 'subscribed'
+      ));
+
+      // restore deleted subscriber
+      if($subscriber->deleted_at !== NULL) {
+        $subscriber->setExpr('deleted_at', 'NULL');
+      }
+
+      if(!$subscriber->save()) {
+        $errors[] = __('An error occurred. Please try again later.');
+      }
+    }
+
+    // get segments
+    // IDEA: $subscriptions->addToSegments($data['segments']);
+    $segments_subscribed = array();
+    foreach($segments as $segment) {
+      if($segment->addSubscriber($subscriber->id())) {
+        $segments_subscribed[] = $segment->id;
+      }
+    }
+
+    // if signup confirmation is enabled and the subscriber is unconfirmed
+    if(!empty($signup_confirmation['enabled'])
+      && !empty($segments_subscribed)
+      && $subscriber->status !== 'subscribed'
+    ) {
+      // TODO: send confirmation email
+      // resend confirmation email
+      $is_sent = true;
+      /*$is_sent = static::sendSignupConfirmation(
+        $subscriber->asArray(),
+        $segments->asArray()
+      );*/
+
+      // error message if the email could not be sent
+      if($is_sent === false) {
+        $errors[] = __('The signup confirmation email could not be sent. Please check your settings.');
+      }
+    }
+
+    // get success message to display after subscription
+    $form_settings = (
+      isset($form->settings)
+      ? unserialize($form->settings) : null
+    );
+
+    if($subscriber !== null && empty($errors)) {
+      $result = true;
+      $message = $form_settings['success_message'];
+    } else {
+      $result = false;
+    }
+
+    if($form_settings !== null) {
+
+      // url params for non ajax requests
+      if($doing_ajax === false) {
+        // get referer
+        $referer = (wp_get_referer() !== false)
+          ? wp_get_referer() : $_SERVER['HTTP_REFERER'];
+
+        // redirection parameters
+        $params = array(
+          'mailpoet_form' => $form->id()
+        );
+
+        // handle success/error messages
+        if($result === false) {
+          $params['mailpoet_error'] = urlencode($message);
+        } else {
+          $params['mailpoet_success'] = urlencode($message);
+        }
+      }
+
+      switch ($form_settings['on_success']) {
+        case 'page':
+          // response depending on context
+          if($doing_ajax === true) {
+            wp_send_json(array(
+              'result' => $result,
+              'page' => get_permalink($form_settings['success_page']),
+              'message' => $message
+            ));
+          } else {
+            $redirect_to = ($result === false) ? $referer : get_permalink($form_settings['success_page']);
+            wp_redirect(add_query_arg($params, $redirect_to));
+          }
+        break;
+
+        case 'message':
+        default:
+          // response depending on context
+          if($doing_ajax === true) {
+            wp_send_json(array(
+              'result' => $result,
+              'message' => $message
+            ));
+          } else {
+            // redirect to previous page
+            wp_redirect(add_query_arg($params, $referer));
+          }
+        break;
+      }
+    }
+  }
+
   function restore($id) {
     $result = false;
 
@@ -93,16 +274,7 @@ class Subscribers {
     wp_send_json($result);
   }
 
-  function item_action($data = array()) {
-    $item_action = new Listing\ItemAction(
-      '\MailPoet\Models\Segment',
-      $data
-    );
-
-    wp_send_json($item_action->apply());
-  }
-
-  function bulk_action($data = array()) {
+  function bulkAction($data = array()) {
     $bulk_action = new Listing\BulkAction(
       '\MailPoet\Models\Subscriber',
       $data