* 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()
{
- 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");
}
/**
*/
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(\Friendica\App $a)
+function libravatar_load_config(App $a, ConfigFileLoader $loader)
{
- $a->loadConfigFile(__DIR__. '/config/libravatar.ini.php');
+ $a->getConfigCache()->load($loader->loadAddonConfig('libravatar'));
}
/**
*/
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');
// 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],
]);
*/
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);
}