X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=libravatar%2Flibravatar.php;h=c49ac5c5960c95b67482d33ad928a91e7c8ff20a;hb=c95713b19c35eff74052bf248bfc1025d5d9161b;hp=09f31c5b91575f18d1502c0233b1b96e89a1220c;hpb=074493a29eff22bb38275ea5c4c958dfea156056;p=friendica-addons.git diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php index 09f31c5b..c49ac5c5 100644 --- a/libravatar/libravatar.php +++ b/libravatar/libravatar.php @@ -8,13 +8,12 @@ use Friendica\App; use Friendica\BaseModule; -use Friendica\Core\Addon; -use Friendica\Core\Config; -use Friendica\Core\L10n; +use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Renderer; use Friendica\Database\DBA; -use Friendica\Util\Security; +use Friendica\DI; +use Friendica\Util\ConfigFileLoader; use Friendica\Util\Strings; /** @@ -22,8 +21,8 @@ use Friendica\Util\Strings; */ function libravatar_install() { - Addon::registerHook('load_config', 'addon/libravatar/libravatar.php', 'libravatar_load_config'); - Addon::registerHook('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup'); + 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"); } @@ -32,14 +31,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'); + 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.config.php'); + $a->getConfigCache()->load($loader->loadAddonConfig('libravatar')); } /** @@ -50,11 +49,11 @@ function libravatar_load_config(App $a) */ function libravatar_lookup($a, &$b) { - $default_avatar = Config::get('libravatar', 'default_avatar'); + $default_avatar = DI::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_avatar'); + $default_avatar = DI::config()->get('gravatar', 'default_avatar'); // setting default avatar if nothing configured if (!$default_avatar) { $default_avatar = 'identicon'; // default image will be a random pattern @@ -78,7 +77,7 @@ function libravatar_addon_admin(&$a, &$o) { $t = Renderer::getMarkupTemplate("admin.tpl", "addon/libravatar"); - $default_avatar = Config::get('libravatar', 'default_avatar'); + $default_avatar = DI::config()->get('libravatar', 'default_avatar'); // set default values for first configuration if (!$default_avatar) { @@ -87,18 +86,18 @@ function libravatar_addon_admin(&$a, &$o) // Available options for the select boxes $default_avatars = [ - 'mm' => L10n::t('generic profile image'), - 'identicon' => L10n::t('random geometric pattern'), - 'monsterid' => L10n::t('monster face'), - 'wavatar' => L10n::t('computer generated face'), - 'retro' => L10n::t('retro arcade style face'), + 'mm' => DI::l10n()->t('generic profile image'), + 'identicon' => DI::l10n()->t('random geometric pattern'), + 'monsterid' => DI::l10n()->t('monster face'), + 'wavatar' => DI::l10n()->t('computer generated face'), + 'retro' => DI::l10n()->t('retro arcade style face'), ]; // Show warning if PHP version is too old if (! version_compare(PHP_VERSION, '5.3.0', '>=')) { - $o = '
';
- $o .= L10n::t('Your PHP version %s is lower than the required PHP >= 5.3.', PHP_VERSION);
- $o .= '
' .L10n::t('This addon is not functional on your server.') .'
';
+ $o = '
';
+ $o .= DI::l10n()->t('Your PHP version %s is lower than the required PHP >= 5.3.', PHP_VERSION);
+ $o .= '
' .DI::l10n()->t('This addon is not functional on your server.') .'
';
return;
}
@@ -107,14 +106,14 @@ function libravatar_addon_admin(&$a, &$o)
DBA::escape('gravatar')
);
if (count($r)) {
- $o = '
' .L10n::t('Gravatar addon is installed. Please disable the Gravatar addon.
The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.') .'
' .DI::l10n()->t('Gravatar addon is installed. Please disable the Gravatar addon.
The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.') .'