Skip to content

Commit

Permalink
Merge pull request #36 from mailjet/development
Browse files Browse the repository at this point in the history 
Development to Master
  • Loading branch information
Ferhan Ismailov authored Aug 22, 2019
2 parents a609996 + 45d61b4 commit b1aa537
Show file tree
Hide file tree
Showing 3 changed files with 111 additions and 121 deletions.
4 changes: 4 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ [email protected]

Changelog
---------

#### 7.x-2.20 22 August 2019
* Bugfixes and internal improvements regarding single contact sync

#### 7.x-2.19 18 February 2019
* Bugfixes and internal improvements regarding contacts sync, subscription and unsibscription of contacts
* Updated texts and translations
Expand Down
130 changes: 57 additions & 73 deletions mailjet.module
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,12 +368,12 @@ function mailjet_user_infos() {
/**
* Update the user infos.
*
* @param unknown $infos
* @param unknown $user
* @return boolean
*/
function mailjet_mjuser_update($infos) {
function mailjet_mjuser_update($user) {
$mailjetApiClient = mailjet_new();
$response = $mailjetApiClient->put(Resources::$Myprofile, ['body' => $infos]);
$response = $mailjetApiClient->put(Resources::$Myprofile, ['body' => $user]);
return ($response->success()) ? TRUE : FALSE;
}

Expand Down Expand Up @@ -652,109 +652,93 @@ function mailjet_properties_sync($new_field = NULL, $delete = FALSE) {
/**
* Sync user hooks.
*/
function mailjet_user_insert($infos) {
mailjet_sync_single_user($infos, 'add');
function mailjet_user_insert($user) {
mailjet_sync_single_user($user, 'add');
}

/**
* Updates Mailjet users
*/
function mailjet_user_update($infos) {
function mailjet_user_update($user) {
// Only trigger updates when the account status has changed.
if (isset($infos['status'])) {
if ($infos['status'] > 0) { //should be the same as cancel hook
mailjet_sync_single_user($infos, 'update');
if (isset($user['status'])) {
if ($user['status'] > 0) { //should be the same as cancel hook
mailjet_sync_single_user($user, 'update');
}
else {
mailjet_sync_single_user($infos, 'remove');
mailjet_sync_single_user($user, 'remove');
}
}
}

/**
* Deletes mailjet user.
*/
function mailjet_user_delete($infos) {
mailjet_sync_single_user((array) $infos, 'remove');
function mailjet_user_delete($user) {
mailjet_sync_single_user((array) $user, 'remove');
}

function mailjet_user_cancel($infos) {
mailjet_sync_single_user($infos, 'remove');
function mailjet_user_cancel($user) {
mailjet_sync_single_user($user, 'remove');
}

function mailjet_sync_single_user($infos, $action) {
function mailjet_sync_single_user($user, $action) {
if (!variable_get('mailjet_properties_sync', TRUE)) {
return;
}
if (empty($user['mail'])) {
return;
}

$mailjetApiClient = mailjet_new();

$user = get_sync_info($infos);
$mj_lists = array();
if (is_array($user) && isset($infos['mail']) && isset($user[$infos['mail']])) {
$mj_lists = explode(",", $user[$infos['mail']]['mj_lists']);
if (is_array($user) && isset($user['mail']) && isset($user[$user['mail']])) {
$mj_lists = explode(",", $user[$user['mail']]['mj_lists']);
$mj_lists = array_diff($mj_lists, array(''));
}
// Add the default list as well
$mj_lists[] = mailjet_get_default_list_id($mailjetApiClient);

mailjet_properties_sync();

$contact = [
'Email' => $user['mail']
];

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
$data = array();
if (is_array($user) && isset($user[$infos['mail']])) {
foreach ($user[$infos['mail']]['properties'] as $prop_key => $prop_value) {
$data[] = array(
'Name' => str_replace("field_", "", $prop_key),
'Value' => $prop_value
);
}
} else {
foreach ($infos as $key => $info) {
if (strpos($key, 'field_') !== FALSE && isset($info['und'][0]['value'])) {
$data[] = array(
'Name' => str_replace("field_", "", $key),
'Value' => $info['und'][0]['value']
);
}
}
foreach ($mj_lists as $listId) {
foreach ($user as $propertyName => $propertyValue) {
// We sync оnly `name` for now
if ('name' == $propertyName) {
$properties[$propertyName] = $propertyValue;
}
}
if (!empty($properties)) {
$contact['Properties'] = $properties;
}

$contact = [
'Email' => $infos['mail']
];
if (!empty($data)) {
$contact['Properties'] = $data;
}
//add new email
$response = MailjetApi::syncMailjetContact($value, $contact);
if (false != $response) {
drupal_set_message(t('Contact data was synced.'), 'status');
} else {
drupal_set_message(t('Contact data was not synced.'), 'error');
}
//add new email
$response = MailjetApi::syncMailjetContact($listId, $contact);
if (false != $response) {
drupal_set_message(t('Contact data was synced.'), 'status');
} else {
drupal_set_message(t('Contact data was not synced.'), 'error');
}
}
break;
case 'remove':
if (empty($infos['mail'])) {
return;
}
foreach ($mj_lists as $key => $value) {

$contact = [
'Email' => $infos['mail']
];
case 'remove':
foreach ($mj_lists as $listId) {
//add new email
$response = MailjetApi::syncMailjetContact($value, $contact, 'remove');
$response = MailjetApi::syncMailjetContact($listId, $contact, 'remove');
if (false == $response) {
watchdog('mailjet_messages', 'The new contact was unsubscribed from list #' . $value . '.');
watchdog('mailjet_messages', 'The new contact was unsubscribed from list #' . $listId . '.');
}
else {
watchdog('mailjet_messages', 'The new contact was not unsubscribed from list #' . $value . '.');
watchdog('mailjet_messages', 'The new contact was not unsubscribed from list #' . $listId . '.');
}
}
break;
Expand All @@ -767,7 +751,7 @@ function mailjet_sync_single_user($infos, $action) {
/**
* Get sync user info.
*/
function get_sync_info($infos) {
function get_sync_info($user) {
// get all Drupal views
$views = views_get_all_views();
$drupal_users = array();
Expand All @@ -782,10 +766,10 @@ function get_sync_info($infos) {
//check if the email is part of this view
$x = 0;
while ($x != $total_rows) {
if ($infos['mail'] == $v->render_field($field, $x)) {
if ($user['mail'] == $v->render_field($field, $x)) {
//get lists using this view
$lists = "";
if ((isset($infos['original']) && $infos['mail'] != $infos['original']->mail) || $infos['is_new'] == 1) {
if ((isset($user['original']) && $user['mail'] != $user['original']->mail) || $user['is_new'] == 1) {
$query = new EntityFieldQuery();
$query->entityCondition('entity_type', 'mailjet_list');
$res = $query->execute();
Expand Down Expand Up @@ -826,7 +810,7 @@ function get_sync_info($infos) {
}

// If the user status is changed to "BLOCKED" / "DELETED" - the user is ignored and it's not loaded in the view
if ($infos['status'] == 0) {
if ($user['status'] == 0) {
$lists = "";

$query = new EntityFieldQuery();
Expand All @@ -840,17 +824,17 @@ function get_sync_info($infos) {
}
}

if (array_key_exists($infos['mail'], $drupal_users)) {
$drupal_users[$infos['mail']]['mj_lists'] .= $lists;
if (array_key_exists($user['mail'], $drupal_users)) {
$drupal_users[$user['mail']]['mj_lists'] .= $lists;
}
else {
$drupal_users[$infos['mail']] = array(
'uid' => $infos['original']->uid,
'name' => $infos['original']->name,
'mail' => $infos['original']->mail,
'created' => $infos['original']->created
$drupal_users[$user['mail']] = array(
'uid' => $user['original']->uid,
'name' => $user['original']->name,
'mail' => $user['original']->mail,
'created' => $user['original']->created
);
$drupal_users[$infos['mail']]['mj_lists'] = $lists;
$drupal_users[$user['mail']]['mj_lists'] = $lists;
}
}
}
Expand Down
98 changes: 50 additions & 48 deletions modules/event/mailjet_event.module
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,66 +111,68 @@ function mailjet_event_callback() {
$post = trim(file_get_contents('php://input'));

// Decode Trigger Informations.
$allEvents = json_decode($post, TRUE);
$allEvents = json_decode($post, TRUE);

/*
* If we get Version 1 event it is single array.
* Then we need to convert it to multi-array
* to reuse the same functionallity used for Version 2 (multi-array of events)
*/
/*
* If we get Version 1 event it is single array.
* Then we need to convert it to multi-array
* to reuse the same functionallity used for Version 2 (multi-array of events)
*/
if (array_key_exists('event', $allEvents)) {
$allEvents = array($allEvents);
$allEvents = array($allEvents);
}

if (empty($allEvents)) {
drupal_not_found();
drupal_not_found();
}

foreach ($allEvents as $key => $event) {
// No Informations sent with the Event.
if (!is_array($event) || !isset($event['event'])) {
drupal_not_found();
}
// No Informations sent with the Event.
if (!is_array($event) || !isset($event['event'])) {
drupal_not_found();
}

if (isset($event['email'])) {
$mail_user = user_load_by_mail($event['email']);
} elseif (isset($event['original_address'])) {
$mail_user = user_load_by_mail($event['original_address']);
}
if (isset($event['email'])) {
$mail_user = user_load_by_mail($event['email']);
} elseif (isset($event['original_address'])) {
$mail_user = user_load_by_mail($event['original_address']);
}

$mailjet_event = mailjet_event_new($mail_user, $event);
mailjet_event_save($mailjet_event);
$mailjet_event = mailjet_event_new($mail_user, $event);
mailjet_event_save($mailjet_event);

if (module_exists('rules')) {
switch ($event['event']) {
case 'open' :
rules_invoke_event('mailjet_open', $mailjet_event);

break;
case 'click' :
rules_invoke_event('mailjet_click', $mailjet_event);
break;

case 'bounce' :
rules_invoke_event('mailjet_bounce', $mailjet_event);
break;

case 'spam' :
rules_invoke_event('mailjet_spam', $mailjet_event);
break;

case 'blocked' :
rules_invoke_event('mailjet_blocked', $mailjet_event);
break;

case 'unsub' :
rules_invoke_event('mailjet_unsub', $mailjet_event);
break;

// No handler
default :
drupal_not_found();
break;
case 'open' :
rules_invoke_event('mailjet_open', $mailjet_event);
break;

case 'click' :
rules_invoke_event('mailjet_click', $mailjet_event);
break;

case 'bounce' :
rules_invoke_event('mailjet_bounce', $mailjet_event);
break;

case 'spam' :
rules_invoke_event('mailjet_spam', $mailjet_event);
break;

case 'blocked' :
rules_invoke_event('mailjet_blocked', $mailjet_event);
break;

case 'unsub' :
rules_invoke_event('mailjet_unsub', $mailjet_event);
break;

// No handler
default :
drupal_not_found();
break;
}
}
}
drupal_send_headers();
drupal_exit();
Expand Down

0 comments on commit b1aa537

Please sign in to comment.