Add Monolog

[friendica.git] / src / Util / Emailer.php

diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php
index 1dd513c42fe3f1c10b19b390508ff60edec95858..e9bcbc200db0da4bd8db366b76cb8ccdd3ca2819 100644 (file)
--- a/src/Util/Emailer.php
+++ b/src/Util/Emailer.php
@@ -4,8 +4,9 @@
  */
 namespace Friendica\Util;
 
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Protocol\Email;
 
@@ -32,10 +33,10 @@ class Emailer
         */
        public static function send($params)
        {
-               Addon::callHooks('emailer_send_prepare', $params);
+               Hook::callAll('emailer_send_prepare', $params);
 
                $email_textonly = false;
-               if (x($params, "uid")) {
+               if (!empty($params['uid'])) {
                        $email_textonly = PConfig::get($params['uid'], "system", "email_textonly");
                }
 
@@ -87,8 +88,9 @@ class Emailer
                        'headers' => $messageHeader,
                        'parameters' => $sendmail_params
                ];
-               //echo "<pre>"; var_dump($hookdata); killme();
-               Addon::callHooks("emailer_send", $hookdata);
+
+               Hook::callAll("emailer_send", $hookdata);
+
                $res = mail(
                        $hookdata['to'],
                        $hookdata['subject'],
@@ -96,8 +98,8 @@ class Emailer
                        $hookdata['headers'],
                        $hookdata['parameters']
                );
-               logger("header " . 'To: ' . $params['toEmail'] . "\n" . $messageHeader, LOGGER_DEBUG);
-               logger("return value " . (($res)?"true":"false"), LOGGER_DEBUG);
+               Logger::log("header " . 'To: ' . $params['toEmail'] . "\n" . $messageHeader, Logger::DEBUG);
+               Logger::log("return value " . (($res)?"true":"false"), Logger::DEBUG);
                return $res;
        }
 }