add text-only email option
add a checkbok to notification settings. if checked, html body is not added to email.
This commit is contained in:
parent
c86d459b1d
commit
b2527039b7
|
@ -20,6 +20,11 @@ class Emailer {
|
||||||
|
|
||||||
call_hooks('emailer_send_prepare', $params);
|
call_hooks('emailer_send_prepare', $params);
|
||||||
|
|
||||||
|
$email_textonly = False;
|
||||||
|
if (x($params,"uid")) {
|
||||||
|
$email_textonly = get_pconfig($params['uid'], "system", "email_textonly");
|
||||||
|
}
|
||||||
|
|
||||||
$fromName = email_header_encode(html_entity_decode($params['fromName'],ENT_QUOTES,'UTF-8'),'UTF-8');
|
$fromName = email_header_encode(html_entity_decode($params['fromName'],ENT_QUOTES,'UTF-8'),'UTF-8');
|
||||||
$messageSubject = email_header_encode(html_entity_decode($params['messageSubject'],ENT_QUOTES,'UTF-8'),'UTF-8');
|
$messageSubject = email_header_encode(html_entity_decode($params['messageSubject'],ENT_QUOTES,'UTF-8'),'UTF-8');
|
||||||
|
|
||||||
|
@ -44,11 +49,16 @@ class Emailer {
|
||||||
"--" . $mimeBoundary . "\n" . // plain text section
|
"--" . $mimeBoundary . "\n" . // plain text section
|
||||||
"Content-Type: text/plain; charset=UTF-8\n" .
|
"Content-Type: text/plain; charset=UTF-8\n" .
|
||||||
"Content-Transfer-Encoding: base64\n\n" .
|
"Content-Transfer-Encoding: base64\n\n" .
|
||||||
$textBody . "\n" .
|
$textBody . "\n";
|
||||||
"--" . $mimeBoundary . "\n" . // text/html section
|
|
||||||
"Content-Type: text/html; charset=UTF-8\n" .
|
if (!$email_textonly && !is_null($htmlBody)){
|
||||||
"Content-Transfer-Encoding: base64\n\n" .
|
$multipartMessageBody .=
|
||||||
$htmlBody . "\n" .
|
"--" . $mimeBoundary . "\n" . // text/html section
|
||||||
|
"Content-Type: text/html; charset=UTF-8\n" .
|
||||||
|
"Content-Transfer-Encoding: base64\n\n" .
|
||||||
|
$htmlBody . "\n";
|
||||||
|
}
|
||||||
|
$multipartMessageBody .=
|
||||||
"--" . $mimeBoundary . "--\n"; // message ending
|
"--" . $mimeBoundary . "--\n"; // message ending
|
||||||
|
|
||||||
// send the message
|
// send the message
|
||||||
|
@ -58,6 +68,7 @@ class Emailer {
|
||||||
'body' => $multipartMessageBody,
|
'body' => $multipartMessageBody,
|
||||||
'headers' => $messageHeader
|
'headers' => $messageHeader
|
||||||
);
|
);
|
||||||
|
echo "<pre>"; var_dump($hookdata); killme();
|
||||||
call_hooks("emailer_send", $hookdata);
|
call_hooks("emailer_send", $hookdata);
|
||||||
$res = mail(
|
$res = mail(
|
||||||
$hookdata['to'], // send to address
|
$hookdata['to'], // send to address
|
||||||
|
|
|
@ -395,6 +395,8 @@ function settings_post(&$a) {
|
||||||
$post_joingroup = (($_POST['post_joingroup'] == 1) ? 1: 0);
|
$post_joingroup = (($_POST['post_joingroup'] == 1) ? 1: 0);
|
||||||
$post_profilechange = (($_POST['post_profilechange'] == 1) ? 1: 0);
|
$post_profilechange = (($_POST['post_profilechange'] == 1) ? 1: 0);
|
||||||
|
|
||||||
|
$email_textonly = (($_POST['email_textonly'] == 1) ? 1 : 0);
|
||||||
|
|
||||||
$notify = 0;
|
$notify = 0;
|
||||||
|
|
||||||
if(x($_POST,'notify1'))
|
if(x($_POST,'notify1'))
|
||||||
|
@ -495,6 +497,7 @@ function settings_post(&$a) {
|
||||||
set_pconfig(local_user(),'system','post_joingroup', $post_joingroup);
|
set_pconfig(local_user(),'system','post_joingroup', $post_joingroup);
|
||||||
set_pconfig(local_user(),'system','post_profilechange', $post_profilechange);
|
set_pconfig(local_user(),'system','post_profilechange', $post_profilechange);
|
||||||
|
|
||||||
|
set_pconfig(local_user(),'system','email_textonly', $email_textonly);
|
||||||
|
|
||||||
if($page_flags == PAGE_PRVGROUP) {
|
if($page_flags == PAGE_PRVGROUP) {
|
||||||
$hidewall = 1;
|
$hidewall = 1;
|
||||||
|
@ -1179,6 +1182,9 @@ function settings_content(&$a) {
|
||||||
'$notify7' => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''),
|
'$notify7' => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''),
|
||||||
'$notify8' => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''),
|
'$notify8' => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''),
|
||||||
|
|
||||||
|
'$email_textonly' => array('email_textonly', t('Text-only notification emails'),
|
||||||
|
get_pconfig(local_user(),'system','email_textonly'),
|
||||||
|
t('Send only text notification emails body, without the html part')),
|
||||||
|
|
||||||
'$h_advn' => t('Advanced Account/Page Type Settings'),
|
'$h_advn' => t('Advanced Account/Page Type Settings'),
|
||||||
'$h_descadvn' => t('Change the behaviour of this account for special situations'),
|
'$h_descadvn' => t('Change the behaviour of this account for special situations'),
|
||||||
|
|
|
@ -133,6 +133,8 @@
|
||||||
{{include file="field_intcheckbox.tpl" field=$notify8}}
|
{{include file="field_intcheckbox.tpl" field=$notify8}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{{include file="field_checkbox.tpl" field=$email_textonly}}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="settings-submit-wrapper" >
|
<div class="settings-submit-wrapper" >
|
||||||
|
|
|
@ -133,6 +133,8 @@
|
||||||
{{include file="field_intcheckbox.tpl" field=$notify8}}
|
{{include file="field_intcheckbox.tpl" field=$notify8}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{{include file="field_checkbox.tpl" field=$email_textonly}}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="settings-submit-wrapper" >
|
<div class="settings-submit-wrapper" >
|
||||||
|
|
|
@ -129,6 +129,8 @@
|
||||||
{{include file="field_intcheckbox.tpl" field=$notify8}}
|
{{include file="field_intcheckbox.tpl" field=$notify8}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{{include file="field_checkbox.tpl" field=$email_textonly}}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="settings-submit-wrapper" >
|
<div class="settings-submit-wrapper" >
|
||||||
|
|
Loading…
Reference in New Issue
Block a user