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");
}
* 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'));
}
/**
function gravatar_addon_admin_post (&$a) {
BaseModule::checkFormSecurityToken('gravatarsave');
- $default_avatar = ((x($_POST, 'avatar')) ? Strings::removeTags(trim($_POST['avatar'])) : 'identicon');
- $rating = ((x($_POST, 'rating')) ? Strings::removeTags(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);