keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Dear $username not expanded/replaced in text emails

Browse source
This commit is contained in:
Friendika 2011-06-14 20:49:25 -07:00
parent fcdebc2324
commit ca84823437
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mod/dfrn_notify.php
View file

@ -217,6 +217,7 @@ function dfrn_notify_post(&$a) {
// load the template for private message notifications // load the template for private message notifications
$tpl = get_intltext_template('mail_received_html_body_eml.tpl'); $tpl = get_intltext_template('mail_received_html_body_eml.tpl');
$email_html_body_tpl = replace_macros($tpl,array( $email_html_body_tpl = replace_macros($tpl,array(
'$username' => $importer['username'],
'$siteName' => $a->config['sitename'], // name of this site '$siteName' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $importer['thumb'], // thumbnail url for sender icon '$thumb' => $importer['thumb'], // thumbnail url for sender icon
@ -232,6 +233,7 @@ function dfrn_notify_post(&$a) {
// load the template for private message notifications // load the template for private message notifications
$tpl = get_intltext_template('mail_received_text_body_eml.tpl'); $tpl = get_intltext_template('mail_received_text_body_eml.tpl');
$email_text_body_tpl = replace_macros($tpl,array( $email_text_body_tpl = replace_macros($tpl,array(
'$username' => $importer['username'],
'$siteName' => $a->config['sitename'], // name of this site '$siteName' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $importer['thumb'], // thumbnail url for sender icon '$thumb' => $importer['thumb'], // thumbnail url for sender icon
@ -416,6 +418,7 @@ function dfrn_notify_post(&$a) {
// load the template for private message notifications // load the template for private message notifications
$tpl = get_intltext_template('cmnt_received_html_body_eml.tpl'); $tpl = get_intltext_template('cmnt_received_html_body_eml.tpl');
$email_html_body_tpl = replace_macros($tpl,array( $email_html_body_tpl = replace_macros($tpl,array(
'$username' => $importer['username'],
'$sitename' => $a->config['sitename'], // name of this site '$sitename' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon '$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon
@ -429,6 +432,7 @@ function dfrn_notify_post(&$a) {
// load the template for private message notifications // load the template for private message notifications
$tpl = get_intltext_template('cmnt_received_text_body_eml.tpl'); $tpl = get_intltext_template('cmnt_received_text_body_eml.tpl');
$email_text_body_tpl = replace_macros($tpl,array( $email_text_body_tpl = replace_macros($tpl,array(
'$username' => $importer['username'],
'$sitename' => $a->config['sitename'], // name of this site '$sitename' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon '$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon
@ -545,6 +549,7 @@ function dfrn_notify_post(&$a) {
// load the template for private message notifications // load the template for private message notifications
$tpl = get_intltext_template('cmnt_received_html_body_eml.tpl'); $tpl = get_intltext_template('cmnt_received_html_body_eml.tpl');
$email_html_body_tpl = replace_macros($tpl,array( $email_html_body_tpl = replace_macros($tpl,array(
'$username' => $importer['username'],
'$sitename' => $a->config['sitename'], // name of this site '$sitename' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon '$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon
@ -557,6 +562,7 @@ function dfrn_notify_post(&$a) {
// load the template for private message notifications // load the template for private message notifications
$tpl = get_intltext_template('cmnt_received_text_body_eml.tpl'); $tpl = get_intltext_template('cmnt_received_text_body_eml.tpl');
$email_text_body_tpl = replace_macros($tpl,array( $email_text_body_tpl = replace_macros($tpl,array(
'$username' => $importer['username'],
'$sitename' => $a->config['sitename'], // name of this site '$sitename' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon '$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon

4
mod/item.php
View file

@ -544,6 +544,7 @@ function item_post(&$a) {
// load the template for private message notifications // load the template for private message notifications
$tpl = get_intltext_template('cmnt_received_html_body_eml.tpl'); $tpl = get_intltext_template('cmnt_received_html_body_eml.tpl');
$email_html_body_tpl = replace_macros($tpl,array( $email_html_body_tpl = replace_macros($tpl,array(
'$username' => $user['username'],
'$sitename' => $a->config['sitename'], // name of this site '$sitename' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $author['thumb'], // thumbnail url for sender icon '$thumb' => $author['thumb'], // thumbnail url for sender icon
@ -557,6 +558,7 @@ function item_post(&$a) {
// load the template for private message notifications // load the template for private message notifications
$tpl = get_intltext_template('cmnt_received_text_body_eml.tpl'); $tpl = get_intltext_template('cmnt_received_text_body_eml.tpl');
$email_text_body_tpl = replace_macros($tpl,array( $email_text_body_tpl = replace_macros($tpl,array(
'$username' => $user['username'],
'$sitename' => $a->config['sitename'], // name of this site '$sitename' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $author['thumb'], // thumbnail url for sender icon '$thumb' => $author['thumb'], // thumbnail url for sender icon
@ -610,6 +612,7 @@ function item_post(&$a) {
// load the template for private message notifications // load the template for private message notifications
$tpl = load_view_file('view/wall_received_html_body_eml.tpl'); $tpl = load_view_file('view/wall_received_html_body_eml.tpl');
$email_html_body_tpl = replace_macros($tpl,array( $email_html_body_tpl = replace_macros($tpl,array(
'$username' => $user['username'],
'$sitename' => $a->config['sitename'], // name of this site '$sitename' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $author['thumb'], // thumbnail url for sender icon '$thumb' => $author['thumb'], // thumbnail url for sender icon
@ -622,6 +625,7 @@ function item_post(&$a) {
// load the template for private message notifications // load the template for private message notifications
$tpl = load_view_file('view/wall_received_text_body_eml.tpl'); $tpl = load_view_file('view/wall_received_text_body_eml.tpl');
$email_text_body_tpl = replace_macros($tpl,array( $email_text_body_tpl = replace_macros($tpl,array(
'$username' => $user['username'],
'$sitename' => $a->config['sitename'], // name of this site '$sitename' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $author['thumb'], // thumbnail url for sender icon '$thumb' => $author['thumb'], // thumbnail url for sender icon