mirror of https://github.com/friendica/friendica
image updates
This commit is contained in:
Chris Case
parent
dfc05af73b
commit
2cf696d0b5
|
|
@ -374,6 +374,7 @@ 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 = load_view_file('view/cmnt_received_eml.tpl');
|
||||
$email_tpl = replace_macros($tpl, array(
|
||||
'$sitename' => $a->config['sitename'],
|
||||
|
|
@ -387,6 +388,60 @@ function dfrn_notify_post(&$a) {
|
|||
|
||||
$res = mail($importer['email'], $from . t(' commented on an item at ') . $a->config['sitename'],
|
||||
$email_tpl, "From: " . t('Administrator') . '@' . $a->get_hostname() );
|
||||
*/
|
||||
// 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 = load_view_file('view/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 = load_view_file('view/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,
|
||||
));
|
||||
|
||||
// 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
|
||||
);
|
||||
|
||||
}
|
||||
}
|
||||
xml_status(0);
|
||||
|
|
@ -449,7 +504,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'])
|
||||
);
|
||||
|
|
@ -460,6 +515,7 @@ function dfrn_notify_post(&$a) {
|
|||
continue;
|
||||
require_once('bbcode.php');
|
||||
$from = stripslashes($datarray['author-name']);
|
||||
/*
|
||||
$tpl = load_view_file('view/cmnt_received_eml.tpl');
|
||||
$email_tpl = replace_macros($tpl, array(
|
||||
'$sitename' => $a->config['sitename'],
|
||||
|
|
@ -474,6 +530,61 @@ function dfrn_notify_post(&$a) {
|
|||
$res = mail($importer['email'], $from . t(" commented on an item at ")
|
||||
. $a->config['sitename'],
|
||||
$email_tpl,t("From: Administrator@") . $a->get_hostname() );
|
||||
*/
|
||||
|
||||
|
||||
|
||||
// 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 = load_view_file('view/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 = load_view_file('view/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,
|
||||
));
|
||||
|
||||
// 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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
110
mod/item.php
110
mod/item.php
|
|
@ -408,6 +408,7 @@ function item_post(&$a) {
|
|||
if(($user['notify-flags'] & NOTIFY_COMMENT) && ($contact_record != $author)) {
|
||||
require_once('bbcode.php');
|
||||
$from = $author['name'];
|
||||
/*
|
||||
$tpl = load_view_file('view/cmnt_received_eml.tpl');
|
||||
$email_tpl = replace_macros($tpl, array(
|
||||
'$sitename' => $a->config['sitename'],
|
||||
|
|
@ -420,7 +421,60 @@ function item_post(&$a) {
|
|||
));
|
||||
|
||||
$res = mail($user['email'], $from . t(" commented on your item at ") . $a->config['sitename'],
|
||||
$email_tpl,t("From: Administrator@") . $a->get_hostname() );
|
||||
$email_tpl,t("From: Administrator@") . $a->get_hostname() );
|
||||
*/
|
||||
// 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 = load_view_file('view/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 = load_view_file('view/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,
|
||||
));
|
||||
|
||||
// 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 {
|
||||
|
|
@ -431,6 +485,7 @@ function item_post(&$a) {
|
|||
if(($user['notify-flags'] & NOTIFY_WALL) && ($contact_record != $author)) {
|
||||
require_once('bbcode.php');
|
||||
$from = $author['name'];
|
||||
/*
|
||||
$tpl = load_view_file('view/wall_received_eml.tpl');
|
||||
$email_tpl = replace_macros($tpl, array(
|
||||
'$sitename' => $a->config['sitename'],
|
||||
|
|
@ -444,6 +499,59 @@ function item_post(&$a) {
|
|||
|
||||
$res = mail($user['email'], $from . t(" posted on your profile wall at ") . $a->config['sitename'],
|
||||
$email_tpl,t("From: Administrator@") . $a->get_hostname() );
|
||||
*/
|
||||
|
||||
|
||||
// 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,
|
||||
));
|
||||
|
||||
// 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
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue