friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

bracings

pull/601/head
Tobias Diekershoff 2018-05-14 07:02:31 +02:00
parent a74dbd6ad0
commit c297dfb24f
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
notifyall/notifyall.php
View File

@ -33,29 +33,25 @@ function notifyall_addon_admin(App $a, &$o)
function notifyall_post(App $a) function notifyall_post(App $a)
{ {
if(!is_site_admin()) if(!is_site_admin()) {
{
return; return;
} }
$text = trim($_REQUEST['text']); $text = trim($_REQUEST['text']);
if(! $text) if(! $text) {
{
return; return;
} }
$sitename = $a->config['sitename']; $sitename = $a->config['sitename'];
if (empty($a->config['admin_name'])) if (empty($a->config['admin_name'])) {
{
$sender_name = '"' . L10n::t('%s Administrator', $sitename) . '"'; $sender_name = '"' . L10n::t('%s Administrator', $sitename) . '"';
} else { } else {
$sender_name = '"' . L10n::t('%1$s, %2$s Administrator', $a->config['admin_name'], $sitename) . '"'; $sender_name = '"' . L10n::t('%1$s, %2$s Administrator', $a->config['admin_name'], $sitename) . '"';
} }
if (! x($a->config['sender_email'])) if (! x($a->config['sender_email'])) {
{
$sender_email = 'noreply@' . $a->get_hostname(); $sender_email = 'noreply@' . $a->get_hostname();
} else { } else {
$sender_email = $a->config['sender_email']; $sender_email = $a->config['sender_email'];
@ -70,8 +66,7 @@ function notifyall_post(App $a)
// if this is a test, send it only to the admin(s) // if this is a test, send it only to the admin(s)
// admin_email might be a comma separated list, but we need "a@b','c@d','e@f // admin_email might be a comma separated list, but we need "a@b','c@d','e@f
if (intval($_REQUEST['test'])) if (intval($_REQUEST['test'])) {
{
$email = $a->config['admin_email']; $email = $a->config['admin_email'];
$email = "'" . str_replace([" ",","], ["","','"], $email) . "'"; $email = "'" . str_replace([" ",","], ["","','"], $email) . "'";
} }
@ -79,14 +74,12 @@ function notifyall_post(App $a)
$recips = q("SELECT DISTINCT `email` FROM `user` WHERE `verified` AND NOT `account_removed` AND NOT `account_expired` $sql_extra"); $recips = q("SELECT DISTINCT `email` FROM `user` WHERE `verified` AND NOT `account_removed` AND NOT `account_expired` $sql_extra");
if (! $recips) if (! $recips) {
{
notice(L10n::t('No recipients found.') . EOL); notice(L10n::t('No recipients found.') . EOL);
return; return;
} }
foreach ($recips as $recip) foreach ($recips as $recip) {
{
Emailer::send([ Emailer::send([
'fromName' => $sender_name, 'fromName' => $sender_name,
'fromEmail' => $sender_email, 'fromEmail' => $sender_email,