X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=libravatar%2Flibravatar.php;h=43e673406027a7e0f0686787ba7ecabb332645f6;hb=94893d896007b13af9e99d7d6becb14b28b12e8a;hp=ee283f0c57738342bfe2c90fbf8d87196ec8c8c4;hpb=429b9c9f4a2b97d77e824dceabd13b3063c80d47;p=friendica-addons.git

diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index ee283f0c..43e67340 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -7,19 +7,24 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Addon;
+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\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');
-	logger("registered libravatar in avatar_lookup hook");
+	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");
 }
 
 /**
@@ -27,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');
-	logger("unregistered libravatar in avatar_lookup hook");
+	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'));
 }
 
 /**
@@ -71,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');
 
@@ -106,8 +111,8 @@ function libravatar_addon_admin(&$a, &$o)
 	}
 
 	// output Libravatar settings
-	$o .= '<input type="hidden" name="form_security_token" value="' .get_form_security_token("libravatarsave") .'">';
-	$o .= replace_macros( $t, [
+	$o .= '<input type="hidden" name="form_security_token" value="' . BaseModule::getFormSecurityToken("libravatarsave") .'">';
+	$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],
 	]);
@@ -118,9 +123,9 @@ function libravatar_addon_admin(&$a, &$o)
  */
 function libravatar_addon_admin_post(&$a)
 {
-	check_form_security_token('libravatarrsave');
+	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);
 }