X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=notifyall%2Fnotifyall.php;h=e5e94c7ec7e68786d9efe00926d52d0021bc48bd;hb=da159e9d2c95e341a39bdc845291ea97be0ca61f;hp=9abde28111a70a48f90f7aad9345f69cdaf0a18f;hpb=f8c162cbfb777793891f885e019eb8eae319dce1;p=friendica-addons.git

diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index 9abde281..e5e94c7e 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -7,97 +7,73 @@
  * Author: Mike Macgirvin (Inital Author of the hubbwall Addon for the Hubzilla Project)
  * Author: Rabuzarus <https://friendica.kommune4.de/profile/rabuzarus> (Port to Friendica)
  */
-use Friendica\Core\L10n;
-use Friendica\Util\Emailer;
 
-function notifyall_install() {
-	logger("installed notifyall");
-}
-
-function notifyall_uninstall() {
-	logger("removed notifyall");
-}
+use Friendica\Addon\notifyall\NotifyAllEmail;
+use Friendica\App;
+use Friendica\Database\DBA;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
+use Friendica\DI;
 
 function notifyall_module() {}
 
-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/>';
+function notifyall_addon_admin(App $a, &$o)
+{
+	$o = '<div></div>&nbsp;&nbsp;&nbsp;&nbsp;<a href="' . DI::baseUrl()->get() . '/notifyall">' . DI::l10n()->t('Send email to all members') . '</a></br/>';
 }
 
 
-function notifyall_post(&$a) {
-	if(! is_site_admin())
+function notifyall_post(App $a)
+{
+	if(!is_site_admin()) {
 		return;
+	}
 
 	$text = trim($_REQUEST['text']);
-	if(! $text)
-		return;
-
-	$sitename = $a->config['sitename'];
 
-	if (!x($a->config['admin_name']))
-		$sender_name = sprintf(L10n::t('%s Administrator'), $sitename);
-	else
-		$sender_name = sprintf(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
-		$sender_email = $a->config['sender_email'];
-
-	$subject = $_REQUEST['subject'];
-
-
-	$textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(["\\r", "\\n"],[ "", "\n"], $text))),ENT_QUOTES,'UTF-8'));
-
-	$htmlversion = bbcode(stripslashes(str_replace(["\\r","\\n"], ["","<br />\n"],$text)));
+	if(! $text) {
+		return;
+	}
 
 	// 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'])) {
-		$email = $a->config['admin_email'];
+		$email = DI::config()->get('config', 'admin_email');
 		$email = "'" . str_replace([" ",","], ["","','"], $email) . "'";
 	}
 	$sql_extra = ((intval($_REQUEST['test'])) ? sprintf(" AND `email` in ( %s )", $email) : '');
 
-	$recips = q("SELECT DISTINCT `email` FROM `user` WHERE `verified` AND NOT `account_removed` AND NOT `account_expired` $sql_extra");
+	$recipients = DBA::p("SELECT DISTINCT `email` FROM `user` WHERE `verified` AND NOT `account_removed` AND NOT `account_expired` $sql_extra");
 
-	if (! $recips) {
-		notice(L10n::t('No recipients found.') . EOL);
+	if (! $recipients) {
+		notice(DI::l10n()->t('No recipients found.') . EOL);
 		return;
 	}
 
-	foreach ($recips as $recip) {
-		Emailer::send([
-			'fromName'             => $sender_name,
-			'fromEmail'            => $sender_email,
-			'replyTo'              => $sender_email,
-			'toEmail'              => $recip['email'],
-			'messageSubject'       => $subject,
-			'htmlVersion'          => $htmlversion,
-			'textVersion'          => $textversion
-		]);
+	$notifyEmail = new NotifyAllEmail(DI::l10n(), DI::config(), DI::baseUrl(), $text);
+
+	foreach ($recipients as $recipient) {
+		DI::emailer()->send($notifyEmail->withRecipient($recipient['email']));
 	}
 
-	notice(L10n::t('Emails sent'));
-	goaway('admin');
+	info(DI::l10n()->t('Emails sent'));
+	DI::baseUrl()->redirect('admin');
 }
 
 function notifyall_content(&$a)
 {
 	if (! is_site_admin()) {
-		return;
+		return '';
 	}
 
-	$title = L10n::t('Send email to all members of this Friendica instance.');
+	$title = DI::l10n()->t('Send email to all members of this Friendica instance.');
 
-	$o = replace_macros(get_markup_template('notifyall_form.tpl', 'addon/notifyall/'), [
+	$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('notifyall_form.tpl', 'addon/notifyall/'), [
 		'$title' => $title,
-		'$text' => htmlspecialchars($_REQUEST['text']),
-		'$subject' => ['subject',L10n::t('Message subject'),$_REQUEST['subject'],''],
-		'$test' => ['test',L10n::t('Test mode (only send to administrator)'), 0,''],
-		'$submit' => L10n::t('Submit')
+		'$text' => htmlspecialchars($_REQUEST['text'] ?? ''),
+		'$subject' => ['subject', DI::l10n()->t('Message subject'), $_REQUEST['subject'] ?? '',''],
+		'$test' => ['test',DI::l10n()->t('Test mode (only send to administrator)'), 0,''],
+		'$submit' => DI::l10n()->t('Submit')
 	]);
 
 	return $o;