diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/dfrn_notify.php | 132 | ||||
| -rw-r--r-- | mod/item.php | 131 |
2 files changed, 203 insertions, 60 deletions
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 9ea980338..6709ed275 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -389,22 +389,59 @@ function dfrn_notify_post(&$a) { if((! $is_like) && ($importer['notify-flags'] & NOTIFY_COMMENT) && (! $importer['self'])) { require_once('bbcode.php'); $from = stripslashes($datarray['author-name']); - $tpl = get_intltext_template('cmnt_received_eml.tpl'); - $email_tpl = replace_macros($tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $importer['username'], - '$email' => $importer['email'], - '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id, - '$from' => $from, - '$body' => html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8') + + // name of the automated email sender + $msg['notificationfromname'] = stripslashes($datarray['author-name']);; + // noreply address to send from + $msg['notificationfromemail'] = t('noreply') . '@' . $a->get_hostname(); + + // text version + // process the message body to display properly in text mode + $msg['textversion'] + = html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8'); + + // html version + // process the message body to display properly in text mode + $msg['htmlversion'] + = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body'])))); + + // load the template for private message notifications + $tpl = get_intltext_template('cmnt_received_html_body_eml.tpl'); + $email_html_body_tpl = replace_macros($tpl,array( + '$sitename' => $a->config['sitename'], // name of this site + '$siteurl' => $a->get_baseurl(), // descriptive url of this site + '$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon + '$email' => $importer['email'], // email address to send to + '$url' => $datarray['author-link'], // full url for the site + '$from' => $from, // name of the person sending the message + '$body' => 'q1' .$msg['htmlversion'], // html version of the message + '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r, + )); + + // load the template for private message notifications + $tpl = get_intltext_template('cmnt_received_text_body_eml.tpl'); + $email_text_body_tpl = replace_macros($tpl,array( + '$sitename' => $a->config['sitename'], // name of this site + '$siteurl' => $a->get_baseurl(), // descriptive url of this site + '$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon + '$email' => $importer['email'], // email address to send to + '$url' => $datarray['author-link'], // full url for the site + '$from' => $from, // name of the person sending the message + '$body' => $msg['textversion'], // text version of the message + '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r, )); - - $res = mail($importer['email'], sprintf(t('%s commented on an item at %s'), $from , $a->config['sitename']), - $email_tpl, - 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); + + // use the EmailNotification library to send the message + require_once("include/EmailNotification.php"); + EmailNotification::sendTextHtmlEmail( + $msg['notificationfromname'], + t("Administrator@") . $a->get_hostname(), + t("noreply") . '@' . $a->get_hostname(), + $importer['email'], + $from . t(" commented on an item at ") . $a->config['sitename'], + $email_html_body_tpl, + $email_text_body_tpl + ); } } @@ -468,7 +505,7 @@ function dfrn_notify_post(&$a) { if(($datarray['type'] != 'activity') && ($importer['notify-flags'] & NOTIFY_COMMENT)) { - $myconv = q("SELECT `author-link` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ", + $myconv = q("SELECT `author-link`, `author-avatar` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ", dbesc($parent_uri), intval($importer['importer_uid']) ); @@ -479,22 +516,57 @@ function dfrn_notify_post(&$a) { continue; require_once('bbcode.php'); $from = stripslashes($datarray['author-name']); - $tpl = get_intltext_template('cmnt_received_eml.tpl'); - $email_tpl = replace_macros($tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $importer['username'], - '$email' => $importer['email'], - '$from' => $from, - '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r, - '$body' => html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8') + + // name of the automated email sender + $msg['notificationfromname'] = stripslashes($datarray['author-name']);; + // noreply address to send from + $msg['notificationfromemail'] = t('noreply') . '@' . $a->get_hostname(); + + // text version + // process the message body to display properly in text mode + $msg['textversion'] + = html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8'); + + // html version + // process the message body to display properly in text mode + $msg['htmlversion'] + = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body'])))); + + // load the template for private message notifications + $tpl = get_intltext_template('cmnt_received_html_body_eml.tpl'); + $email_html_body_tpl = replace_macros($tpl,array( + '$sitename' => $a->config['sitename'], // name of this site + '$siteurl' => $a->get_baseurl(), // descriptive url of this site + '$thumb' => $conv['author-avatar'], // thumbnail url for sender icon + '$url' => $conv['author-link'], // full url for the site + '$from' => $from, // name of the person sending the message + '$body' => $msg['htmlversion'], // html version of the message + '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r, + )); + + // load the template for private message notifications + $tpl = get_intltext_template('cmnt_received_text_body_eml.tpl'); + $email_text_body_tpl = replace_macros($tpl,array( + '$sitename' => $a->config['sitename'], // name of this site + '$siteurl' => $a->get_baseurl(), // descriptive url of this site + '$thumb' => $conv['author-avatar'], // thumbnail url for sender icon + '$url' => $conv['author-link'], // full url for the site + '$from' => $from, // name of the person sending the message + '$body' => $msg['textversion'], // text version of the message + '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r, )); - $res = mail($importer['email'], sprintf( t("%s commented on an item at %s") , $from ,$a->config['sitename']), - $email_tpl, - 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); + // use the EmailNotification library to send the message + require_once("include/EmailNotification.php"); + EmailNotification::sendTextHtmlEmail( + $msg['notificationfromname'], + t("Administrator@") . $a->get_hostname(), + t("noreply") . '@' . $a->get_hostname(), + $importer['email'], + $from . t(" commented on an item at ") . $a->config['sitename'], + $email_html_body_tpl, + $email_text_body_tpl + ); break; } diff --git a/mod/item.php b/mod/item.php index 62899868e..0b5e32e88 100644 --- a/mod/item.php +++ b/mod/item.php @@ -464,22 +464,59 @@ function item_post(&$a) { if(($user['notify-flags'] & NOTIFY_COMMENT) && ($contact_record != $author)) { require_once('bbcode.php'); $from = $author['name']; - $tpl = get_intltext_template('cmnt_received_eml.tpl'); - $email_tpl = replace_macros($tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $user['username'], - '$email' => $user['email'], - '$from' => $from, - '$display' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id, - '$body' => strip_tags(bbcode($datarray['body'])) + + // name of the automated email sender + $msg['notificationfromname'] = stripslashes($datarray['author-name']);; + // noreply address to send from + $msg['notificationfromemail'] = t('noreply') . '@' . $a->get_hostname(); + + // text version + // process the message body to display properly in text mode + $msg['textversion'] + = html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8'); + + // html version + // process the message body to display properly in text mode + $msg['htmlversion'] + = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body'])))); + + // load the template for private message notifications + $tpl = get_intltext_template('cmnt_received_html_body_eml.tpl'); + $email_html_body_tpl = replace_macros($tpl,array( + '$sitename' => $a->config['sitename'], // name of this site + '$siteurl' => $a->get_baseurl(), // descriptive url of this site + '$thumb' => $conv['author-avatar'], // thumbnail url for sender icon + '$email' => $importer['email'], // email address to send to + '$url' => $conv['author-link'], // full url for the site + '$from' => $from, // name of the person sending the message + '$body' => $msg['htmlversion'], // html version of the message + '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r, + )); + + // load the template for private message notifications + $tpl = get_intltext_template('cmnt_received_text_body_eml.tpl'); + $email_text_body_tpl = replace_macros($tpl,array( + '$sitename' => $a->config['sitename'], // name of this site + '$siteurl' => $a->get_baseurl(), // descriptive url of this site + '$thumb' => $conv['author-avatar'], // thumbnail url for sender icon + '$email' => $importer['email'], // email address to send to + '$url' => $conv['author-link'], // full url for the site + '$from' => $from, // name of the person sending the message + '$body' => $msg['textversion'], // text version of the message + '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r, )); - $res = mail($user['email'], sprintf( t("%s commented on your item at %s") ,$from,$a->config['sitename']), - $email_tpl, - 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); + // use the EmailNotification library to send the message + require_once("include/EmailNotification.php"); + EmailNotification::sendTextHtmlEmail( + $msg['notificationfromname'], + t("Administrator@") . $a->get_hostname(), + t("noreply") . '@' . $a->get_hostname(), + $user['email'], + $from . t(" commented on an item at ") . $a->config['sitename'], + $email_html_body_tpl, + $email_text_body_tpl + ); } } else { @@ -490,23 +527,57 @@ function item_post(&$a) { if(($user['notify-flags'] & NOTIFY_WALL) && ($contact_record != $author)) { require_once('bbcode.php'); $from = $author['name']; - $tpl = get_intltext_template('wall_received_eml.tpl'); - $email_tpl = replace_macros($tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $user['username'], - '$email' => $user['email'], - '$from' => $from, - '$display' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id, - '$body' => strip_tags(bbcode($datarray['body'])) + + // name of the automated email sender + $msg['notificationfromname'] = $from; + // noreply address to send from + $msg['notificationfromemail'] = t('noreply') . '@' . $a->get_hostname(); + + // text version + // process the message body to display properly in text mode + $msg['textversion'] + = html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8'); + + // html version + // process the message body to display properly in text mode + $msg['htmlversion'] + = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body'])))); + + // load the template for private message notifications + $tpl = load_view_file('view/wall_received_html_body_eml.tpl'); + $email_html_body_tpl = replace_macros($tpl,array( + '$sitename' => $a->config['sitename'], // name of this site + '$siteurl' => $a->get_baseurl(), // descriptive url of this site + '$thumb' => $conv['author-avatar'], // thumbnail url for sender icon + '$url' => $conv['author-link'], // full url for the site + '$from' => $from, // name of the person sending the message + '$body' => $msg['htmlversion'], // html version of the message + '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r, + )); + + // load the template for private message notifications + $tpl = load_view_file('view/wall_received_text_body_eml.tpl'); + $email_text_body_tpl = replace_macros($tpl,array( + '$sitename' => $a->config['sitename'], // name of this site + '$siteurl' => $a->get_baseurl(), // descriptive url of this site + '$thumb' => $conv['author-avatar'], // thumbnail url for sender icon + '$url' => $conv['author-link'], // full url for the site + '$from' => $from, // name of the person sending the message + '$body' => $msg['textversion'], // text version of the message + '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r, )); - $res = mail($user['email'], sprintf( t("%s posted on your profile wall at %s") ,$from, $a->config['sitename']), - $email_tpl, - 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); - + // use the EmailNotification library to send the message + require_once("include/EmailNotification.php"); + EmailNotification::sendTextHtmlEmail( + $msg['notificationfromname'], + t("Administrator@") . $a->get_hostname(), + t("noreply") . '@' . $a->get_hostname(), + $user['email'], + $from . t(" commented on an item at ") . $a->config['sitename'], + $email_html_body_tpl, + $email_text_body_tpl + ); } } @@ -682,4 +753,4 @@ function item_content(&$a) { //NOTREACHED } } -}
\ No newline at end of file +} |