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/Models/Form.php

@@ -79,33 +79,6 @@ class Form extends Model {
       $form = self::findOne((int)$data['id']);
     }
 
-    // check if the user gets to pick his own lists
-    // or if it's selected by the admin
-    $has_segment_selection = false;
-
-    if(!empty($body)) {
-      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';
-    }
-
     if($form === false) {
       $form = self::create();
       $form->hydrate($data);

lib/Models/Segment.php

@@ -109,16 +109,7 @@ class Segment extends Model {
       $segment->set($data);
     }
 
-    $saved = $segment->save();
-
-    if($saved === true) {
-      return true;
-    } else {
-      $errors = $segment->getValidationErrors();
-      if(!empty($errors)) {
-        return $errors;
-      }
-    }
-    return false;
+    $segment->save();
+    return $segment;
   }
 }

lib/Models/Subscriber.php

@@ -117,6 +117,8 @@ class Subscriber extends Model {
   static function groupBy($orm, $group = null) {
     if($group === 'trash') {
       return $orm->whereNotNull('deleted_at');
+    } else if($group === 'all') {
+      return $orm->whereNull('deleted_at');
     } else {
       return $orm->filter($group);
     }
@@ -158,13 +160,13 @@ class Subscriber extends Model {
 
     if(isset($data['id']) && (int)$data['id'] > 0) {
       $subscriber = self::findOne((int)$data['id']);
+      unset($data['id']);
     }
 
     if($subscriber === false) {
       $subscriber = self::create();
       $subscriber->hydrate($data);
     } else {
-      unset($data['id']);
       $subscriber->set($data);
     }