X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fmail.php;h=188792d02a0511fab7493318435a05604a8bb50a;hb=1ae5ea8f4cf40113a14a183b754101177f99ba32;hp=c93464a58682f33ac1a64255b4c49885c44518f5;hpb=dcbf2f6871de7cd26815334b6977792e2b2f31df;p=quix0rs-gnu-social.git diff --git a/lib/mail.php b/lib/mail.php index c93464a586..188792d02a 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -50,9 +50,7 @@ function mail_backend() if (!$backend) { $backend = Mail::factory(common_config('mail', 'backend'), - (common_config('mail', 'params')) ? - common_config('mail', 'params') : - array()); + common_config('mail', 'params') ?: array()); if (PEAR::isError($backend)) { common_server_error($backend->getMessage(), 500); } @@ -150,6 +148,7 @@ function mail_to_user(&$user, $subject, $body, $headers=array(), $address=null) $recipients = $address; $profile = $user->getProfile(); + $headers['Date'] = date("r", time()); $headers['From'] = mail_notify_from(); $headers['To'] = $profile->getBestName() . ' <' . $address . '>'; $headers['Subject'] = $subject; @@ -439,14 +438,26 @@ function mail_broadcast_notice_sms($notice) $user = new User(); $UT = common_config('db','type')=='pgsql'?'"user"':'user'; + $replies = $notice->getReplies(); $user->query('SELECT nickname, smsemail, incomingemail ' . - "FROM $UT JOIN subscription " . + "FROM $UT LEFT OUTER JOIN subscription " . "ON $UT.id = subscription.subscriber " . - 'WHERE subscription.subscribed = ' . $notice->profile_id . ' ' . + 'AND subscription.subscribed = ' . $notice->profile_id . ' ' . 'AND subscription.subscribed != subscription.subscriber ' . + // Users (other than the sender) who `want SMS notices': + "WHERE $UT.id != " . $notice->profile_id . ' ' . "AND $UT.smsemail IS NOT null " . "AND $UT.smsnotify = 1 " . - 'AND subscription.sms = 1 '); + // ... where either the user _is_ subscribed to the sender + // (any of the "subscription" fields IS NOT null) + // and wants to get SMS for all of this scribe's notices... + 'AND (subscription.sms = 1 ' . + // ... or where the user was mentioned in + // or replied-to with the notice: + ($replies ? sprintf("OR $UT.id in (%s)", + implode(',', $replies)) + : '') . + ')'); while ($user->fetch()) { common_log(LOG_INFO, @@ -609,11 +620,11 @@ function mail_notify_nudge($from, $to) function mail_notify_message($message, $from=null, $to=null) { if (is_null($from)) { - $from = User::staticGet('id', $message->from_profile); + $from = User::getKV('id', $message->from_profile); } if (is_null($to)) { - $to = User::staticGet('id', $message->to_profile); + $to = User::getKV('id', $message->to_profile); } if (is_null($to->email) || !$to->emailnotifymsg) { @@ -649,69 +660,6 @@ function mail_notify_message($message, $from=null, $to=null) return mail_to_user($to, $subject, $body, $headers); } -/** - * Notify a user that one of their notices has been chosen as a 'fave' - * - * Doesn't check that the user has an email address nor if they - * want to receive notification of faves. Maybe this happens higher - * up the stack...? - * - * @param User $other The user whose notice was faved - * @param User $user The user who faved the notice - * @param Notice $notice The notice that was faved - * - * @return void - */ -function mail_notify_fave($other, $user, $notice) -{ - if (!$user->hasRight(Right::EMAILONFAVE)) { - return; - } - - $profile = $user->getProfile(); - if ($other->hasBlocked($profile)) { - // If the author has blocked us, don't spam them with a notification. - return; - } - - $bestname = $profile->getBestName(); - - common_switch_locale($other->language); - - // TRANS: Subject for favorite notification e-mail. - // TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname. - $subject = sprintf(_('%1$s (@%2$s) added your notice as a favorite'), $bestname, $user->nickname); - - // TRANS: Body for favorite notification e-mail. - // TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created, - // TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text, - // TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename, - // TRANS: %7$s is the adding user's nickname. - $body = sprintf(_("%1\$s (@%7\$s) just added your notice from %2\$s". - " as one of their favorites.\n\n" . - "The URL of your notice is:\n\n" . - "%3\$s\n\n" . - "The text of your notice is:\n\n" . - "%4\$s\n\n" . - "You can see the list of %1\$s's favorites here:\n\n" . - "%5\$s"), - $bestname, - common_exact_date($notice->created), - common_local_url('shownotice', - array('notice' => $notice->id)), - $notice->content, - common_local_url('showfavorites', - array('nickname' => $user->nickname)), - common_config('site', 'name'), - $user->nickname) . - mail_footer_block(); - - $headers = _mail_prepare_headers('fave', $other->nickname, $user->nickname); - - common_switch_locale(); - mail_to_user($other, $subject, $body, $headers); -} - /** * Notify a user that they have received an "attn:" message AKA "@-reply" * @@ -722,7 +670,7 @@ function mail_notify_fave($other, $user, $notice) */ function mail_notify_attn($user, $notice) { - if (!$user->email || !$user->emailnotifyattn) { + if (!$user->receivesEmailNotifications()) { return; } @@ -732,10 +680,16 @@ function mail_notify_attn($user, $notice) return; } + // See if the notice's author who mentions this user is sandboxed if (!$sender->hasRight(Right::EMAILONREPLY)) { return; } + // If the author has blocked the author, don't spam them with a notification. + if ($user->hasBlocked($sender)) { + return; + } + $bestname = $sender->getBestName(); common_switch_locale($user->language); @@ -819,7 +773,7 @@ function mail_notify_group_join($group, $joiner) $admin = $group->getAdmins(); while ($admin->fetch()) { // We need a local user for email notifications... - $adminUser = User::staticGet('id', $admin->id); + $adminUser = User::getKV('id', $admin->id); // @fixme check for email preference? if ($adminUser && $adminUser->email) { // use the recipient's localization @@ -831,7 +785,7 @@ function mail_notify_group_join($group, $joiner) // TRANS: Subject of group join notification e-mail. // TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename. $headers['Subject'] = sprintf(_('%1$s has joined '. - 'your group %2$s on %3$s.'), + 'your group %2$s on %3$s'), $joiner->getBestName(), $group->getBestName(), common_config('site', 'name')); @@ -866,7 +820,7 @@ function mail_notify_group_join_pending($group, $joiner) $admin = $group->getAdmins(); while ($admin->fetch()) { // We need a local user for email notifications... - $adminUser = User::staticGet('id', $admin->id); + $adminUser = User::getKV('id', $admin->id); // @fixme check for email preference? if ($adminUser && $adminUser->email) { // use the recipient's localization