diff --git a/mailjet.module b/mailjet.module index 79ac3d5..4edf852 100644 --- a/mailjet.module +++ b/mailjet.module @@ -419,41 +419,53 @@ function mailjet_properties_sync($newField = NULL, $delete = FALSE) { } /** - * Sync user hooks. + * Add a Mailjet user. + * + * @param \Drupal\user\Entity\User $user + * The User object. */ -function mailjet_user_insert($user) { - mailjet_sync_single_user($user, 'add'); +function mailjet_user_insert(User $user) { + ksm('mailjet_user_insert'); + mailjet_sync_single_user($user, 'add'); } - /** - * Updates Mailjet users + * Update a Mailjet user. + * + * @param \Drupal\user\Entity\User $user + * The User object. */ -function mailjet_user_update($user) { - // Only trigger updates when the account status has changed. - if (isset($user->get('status')->value)) { - if ($user->get('status')->value > 0) { //should be the same as cancel hook - mailjet_sync_single_user($user, 'update'); - } - else { - mailjet_sync_single_user($user, 'remove'); - } +function mailjet_user_update(User $user) { + // Only trigger updates when the account status has changed. + if (isset($user->get('status')->value)) { + if ($user->get('status')->value > 0) { + mailjet_sync_single_user($user, 'update'); + } + else { + mailjet_sync_single_user($user, 'remove'); } + } } /** - * Deletes mailjet user. + * Delete a Mailjet user. + * + * @param \Drupal\user\Entity\User $user + * The User object. */ -function mailjet_user_delete($user) { - mailjet_sync_single_user($user, 'remove'); -} - -function mailjet_user_cancel($user) { - mailjet_sync_single_user($user, 'remove'); +function mailjet_user_delete(User $user) { + mailjet_sync_single_user($user, 'remove'); } - -function mailjet_sync_single_user($user, $type) { +/** + * Sync a single Mailjet user. + * + * @param \Drupal\user\Entity\User $user + * The User object. + * @param $action + * The action to send to Mailjet. + */ +function mailjet_sync_single_user(User $user, $action) { $config_mailjet = \Drupal::config('mailjet.settings'); if (empty($user->get('mail')->value)) { @@ -462,76 +474,73 @@ function mailjet_sync_single_user($user, $type) { mailjet_properties_sync(); $mailjetApiClient = mailjet_new(); - //var_dump($infos->getEmail()); $mj_lists = []; - //if (!empty($defaul_mj_list)) { $mj_lists[] = mailjet_get_default_list_id($mailjetApiClient); - //} -// var_dump($mj_lists); -// var_dump($type); -// var_dump($user);exit; - switch ($type) { + $fields = $user->getFields(); + + switch ($action) { case 'add': case 'update': - foreach ($mj_lists as $key => $value) { - // Get the data which we have to update. The data will be extracted from the user's object or $info variable + foreach ($mj_lists as $key => $list) { + $contact = [ + 'Email' => $user->get('mail')->value + ]; + + // Get the data which we have to update. The data will be extracted from + // the user's object. $data = []; - if (is_array($user) && isset($user[$infos['mail']])) { - foreach ($user[$infos['mail']]['properties'] as $prop_key => $prop_value) { - $data[str_replace("field_", "", $prop_key)] = $prop_value; - } - } - else { - foreach ($infos as $key => $info) { - if (strpos($key, 'field_') !== FALSE && isset($info['und'][0]['value'])) { - $data[str_replace("field_", "", $key)] = $info['und'][0]['value']; - } + + foreach ($fields as $field) { + if (substr( $field->getName(), 0, 6 ) === "field_") { + $data[str_replace("field_", "", $field->getName())] = $user->get($field->getName())->value; } } - $contact = [ - 'Email' => $user->get('mail')->value - ]; - if (!empty($data)) { - $contact['Properties'] = $data; + if (count($data)) { + $contact['Properties'] = $data; } - //add new email - $response = MailjetApi::syncMailjetContact($value, $contact); - if (false != $response) { - \Drupal::logger('mailjet_messages') - ->notice(t('The new contact was added to list #' . $value . '.')); + // Add new contact. + $response = MailjetApi::syncMailjetContact($list, $contact); + + if ($response) { + \Drupal::logger('mailjet_messages') + ->notice(t('The new contact was added to list #@list.', ['@list' => $list])); } else { \Drupal::logger('mailjet_messages') - ->notice(t('The new contact was not added to list #' . $value . '.')); + ->notice(t('The new contact was not added to list #@list.', ['@list' => $list])); } } break; + case 'remove': - foreach ($mj_lists as $key => $value) { + foreach ($mj_lists as $key => $list) { $contact = [ 'Email' => $user->get('mail')->value ]; - //add new email - $response = MailjetApi::syncMailjetContact($value, $contact, 'remove'); - if (false == $response) { + + // Remove contact. + $response = MailjetApi::syncMailjetContact($list, $contact, $action); + + if ($response) { \Drupal::logger('mailjet_messages') - ->notice(t('The new contact was unsubscribed from list #' . $value . '.')); + ->notice(t('The contact was unsubscribed from list #@list.', ['@list' => $list])); } else { \Drupal::logger('mailjet_messages') - ->notice(t('The new contact was not unsubscribed from list #' . $value . '.')); + ->notice(t('The contact was not unsubscribed from list #@list.', ['@list' => $list])); } } break; + default: - drupal_set_message(t("No user action"), "warning"); + $messenger = \Drupal::messenger(); + $messenger->addMessage(t('No user action'), 'warning'); break; } } - /** * Checks if batch process is running. */ @@ -734,35 +743,35 @@ function prepare_mail_template($email_header, $email_text_button, $email_descrip global $base_url; $tempalate = '
- - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + +
- ' . $email_header . ' -
-
' . $base_url . '
- ' . $email_description . '
- -
' . $email_description_footer . '
' . $email_footer . '
' . $email_owner . '
+ ' . $email_header . ' +
+
' . $base_url . '
+ ' . $email_description . '
+ +
' . $email_description_footer . '
' . $email_footer . '
' . $email_owner . '
'; @@ -934,4 +943,4 @@ function mailjet_theme($existing, $type, $theme, $path) { 'template' => 'block--local-actions-block', ], ]; -} +}