fix mail sending
darcs-hash:20080721090819-84dde-34f1d1a0c448296e124c172d234976fd5cdad32c.gz
This commit is contained in:
parent
98af7402c7
commit
289b64c94d
15
lib/mail.php
15
lib/mail.php
@ -170,11 +170,17 @@ function mail_broadcast_notice_sms($notice) {
|
|||||||
$cnt = $user->find();
|
$cnt = $user->find();
|
||||||
|
|
||||||
while ($user->fetch()) {
|
while ($user->fetch()) {
|
||||||
mail_send_sms_notice($notice, $user);
|
$success = mail_send_sms_notice($notice, $user);
|
||||||
|
if (!$success) {
|
||||||
|
common_log(LOG_ERR, 'Could not send SMS message to user', __FILE__);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
function mail_send_notice($notice, $user) {
|
function mail_send_sms_notice($notice, $user) {
|
||||||
$profile = $user->getProfile();
|
$profile = $user->getProfile();
|
||||||
$name = $profile->getBestName();
|
$name = $profile->getBestName();
|
||||||
$to = $name . ' <' . $user->smsemail . '>';
|
$to = $name . ' <' . $user->smsemail . '>';
|
||||||
@ -182,11 +188,12 @@ function mail_send_notice($notice, $user) {
|
|||||||
|
|
||||||
$headers = array();
|
$headers = array();
|
||||||
$headers['From'] = $user->incomingemail;
|
$headers['From'] = $user->incomingemail;
|
||||||
$headers['To'] = $name . ' <' . $user->smsemail . '>';
|
$headers['To'] = $to;
|
||||||
$headers['Subject'] = sprintf(_('%s status'),
|
$headers['Subject'] = sprintf(_('%s status'),
|
||||||
$other->getBestName());
|
$other->getBestName());
|
||||||
$body = $notice->content;
|
$body = $notice->content;
|
||||||
mail_send($user->smsemail, $headers, $body);
|
|
||||||
|
return mail_send($user->smsemail, $headers, $body);
|
||||||
}
|
}
|
||||||
|
|
||||||
function mail_confirm_sms($code, $nickname, $address) {
|
function mail_confirm_sms($code, $nickname, $address) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user