Add explicit parameters to Sender::send() method signature

diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index 7bee5923761defea2edfb23e621bddcd35ccbc59..2190a9d17437161ac4f52ca96e408b3b9ec09f2a 100644 (file)
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -82,15 +82,7 @@ function notifyall_post(App $a)
        }
 
        foreach ($recips as $recip) {
-               DI::emailer()->send([
-                       'fromName'             => $sender_name,
-                       'fromEmail'            => $sender_email,
-                       'replyTo'              => $sender_email,
-                       'toEmail'              => $recip['email'],
-                       'messageSubject'       => $subject,
-                       'htmlVersion'          => $htmlversion,
-                       'textVersion'          => $textversion
-               ]);
+               DI::emailer()->send($sender_name, $sender_email, $sender_email, $recip['email'], $subject, $htmlversion, $textversion);
        }
 
        notice(DI::l10n()->t('Emails sent'));

diff --git a/securemail/securemail.php b/securemail/securemail.php
index 8b8a3fd8fe4b3cf8207b7ea18d4285e6401ce807..1f7cd7686dc6e53d6a45351c24367a4c13b7204e 100644 (file)
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -103,20 +103,12 @@ function securemail_settings_post(App &$a, array &$b)
                        $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' => "<p>{$message}</p>",
-                               'textVersion' => $message,
-                       ];
-
                        // enable addon for test
                        DI::pConfig()->set(local_user(), 'securemail', 'enable', 1);
 
-                       $res = DI::emailer()->send($params);
+                       $res = DI::emailer()->send($sitename, $sender_email, $sender_email,
+                               $a->user['email'], $subject, "<p>{$message}</p>", $message,
+                               '', local_user());
 
                        // revert to saved value
                        DI::pConfig()->set(local_user(), 'securemail', 'enable', $enable);