Move expand_acl to ACLFormatter::expand()

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

diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 80c9e4c5bec2f7b1e9022fdb7293e73a34522dde..43e673406027a7e0f0686787ba7ecabb332645f6 100644 (file)
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -8,20 +8,22 @@
 
 use Friendica\App;
 use Friendica\BaseModule;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
-use Friendica\Util\Security;
+use Friendica\Util\ConfigFileLoader;
+use Friendica\Util\Strings;
 
 /**
  * Installs the addon hook
  */
 function libravatar_install()
 {
-       Addon::registerHook('load_config',   'addon/libravatar/libravatar.php', 'libravatar_load_config');
-       Addon::registerHook('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup');
+       Hook::register('load_config',   'addon/libravatar/libravatar.php', 'libravatar_load_config');
+       Hook::register('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup');
        Logger::log("registered libravatar in avatar_lookup hook");
 }
 
@@ -30,14 +32,14 @@ function libravatar_install()
  */
 function libravatar_uninstall()
 {
-       Addon::unregisterHook('load_config',   'addon/libravatar/libravatar.php', 'libravatar_load_config');
-       Addon::unregisterHook('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup');
+       Hook::unregister('load_config',   'addon/libravatar/libravatar.php', 'libravatar_load_config');
+       Hook::unregister('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup');
        Logger::log("unregistered libravatar in avatar_lookup hook");
 }
 
-function libravatar_load_config(App $a)
+function libravatar_load_config(App $a, ConfigFileLoader $loader)
 {
-       $a->loadConfigFile(__DIR__. '/config/libravatar.ini.php');
+       $a->getConfigCache()->load($loader->loadAddonConfig('libravatar'));
 }
 
 /**
@@ -74,7 +76,7 @@ function libravatar_lookup($a, &$b)
  */
 function libravatar_addon_admin(&$a, &$o)
 {
-       $t = get_markup_template("admin.tpl", "addon/libravatar");
+       $t = Renderer::getMarkupTemplate("admin.tpl", "addon/libravatar");
 
        $default_avatar = Config::get('libravatar', 'default_avatar');
 
@@ -110,7 +112,7 @@ function libravatar_addon_admin(&$a, &$o)
 
        // output Libravatar settings
        $o .= '<input type="hidden" name="form_security_token" value="' . BaseModule::getFormSecurityToken("libravatarsave") .'">';
-       $o .= replace_macros( $t, [
+       $o .= Renderer::replaceMacros( $t, [
                '$submit' => L10n::t('Save Settings'),
                '$default_avatar' => ['avatar', L10n::t('Default avatar image'), $default_avatar, L10n::t('Select default avatar image if none was found. See README'), $default_avatars],
        ]);
@@ -123,7 +125,7 @@ function libravatar_addon_admin_post(&$a)
 {
        BaseModule::checkFormSecurityToken('libravatarrsave');
 
-       $default_avatar = ((x($_POST, 'avatar')) ? notags(trim($_POST['avatar'])) : 'identicon');
+       $default_avatar = (!empty($_POST['avatar']) ? Strings::escapeTags(trim($_POST['avatar'])) : 'identicon');
        Config::set('libravatar', 'default_avatar', $default_avatar);
        info(L10n::t('Libravatar settings updated.') .EOL);
 }