DE translation blackout

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

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index d0d54689965ce08dc2345f2896f032b6550118f5..d14cf9ba185166743c7fa70f3c9399a8c2e77d37 100644 (file)
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -8,20 +8,20 @@
 
 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\Strings;
 
 /**
  * Installs the addon hook
  */
 function gravatar_install() {
-       Addon::registerHook('load_config',   'addon/gravatar/gravatar.php', 'gravatar_load_config');
-       Addon::registerHook('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
+       Hook::register('load_config',   'addon/gravatar/gravatar.php', 'gravatar_load_config');
+       Hook::register('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
 
        Logger::log("registered gravatar in avatar_lookup hook");
 }
@@ -30,15 +30,15 @@ function gravatar_install() {
  * Removes the addon hook
  */
 function gravatar_uninstall() {
-       Addon::unregisterHook('load_config',   'addon/gravatar/gravatar.php', 'gravatar_load_config');
-       Addon::unregisterHook('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
+       Hook::unregister('load_config',   'addon/gravatar/gravatar.php', 'gravatar_load_config');
+       Hook::unregister('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
 
        Logger::log("unregistered gravatar in avatar_lookup hook");
 }
 
-function gravatar_load_config(App $a)
+function gravatar_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
 {
-       $a->loadConfigFile(__DIR__. '/config/gravatar.ini.php');
+       $a->getConfigCache()->load($loader->loadAddonConfig('gravatar'));
 }
 
 /**
@@ -121,8 +121,8 @@ function gravatar_addon_admin (&$a, &$o) {
 function gravatar_addon_admin_post (&$a) {
        BaseModule::checkFormSecurityToken('gravatarsave');
 
-       $default_avatar = ((x($_POST, 'avatar')) ? notags(trim($_POST['avatar'])) : 'identicon');
-       $rating = ((x($_POST, 'rating')) ? notags(trim($_POST['rating'])) : 'g');
+       $default_avatar = (!empty($_POST['avatar']) ? Strings::escapeTags(trim($_POST['avatar'])) : 'identicon');
+       $rating = (!empty($_POST['rating']) ? Strings::escapeTags(trim($_POST['rating'])) : 'g');
        Config::set('gravatar', 'default_avatar', $default_avatar);
        Config::set('gravatar', 'rating', $rating);
        info(L10n::t('Gravatar settings updated.') .EOL);