GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

use user field rather than re-building sms email over and over

Browse Source 
darcs-hash:20080721040614-84dde-431def35d4e3c163df2b4f4e78bef7b3521be40a.gz
This commit is contained in:
Evan Prodromou 2008-07-21 00:06:14 -04:00
parent 0c0ac46f43
commit a4edf5daef
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/mail.php
View File

@ -175,19 +175,16 @@ function mail_broadcast_notice_sms($notice) {
function mail_send_notice($notice, $user) { function mail_send_notice($notice, $user) {
$profile = $user->getProfile(); $profile = $user->getProfile();
$name = $profile->getBestName(); $name = $profile->getBestName();
$carrier = Sms_carrier::staticGet($user->carrier);
$sms_email = $carrier->toEmailAddress($user->sms);
$to = $name . ' <' . $sms_email . '>'; $to = $name . ' <' . $sms_email . '>';
$other = $notice->getProfile(); $other = $notice->getProfile();
$headers = array(); $headers = array();
$headers['From'] = $user->incomingemail; $headers['From'] = $user->incomingemail;
$headers['To'] = $name . ' <' . $sms_email . '>'; $headers['To'] = $name . ' <' . $user->smsemail . '>';
$headers['Subject'] = sprintf(_('%s status on %s'), $headers['Subject'] = sprintf(_('%s status'),
$other->getBestName(), $other->getBestName());
common_exact_date($notice->created));
$body = $notice->content; $body = $notice->content;
mail_send($sms_email, $headers, $body); mail_send($user->smsemail, $headers, $body);
} }
function mail_confirm_sms($code, $nickname, $address) { function mail_confirm_sms($code, $nickname, $address) {
@ -198,7 +195,7 @@ function mail_confirm_sms($code, $nickname, $address) {
$headers['To'] = $nickname . ' <' . $address . '>'; $headers['To'] = $nickname . ' <' . $address . '>';
$headers['Subject'] = _('SMS confirmation'); $headers['Subject'] = _('SMS confirmation');
$body = "$nickname: confirm you own this number with this code:"; $body = "$nickname: confirm you own this phone number with this code:";
$body .= "\n\n"; $body .= "\n\n";
$body .= $code; $body .= $code;
$body .= "\n\n"; $body .= "\n\n";