Admin config setting added for blockbot, added option to block gabsocial

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

diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index 66780e1fbec882290797a6833309f520312bd526..e70449af0aaf02c0387a2470400e1e099af35fc0 100644 (file)
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -7,8 +7,8 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
@@ -26,9 +26,9 @@ define("CATAVATAR_SIZE", 256);
  */
 function catavatar_install()
 {
-       Addon::registerHook('avatar_lookup', 'addon/catavatar/catavatar.php', 'catavatar_lookup');
-       Addon::registerHook('addon_settings', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings');
-       Addon::registerHook('addon_settings_post', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings_post');
+       Hook::register('avatar_lookup', 'addon/catavatar/catavatar.php', 'catavatar_lookup');
+       Hook::register('addon_settings', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings');
+       Hook::register('addon_settings_post', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings_post');
 
        Logger::log('registered catavatar');
 }
@@ -38,9 +38,9 @@ function catavatar_install()
  */
 function catavatar_uninstall()
 {
-       Addon::unregisterHook('avatar_lookup', 'addon/catavatar/catavatar.php', 'catavatar_lookup');
-       Addon::unregisterHook('addon_settings', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings');
-       Addon::unregisterHook('addon_settings_post', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings_post');
+       Hook::unregister('avatar_lookup', 'addon/catavatar/catavatar.php', 'catavatar_lookup');
+       Hook::unregister('addon_settings', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings');
+       Hook::unregister('addon_settings_post', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings_post');
 
        Logger::log('unregistered catavatar');
 }
@@ -55,7 +55,7 @@ function catavatar_addon_settings(App $a, &$s)
        }
 
        $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/catavatar/');
-       $s .= replace_macros ($t, [
+       $s .= Renderer::replaceMacros($t, [
                '$postpost' => !empty($_POST['catavatar-morecat']) || !empty($_POST['catavatar-emailcat']),
                '$uncache' => time(),
                '$uid' => local_user(),