From f8a18606ba151b0d0be82f7ed390b2e39214015f Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Wed, 6 May 2015 11:09:06 +0200 Subject: [PATCH] added watchdog mandrill result hook --- .../gui/materiobasemod/materio_user.module | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sites/all/modules/gui/materiobasemod/materio_user.module b/sites/all/modules/gui/materiobasemod/materio_user.module index 4a5811fa..258fd4c3 100755 --- a/sites/all/modules/gui/materiobasemod/materio_user.module +++ b/sites/all/modules/gui/materiobasemod/materio_user.module @@ -660,20 +660,26 @@ function materio_user_get_role_by_name($name) { */ function materio_user_mandrill_mailsend_result($result) { if ( in_array($result['status'], array('rejected', 'invalid', 'error')) ) { + $email = $result['email']; + // remove email from pool module_load_include('inc', 'simplenews', 'includes/simplenews.mail'); - simplenews_delete_spool(array('mail'=>$result['email'])); + simplenews_delete_spool(array('mail'=>$email)); + watchdog("materio_user", "@mail rejected by mandrill, removed from simplenews spool", array("@mail"=>$email)); if ( in_array($result['status'], array('invalid')) ) { // unsubscribe user if mail does not exists - $subscriber = simplenews_subscriber_load_by_mail($result['email']); + $subscriber = simplenews_subscriber_load_by_mail($email); if ($subscriber) { simplenews_subscriber_delete($subscriber); } // disable user - $user = user_load_by_mail($result['email']); - $user->status = 0; - user_save($user->uid); + $user = user_load_by_mail($email); + // $user->status = 0; + user_save($user, array('status'=>0)); + + watchdog("materio_user", "@mail rejected as invalid by mandrill, removed from simplenews subscribers liste and user blocked", array("@mail"=>$email), WATCHDOG_WARNING, "/user/".$user->uid."/edit"); + } } }