Merge branch '2019.06-rc'

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

diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 09f31c5b91575f18d1502c0233b1b96e89a1220c..a8cacda2d9bea0b9c93cf3342aa58a6fd046145e 100644 (file)
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -8,13 +8,13 @@
 
 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\Config\ConfigFileLoader;
 use Friendica\Util\Strings;
 
 /**
@@ -22,8 +22,8 @@ use Friendica\Util\Strings;
  */
 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");
 }
 
@@ -32,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.config.php');
+       $a->getConfigCache()->load($loader->loadAddonConfig('libravatar'));
 }
 
 /**
@@ -125,7 +125,7 @@ function libravatar_addon_admin_post(&$a)
 {
        BaseModule::checkFormSecurityToken('libravatarrsave');
 
-       $default_avatar = ((x($_POST, 'avatar')) ? Strings::escapeTags(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);
 }