bachir/materio-base-d7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated mailgun, mailsystem, honeypot, googleanalitycs, features, content_taxonomy

Browse Source
This commit is contained in:
bachir
2019-05-13 17:55:28 +02:00
parent 2ffad14939
commit e08a2639c6
54 changed files with 1911 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sites/all/modules/contrib/mail/mailgun/mailgun.mail.inc
+77 -23
View File
@@ -2,14 +2,14 @@
/**
* @file
* Implements Mailgun as a Drupal MailSystemInterface
* Implements Mailgun as a Drupal MailSystemInterface.
*/
/**
* Modify the Drupal mail system to use Mailgun when sending e-mails.
*/
class MailgunMailSystem implements MailSystemInterface {
/**
* Concatenate and wrap the e-mail body for either plain-text or HTML e-mails.
*
@@ -25,26 +25,34 @@ class MailgunMailSystem implements MailSystemInterface {
$message['body'] = implode("\n\n", $message['body']);
}
// If a text format is specified in Mailgun settings, run the message through it.
// Run the message through text format if specified in Mailgun settings.
$format = variable_get('mailgun_format', '_none');
if ($format != '_none') {
if ($format !== '_none') {
$message['body'] = check_markup($message['body'], $format);
}
// Wrap body with theme function.
$message['body'] = theme('mailgun_message', array(
'subject' => $message['subject'],
'body' => $message['body'],
'message' => $message,
));
return $message;
}
/**
* Send the e-mail message.
*
* @see drupal_mail()
* @see https://documentation.mailgun.com/api-sending.html#sending
*
* @param array $message
* A message array, as described in hook_mail_alter(). $message['params'] may contain additional parameters. See mailgun_send().
* A message array, as described in hook_mail_alter(). $message['params']
* may contain additional parameters. See mailgun_send().
*
* @return bool
* TRUE if the mail was successfully accepted or queued, FALSE otherwise.
*
* @see drupal_mail()
* @see https://documentation.mailgun.com/api-sending.html#sending
*/
public function mail(array $message) {
// Build the Mailgun message array.
@@ -52,7 +60,7 @@ class MailgunMailSystem implements MailSystemInterface {
'from' => $message['from'],
'to' => $message['to'],
'subject' => $message['subject'],
'text' => check_plain($message['body']),
'text' => drupal_html_to_text($message['body']),
'html' => $message['body'],
);
@@ -72,23 +80,32 @@ class MailgunMailSystem implements MailSystemInterface {
$params = array();
// Populate default settings.
if ($variable = variable_get('mailgun_tracking', 'default') != 'default') {
$params['o:tracking'] = $variable;
if (($variable = variable_get('mailgun_tracking', 'default')) !== 'default') {
$params['o:tracking'] = ($variable === 'enabled');
}
if ($variable = variable_get('mailgun_tracking_clicks', 'default') != 'default') {
$params['o:tracking-clicks'] = $variable;
if (($variable = variable_get('mailgun_tracking_clicks', 'default')) !== 'default') {
$params['o:tracking-clicks'] = ($variable === 'enabled');
}
if ($variable = variable_get('mailgun_tracking_opens', 'default') != 'default') {
$params['o:tracking-opens'] = $variable;
if (($variable = variable_get('mailgun_tracking_opens', 'default')) !== 'default') {
$params['o:tracking-opens'] = ($variable === 'enabled');
}
// For a full list of allowed parameters, see: https://documentation.mailgun.com/api-sending.html#sending.
$allowed_params = array('o:tag', 'o:campaign', 'o:deliverytime', 'o:dkim', 'o:testmode', 'o:tracking', 'o:tracking-clicks', 'o:tracking-opens');
// For a full list of allowed parameters,
// see: https://documentation.mailgun.com/api-sending.html#sending.
$allowed_params = array(
'o:tag',
'o:campaign',
'o:deliverytime',
'o:dkim',
'o:testmode',
'o:tracking',
'o:tracking-clicks',
'o:tracking-opens',
);
foreach ($message['params'] as $key => $value) {
// Check if it's one of the known parameters.
$allowed = (in_array($key, $allowed_params)) ? TRUE : FALSE;
// If more options become available but are not yet supported by the module, uncomment the following line.
//$allowed = (substr($key, 0, 2) == 'o:') ? TRUE : FALSE;
$allowed = in_array($key, $allowed_params) ? TRUE : FALSE;
if ($allowed) {
$params[$key] = $value;
}
@@ -96,14 +113,51 @@ class MailgunMailSystem implements MailSystemInterface {
if (substr($key, 0, 2) == 'h:' || substr($key, 0, 2) == 'v:') {
$params[$key] = $value;
}
// Add additional HIME headers, like Reply-to if it exists.
if ($key === 'headers' && is_array($value)) {
foreach ($value as $headers_key => $headers_value) {
$params['h:' . $headers_key] = $headers_value;
}
}
}
// Add default tags by mail key if enabled.
if (variable_get('mailgun_tagging_mailkey', TRUE)) {
$params['o:tag'][] = $message['id'];
}
// Make sure the files provided in the attachments array exist.
if (!empty($message['params']['attachments'])) {
$params['attachments'] = array();
$params['attachment'] = array();
foreach ($message['params']['attachments'] as $attachment) {
if (file_exists($attachment)) {
$params['attachments'][] = $attachment;
if (is_array($attachment)) {
// `filecontent` attachment key can be used by MimeMail as data
// of the related file.
if (array_key_exists('filecontent', $attachment)) {
$temp_file = tmpfile();
fwrite($temp_file, $attachment['filecontent']);
$temp_f_meta_data = stream_get_meta_data($temp_file);
$_attachment = array(
'filePath' => $temp_f_meta_data['uri'],
);
if (array_key_exists('filename', $attachment)) {
$_attachment['remoteName'] = $attachment['filename'];
}
$params['attachment'][] = $_attachment;
}
elseif (array_key_exists('filepath', $attachment) && file_exists($attachment['filepath'])) {
$_attachment = array(
'filePath' => $attachment['filepath'],
);
if (array_key_exists('filename', $attachment)) {
$_attachment['remoteName'] = $attachment['filename'];
}
$params['attachment'][] = $_attachment;
}
}
elseif (file_exists($attachment)) {
$params['attachment'][] = $attachment;
}
}
}