Make subscribe form work

oriuminc · Feb 23, 2016 · 2f179b8 · 2f179b8
1 parent a097bc6
commit 2f179b8
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/Form/SubscribeForm.php b/src/Form/SubscribeForm.php
@@ -58,13 +58,23 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    foreach($form_state['values']['lists'] as $list_id) {
+    $values = $form_state->getValues();
+    foreach($values['lists'] as $list_id) {
 
       if(!$list_id) {
         continue;
       }
 
-      $email = check_plain($form_state['values']['email']);
+      $email_okay = \Drupal::service('email.validator')->isValid($values['email']);
+      if ($email_okay) {
+        $email = $values['email'];
+      }
+      else {
+        form_set_error('', t('Please submit a valid email address.'));
+        $form_state['redirect'] = FALSE;
+        return FALSE;
+      }
+
       $cm = CampaignMonitor::getConnector();
 
       // Update subscriber information or add new subscriber to the list.