advancedcontentfilter: Add language values to filter fields (#10052, #10136)

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

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index f1f93b4..894abda 100644 (file)
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -8,12 +8,11 @@
 
 use Friendica\App;
 use Friendica\BaseModule;
-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\DI;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\Strings;
 
@@ -27,16 +26,6 @@ function gravatar_install() {
        Logger::log("registered gravatar in avatar_lookup hook");
 }
 
-/**
- * Removes the addon hook
- */
-function gravatar_uninstall() {
-       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, ConfigFileLoader $loader)
 {
        $a->getConfigCache()->load($loader->loadAddonConfig('gravatar'));
@@ -49,8 +38,8 @@ function gravatar_load_config(App $a, ConfigFileLoader $loader)
  * @param &$b array
  */
 function gravatar_lookup($a, &$b) {
-       $default_avatar = Config::get('gravatar', 'default_avatar');
-       $rating = Config::get('gravatar', 'rating');
+       $default_avatar = DI::config()->get('gravatar', 'default_avatar');
+       $rating = DI::config()->get('gravatar', 'rating');
 
        // setting default value if nothing configured
        if(! $default_avatar)
@@ -75,8 +64,8 @@ function gravatar_lookup($a, &$b) {
 function gravatar_addon_admin (&$a, &$o) {
        $t = Renderer::getMarkupTemplate( "admin.tpl", "addon/gravatar/" );
 
-       $default_avatar = Config::get('gravatar', 'default_avatar');
-       $rating = Config::get('gravatar', 'rating');
+       $default_avatar = DI::config()->get('gravatar', 'default_avatar');
+       $rating = DI::config()->get('gravatar', 'rating');
 
        // set default values for first configuration
        if(! $default_avatar)
@@ -124,7 +113,6 @@ function gravatar_addon_admin_post (&$a) {
 
        $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(DI::l10n()->t('Gravatar settings updated.') .EOL);
+       DI::config()->set('gravatar', 'default_avatar', $default_avatar);
+       DI::config()->set('gravatar', 'rating', $rating);
 }