Merge pull request #895 from annando/tumblr-https

[friendica-addons.git/.git] / notifyall / notifyall.php

diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index 852972c..58e5490 100644 (file)
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -12,16 +12,19 @@ use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
+use Friendica\Core\System;
 use Friendica\Util\Emailer;
 
 function notifyall_install()
 {
-       logger("installed notifyall");
+       Logger::log("installed notifyall");
 }
 
 function notifyall_uninstall()
 {
-       logger("removed notifyall");
+       Logger::log("removed notifyall");
 }
 
 function notifyall_module() {}
@@ -52,7 +55,7 @@ function notifyall_post(App $a)
                $sender_name = '"' . L10n::t('%1$s, %2$s Administrator', Config::get('config', 'admin_name'), $sitename) . '"';
        }
 
-       if (! x(Config::get('config', 'sender_email'))) {
+       if (!Config::get('config', 'sender_email')) {
                $sender_email = 'noreply@' . $a->getHostName();
        } else {
                $sender_email = Config::get('config', 'sender_email');
@@ -104,7 +107,7 @@ function notifyall_content(&$a)
 
        $title = 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(defaults($_REQUEST, 'text', '')),
                '$subject' => ['subject', L10n::t('Message subject'), defaults($_REQUEST, 'subject', ''),''],