diff --git a/notifyall/NotifyAllEmail.php b/notifyall/NotifyAllEmail.php new file mode 100644 index 00000000..96a57a67 --- /dev/null +++ b/notifyall/NotifyAllEmail.php @@ -0,0 +1,40 @@ +get('config', 'sitename'); + + if (empty($config->get('config', 'admin_name'))) { + $sender_name = '"' . $l10n->t('%s Administrator', $sitename) . '"'; + } else { + $sender_name = '"' . $l10n->t('%1$s, %2$s Administrator', $config->get('config', 'admin_name'), $sitename) . '"'; + } + + if (!$config->get('config', 'sender_email')) { + $sender_email = 'noreply@' . $baseUrl->getHostname(); + } else { + $sender_email = $config->get('config', 'sender_email'); + } + + $subject = $_REQUEST['subject']; + + $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"], ["", "
\n"], $text))); + + parent::__construct($sender_name, $sender_email, $sender_email, '', $subject, $htmlversion, $textversion); + } +} diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php index 6519a243..6d179380 100644 --- a/notifyall/notifyall.php +++ b/notifyall/notifyall.php @@ -8,12 +8,12 @@ * Author: Rabuzarus (Port to Friendica) */ +use Friendica\Addon\notifyall\NotifyAllEmail; use Friendica\App; -use Friendica\Content\Text\BBCode; +use Friendica\Database\DBA; use Friendica\Core\Logger; use Friendica\Core\Renderer; use Friendica\DI; -use Friendica\Util\Emailer; function notifyall_install() { @@ -45,27 +45,6 @@ function notifyall_post(App $a) return; } - $sitename = DI::config()->get('config', 'sitename'); - - if (empty(DI::config()->get('config', 'admin_name'))) { - $sender_name = '"' . DI::l10n()->t('%s Administrator', $sitename) . '"'; - } else { - $sender_name = '"' . DI::l10n()->t('%1$s, %2$s Administrator', DI::config()->get('config', 'admin_name'), $sitename) . '"'; - } - - if (!DI::config()->get('config', 'sender_email')) { - $sender_email = 'noreply@' . DI::baseUrl()->getHostname(); - } else { - $sender_email = DI::config()->get('config', 'sender_email'); - } - - $subject = $_REQUEST['subject']; - - - $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"], ["", "
\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'])) { @@ -74,23 +53,17 @@ function notifyall_post(App $a) } $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) { + 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(DI::l10n()->t('Emails sent')); @@ -100,7 +73,7 @@ function notifyall_post(App $a) function notifyall_content(&$a) { if (! is_site_admin()) { - return; + return ''; } $title = DI::l10n()->t('Send email to all members of this Friendica instance.'); diff --git a/securemail/SecureTestEmail.php b/securemail/SecureTestEmail.php new file mode 100644 index 00000000..37fe5d7c --- /dev/null +++ b/securemail/SecureTestEmail.php @@ -0,0 +1,40 @@ +get('config', 'sitename'); + + $hostname = $baseUrl->getHostname(); + if (strpos($hostname, ':')) { + $hostname = substr($hostname, 0, strpos($hostname, ':')); + } + + $sender_email = $config->get('config', 'sender_email'); + if (empty($sender_email)) { + $sender_email = 'noreply@' . $hostname; + } + + $subject = 'Friendica - Secure Mail - Test'; + $message = 'This is a test message from your Friendica Secure Mail addon.'; + + // enable addon for test + $pConfig->set(local_user(), 'securemail', 'enable', 1); + + parent::__construct($sitename, $sender_email, $sender_email, $a->user['email'], + $subject, "

{$message}

", $message, + '', local_user()); + } +} diff --git a/securemail/securemail.php b/securemail/securemail.php index 6e665868..55d03207 100644 --- a/securemail/securemail.php +++ b/securemail/securemail.php @@ -6,12 +6,12 @@ * Author: Fabio Comuni */ +use Friendica\Addon\securemail\SecureTestEmail; use Friendica\App; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Renderer; use Friendica\DI; -use Friendica\Util\Emailer; require_once __DIR__ . '/vendor/autoload.php'; @@ -88,35 +88,8 @@ function securemail_settings_post(App &$a, array &$b) info(DI::l10n()->t('Secure Mail Settings saved.') . EOL); if ($_POST['securemail-submit'] == DI::l10n()->t('Save and send test')) { - $sitename = DI::config()->get('config', 'sitename'); - $hostname = DI::baseUrl()->getHostname(); - if (strpos($hostname, ':')) { - $hostname = substr($hostname, 0, strpos($hostname, ':')); - } - - $sender_email = DI::config()->get('config', 'sender_email'); - if (empty($sender_email)) { - $sender_email = 'noreply@' . $hostname; - } - - $subject = 'Friendica - Secure Mail - Test'; - $message = 'This is a test message from your Friendica Secure Mail addon.'; - - $params = [ - 'uid' => local_user(), - 'fromName' => $sitename, - 'fromEmail' => $sender_email, - 'toEmail' => $a->user['email'], - 'messageSubject' => $subject, - 'htmlVersion' => "

{$message}

", - 'textVersion' => $message, - ]; - - // enable addon for test - DI::pConfig()->set(local_user(), 'securemail', 'enable', 1); - - $res = Emailer::send($params); + $res = DI::emailer()->send(new SecureTestEmail(DI::app(), DI::config(), DI::pConfig(), DI::baseUrl())); // revert to saved value DI::pConfig()->set(local_user(), 'securemail', 'enable', $enable);