friendica/friendica-addons
1
0
Fork 0
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2025-10-10 08:52:59 +00:00
Code Issues Releases Wiki Activity

Merge branch '3.6-rc'

Browse source
This commit is contained in:
Tobias Diekershoff 2018-03-23 08:00:37 +01:00
commit 39dd3dffe0
733 changed files with 10943 additions and 8237 deletions
Download patch file Download diff file Expand all files Collapse all files

53
notifyall/notifyall.php
View file

@ -1,5 +1,4 @@
<?php
/**
*
* Name: Notifyall
@ -9,7 +8,9 @@
* Author: Rabuzarus <https://friendica.kommune4.de/profile/rabuzarus> (Port to Friendica)
*/
require_once('include/Emailer.php');
use Friendica\Content\Text\BBCode;
use Friendica\Core\L10n;
use Friendica\Util\Emailer;
function notifyall_install() {
logger("installed notifyall");
@ -21,10 +22,9 @@ function notifyall_uninstall() {
function notifyall_module() {}
function notifyall_plugin_admin(&$a, &$o) {
$o = '<div></div>&nbsp;&nbsp;&nbsp;&nbsp;<a href="' . z_root() . '/notifyall">' . t('Send email to all members') . '</a></br/>';
function notifyall_addon_admin(&$a, &$o) {
$o = '<div></div>&nbsp;&nbsp;&nbsp;&nbsp;<a href="' . z_root() . '/notifyall">' . L10n::t('Send email to all members') . '</a></br/>';
}
@ -39,10 +39,10 @@ function notifyall_post(&$a) {
$sitename = $a->config['sitename'];
if (!x($a->config['admin_name']))
$sender_name = sprintf(t('%s Administrator'), $sitename);
$sender_name = L10n::t('%s Administrator', $sitename);
else
$sender_name = sprintf(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']))
$sender_email = 'noreply@' . $a->get_hostname();
else
@ -51,13 +51,15 @@ function notifyall_post(&$a) {
$subject = $_REQUEST['subject'];
$textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r", "\\n"),array( "", "\n"), $text))),ENT_QUOTES,'UTF-8'));
$textversion = strip_tags(html_entity_decode(BBCode::convert(stripslashes(str_replace(["\\r", "\\n"], ["", "\n"], $text))), ENT_QUOTES, 'UTF-8'));
$htmlversion = BBCode::convert(stripslashes(str_replace(["\\r", "\\n"], ["", "<br />\n"], $text)));
$htmlversion = bbcode(stripslashes(str_replace(array("\\r","\\n"), array("","<br />\n"),$text)));
// 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
if ( intval($_REQUEST['test'])) {
if (intval($_REQUEST['test'])) {
$email = $a->config['admin_email'];
$email = "'" . str_replace(array(" ",","), array("","','"), $email) . "'";
}
@ -65,15 +67,13 @@ function notifyall_post(&$a) {
$recips = q("SELECT DISTINCT `email` FROM `user` WHERE `verified` AND NOT `account_removed` AND NOT `account_expired` $sql_extra");
if(! $recips) {
notice( t('No recipients found.') . EOL);
if (! $recips) {
notice(L10n::t('No recipients found.') . EOL);
return;
}
foreach($recips as $recip) {
Emailer::send(array(
foreach ($recips as $recip) {
Emailer::send([
'fromName' => $sender_name,
'fromEmail' => $sender_email,
'replyTo' => $sender_email,
@ -84,24 +84,25 @@ function notifyall_post(&$a) {
));
}
notice( t('Emails sent'));
notice(L10n::t('Emails sent'));
goaway('admin');
}
function notifyall_content(&$a) {
if(! is_site_admin())
function notifyall_content(&$a)
{
if (! is_site_admin()) {
return;
}
$title = t('Send email to all members of this Friendica instance.');
$title = L10n::t('Send email to all members of this Friendica instance.');
$o = replace_macros(get_markup_template('notifyall_form.tpl','addon/notifyall/'),array(
$o = replace_macros(get_markup_template('notifyall_form.tpl', 'addon/notifyall/'), [
'$title' => $title,
'$text' => htmlspecialchars($_REQUEST['text']),
'$subject' => array('subject',t('Message subject'),$_REQUEST['subject'],''),
'$test' => array('test',t('Test mode (only send to administrator)'), 0,''),
'$submit' => t('Submit')
));
'$subject' => ['subject',L10n::t('Message subject'),$_REQUEST['subject'],''],
'$test' => ['test',L10n::t('Test mode (only send to administrator)'), 0,''],
'$submit' => L10n::t('Submit')
]);
return $o;
}