X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=libravatar%2Flibravatar.php;h=43e673406027a7e0f0686787ba7ecabb332645f6;hb=80ec21c76bc7a0cc5f1e73acf91db16ceaa06b04;hp=dd1d613f0d31e7f2fc44f784451116beb3df32bc;hpb=8f7503d573ad90e8150b1f288b5e9c09f9479c2a;p=friendica-addons.git

diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index dd1d613f..43e67340 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -5,23 +5,26 @@
  * Version: 1.1
  * Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus>
  */
-use Friendica\Core\Addon;
+
+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\Util\ConfigFileLoader;
+use Friendica\Util\Strings;
 
 /**
  * Installs the addon hook
  */
 function libravatar_install()
 {
-	if (! version_compare(PHP_VERSION, '5.3.0', '>=')) {
-		info(L10n::t('Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3') .EOL);
-		// avoid registering the hook
-		return false;
-	}
-
-	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");
 }
 
 /**
@@ -29,8 +32,14 @@ function libravatar_install()
  */
 function libravatar_uninstall()
 {
-	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, ConfigFileLoader $loader)
+{
+	$a->getConfigCache()->load($loader->loadAddonConfig('libravatar'));
 }
 
 /**
@@ -41,11 +50,11 @@ function libravatar_uninstall()
  */
 function libravatar_lookup($a, &$b)
 {
-	$default_avatar = Config::get('libravatar', 'default_img');
+	$default_avatar = Config::get('libravatar', 'default_avatar');
 
 	if (! $default_avatar) {
 		// if not set, look up if there was one from the gravatar addon
-		$default_avatar = Config::get('gravatar', 'default_img');
+		$default_avatar = Config::get('gravatar', 'default_avatar');
 		// setting default avatar if nothing configured
 		if (!$default_avatar) {
 			$default_avatar = 'identicon'; // default image will be a random pattern
@@ -67,9 +76,9 @@ 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_img');
+	$default_avatar = Config::get('libravatar', 'default_avatar');
 
 	// set default values for first configuration
 	if (!$default_avatar) {
@@ -95,15 +104,15 @@ function libravatar_addon_admin(&$a, &$o)
 
 	// Libravatar falls back to gravatar, so show warning about gravatar addon if enabled
 	$r = q("SELECT * FROM `addon` WHERE `name` = '%s' and `installed` = 1",
-		dbesc('gravatar')
+		DBA::escape('gravatar')
 	);
 	if (count($r)) {
 		$o = '<h5>' .L10n::t('Information') .'</h5><p>' .L10n::t('Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.') .'</p><br><br>';
 	}
 
 	// 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],
 	]);
@@ -114,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');
-	Config::set('libravatar', 'default_img', $default_avatar);
+	$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);
 }