aboutsummaryrefslogtreecommitdiffstats
path: root/mod/invite.php
diff options
context:
space:
mode:
authorChris Case <kahotep@bunda.dreamhost.com>2011-05-21 21:40:16 -0700
committerChris Case <kahotep@bunda.dreamhost.com>2011-05-21 21:40:16 -0700
commit4cff911939b263993eb41682ca558c975e2db01f (patch)
tree78f58e08d04413827744689d0f5df7660bee6caa /mod/invite.php
parent2cf696d0b5d647e1741d2f94ee379aa19b25ae1b (diff)
parentf3f063c0dd7fd8b706987b856d79c7b58924acbb (diff)
downloadvolse-hubzilla-4cff911939b263993eb41682ca558c975e2db01f.tar.gz
volse-hubzilla-4cff911939b263993eb41682ca558c975e2db01f.tar.bz2
volse-hubzilla-4cff911939b263993eb41682ca558c975e2db01f.zip
merged multipart email changes
Diffstat (limited to 'mod/invite.php')
-rw-r--r--mod/invite.php18
1 files changed, 11 insertions, 7 deletions
diff --git a/mod/invite.php b/mod/invite.php
index f67432746..b34bb7d74 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -25,21 +25,25 @@ function invite_post(&$a) {
$recip = trim($recip);
if(! valid_email($recip)) {
- notice( $recip . t(' : ') . t('Not a valid email address.') . EOL);
+ notice( sprintf( t('%s : Not a valid email address.'), $recip) . EOL);
continue;
}
- $res = mail($recip, t('Please join my network on ') . $a->config['sitename'],
- $message, "From: " . $a->user['email']);
+ $res = mail($recip, sprintf(t('Please join my network on %s'), $a->config['sitename']),
+ $message,
+ "From: " . $a->user['email'] . "\n"
+ . 'Content-type: text/plain; charset=UTF-8' . "\n"
+ . 'Content-transfer-encoding: 8bit' );
+
if($res) {
$total ++;
}
else {
- notice( $recip . t(' : ') . t('Message delivery failed.') . EOL);
+ notice( sprintf( t('%s : Message delivery failed.'), $recip) . EOL);
}
}
- notice( $total . t(' messages sent.') . EOL);
+ notice( sprintf( tt("%d message sent.", "%d messages sent.", $total) , $total) . EOL);
return;
}
@@ -51,13 +55,13 @@ function invite_content(&$a) {
return;
}
- $tpl = load_view_file('view/invite.tpl');
+ $tpl = get_markup_template('invite.tpl');
$o = replace_macros($tpl, array(
'$invite' => t('Send invitations'),
'$addr_text' => t('Enter email addresses, one per line:'),
'$msg_text' => t('Your message:'),
- '$default_message' => t('Please join my social network on ') . $a->config['sitename'] . "\r\n" . "\r\n"
+ '$default_message' => sprintf(t('Please join my social network on %s'), $a->config['sitename']) . "\r\n" . "\r\n"
. t('To accept this invitation, please visit:') . "\r\n" . "\r\n" . $a->get_baseurl()
. "\r\n" . "\r\n" . t('Once you have registered, please connect with me via my profile page at:')
. "\r\n" . "\r\n" . $a->get_baseurl() . '/profile/' . $a->user['nickname'] ,