From dde55be3c6cf2cbd56dc9d652099d6282b3cc7eb Mon Sep 17 00:00:00 2001 From: Davis Date: Tue, 7 Jun 2011 13:17:20 +0200 Subject: [PATCH] Complete the update issue --- emf.db.inc | 32 +++++++++++--- emf.helpers.inc | 18 ++++++++- emf.install | 23 +--------- emf.module | 21 ++++++++- emf.sync.inc | 50 +++++++++++++--------- plugins/emf_mailchimp/emf_mailchimp.api.inc | 59 ++++++++++++++++++++++++-- 6 files changed, 145 insertions(+), 58 deletions(-) diff --git a/emf.db.inc b/emf.db.inc index 9b96b80..5983624 100644 --- a/emf.db.inc +++ b/emf.db.inc @@ -1,4 +1,5 @@ array('type' => 'varchar', 'length' => '32', 'not null' => TRUE), 'fields' => array('type' => 'text', 'not null' => TRUE), 'timestamp' => array('type' => 'int', 'not null' => TRUE), - 'fails' => array( - 'description' => 'Number of failed attempt(s) to push the request to the service.', - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0 - ), ), 'primary key' => array('mail', 'lid'), 'indexes' => array( @@ -76,6 +71,7 @@ function emf_schema() { 'fields' => array( 'mail' => array('type' => 'varchar', 'length' => '128', 'not null' => TRUE), 'lid' => array('type' => 'varchar', 'length' => '64', 'not null' => TRUE), + 'fields' => array('type' => 'text', 'not null' => TRUE), ), 'primary key' => array('mail', 'lid'), ); @@ -166,7 +162,6 @@ function _emf_schema_list_roles() { ); } - /** * Adding list roles table. */ @@ -227,18 +222,4 @@ function emf_update_6004() { } return $ret; -} - -/** - * Adding {emf_request}.fails column. - */ -function emf_update_6005() { - $return = array(); - db_add_field($return, 'emf_request', 'fails', array( - 'description' => 'Number of failed attempt(s) to push the request to the service.', - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0 - )); - return $return; } \ No newline at end of file diff --git a/emf.module b/emf.module index b24d67f..c42f03b 100644 --- a/emf.module +++ b/emf.module @@ -1,4 +1,5 @@ 'E-mail Marketing Framework', 'description' => 'View your e-mail marketing service subscriber and request reports.', 'page callback' => 'emf_reports_subscriptions', - 'access arguments' => array('view emf reports'), + 'access arguments' => array('view reports'), 'file' => 'emf.reports.inc', ); $items['admin/reports/emf/subscriptions'] = array( @@ -135,7 +136,7 @@ function emf_menu() { 'page callback' => 'emf_reports_requests', 'type' => MENU_LOCAL_TASK, 'weight' => 1, - 'access arguments' => array('view emf reports'), + 'access arguments' => array('view reports'), 'file' => 'emf.reports.inc', ); @@ -281,6 +282,20 @@ function emf_block($op = 'list', $delta = 0, $edit = array()) { * Implementation of hook_user(). */ function emf_user($op, &$edit, &$user) { + /*Adding the after_update condition to update the user account and to save in the request table*/ + if($op == 'after_update') { + $mail = $user->mail; + + //deleting all pending requests + db_query("DELETE FROM {emf_request} WHERE mail = '%s'",$mail); + + //update from all known lists + $lists = emf_db_get_lists(); + foreach ($lists as $list) { + $fields = emf_helpers_parse_field_values($list->lid, $user); + emf_db_save_request('updateMember',$mail, $list->lid, $fields); + } + } if ($op == 'delete') { $mail = $user->mail; diff --git a/emf.sync.inc b/emf.sync.inc index dd02db0..644cd94 100644 --- a/emf.sync.inc +++ b/emf.sync.inc @@ -1,4 +1,5 @@ type == 'subscribe') { $success = emf_plugin_invoke('subscribe', array($request->mail, $fields, $request->lid)); } - else { - $success = emf_plugin_invoke('unsubscribe', array($request->mail, $request->lid)); - } - - // if push succeeded or failed too many times, request can be deleted - if ($success || $request->fails > variable_get('emf_max_request_fails', 5)) { + // Request type -> Update + if ($request->type == 'updateMember') { + $success = emf_plugin_invoke('update',array($request->mail, $fields, $request->lid)); + } + if($request->type == 'unsubscribe') { + $success = emf_plugin_invoke('unsubscribe', array($request->mail, $request->lid)); + } + + // if push succeeded, request can be deleted + if ($success) { emf_db_delete_request($request->mail, $request->lid); - if ($request->fails > variable_get('emf_max_request_fail', 5)) { - watchdog('emf', t('%type request to %list cancelled for %mail after @count failed push attempts.', array( - '%type' => $request->type, - '%list' => $list->name_clean, - '%mail' => $request->mail, - '@count' => $request->fails, - )), WATCHDOG_ERROR); - } - } - else { - $request->fails += 1; - emf_db_save_request($request->type, $request->mail, $request->lid, $request->fields, $request->fails); } // count up @@ -211,18 +204,33 @@ function emf_sync_subscriptions() { // fetching subscriptions $subscribed = emf_plugin_invoke('get_subscribers_subscribed', array($last_sync, $lid)); $unsubscribed = emf_plugin_invoke('get_subscribers_unsubscribed', array($last_sync, $lid)); - + $updated = emf_plugin_invoke('get_subscribers_updated', array($last_sync, $lid)); + // check subscriptions if ($subscribed !== FALSE && count($subscribed) > 0) { foreach ($subscribed as $mail) { // if a request is pending for this address, ignore subscription status if (in_array($mail, $requests)) continue; + // Set the member account details + $fields = emf_plugin_invoke('get_member_info', array($lid, $mail)); // set address as subscripted to - emf_db_save_subscription($mail, $lid); + //$fields['merges'] contains the data of an user + emf_db_save_subscription($mail, $lid, $fields['merges']); } } - + //check updates + if ($updated !== FALSE && count($updated) > 0) { + foreach ($updated as $mail) { + //if a request is pending for this address, ignore update status + if (in_array($mail, $requests)) continue; + + // Set the member account details + $fields = emf_plugin_invoke('get_member_info', array($lid, $mail)); + // set address as updated to + emf_db_save_update($mail, $lid, $fields['merges']); + } + } // check unsubscriptions if ($unsubscribed !== FALSE && count($unsubscribed) > 0) { foreach ($unsubscribed as $mail) { diff --git a/plugins/emf_mailchimp/emf_mailchimp.api.inc b/plugins/emf_mailchimp/emf_mailchimp.api.inc index a2171b9..a07f2e6 100644 --- a/plugins/emf_mailchimp/emf_mailchimp.api.inc +++ b/plugins/emf_mailchimp/emf_mailchimp.api.inc @@ -1,4 +1,5 @@ $api_field) { - if (isset($result[$api_field])) { - $object->{$local_field} = $result[$api_field]; - } + $object->{$local_field} = $result[$api_field]; } if ($key) { $items[$object->{$key}] = $object; -- 1.7.4.msysgit.0