X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=gravatar%2Fgravatar.php;h=894abda6d748c7dace81010926f3084defce3036;hb=45fe085dac7bfb4aa0f1e75857efa032c3809507;hp=d94f1113e1f0fecde8ea27472a5f7688e695c13a;hpb=f2fc22227a0dfae8f5c85f24f1c5bfa6e5c4c245;p=friendica-addons.git

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index d94f1113..894abda6 100644
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -8,7 +8,6 @@
 
 use Friendica\App;
 use Friendica\BaseModule;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -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);
 }