DE translation blackout

[friendica-addons.git] / gravatar / gravatar.php

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index 00d8e5b322a8cb609471f42378b9daa19247229c..d14cf9ba185166743c7fa70f3c9399a8c2e77d37 100644 (file)
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -7,34 +7,38 @@
  */
 
 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\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("registered gravatar in avatar_lookup hook");
+       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("unregistered gravatar in avatar_lookup hook");
+       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'));
 }
 
 /**
@@ -68,7 +72,7 @@ function gravatar_lookup($a, &$b) {
  * Display admin settings for this addon
  */
 function gravatar_addon_admin (&$a, &$o) {
-       $t = get_markup_template( "admin.tpl", "addon/gravatar/" );
+       $t = Renderer::getMarkupTemplate( "admin.tpl", "addon/gravatar/" );
 
        $default_avatar = Config::get('gravatar', 'default_avatar');
        $rating = Config::get('gravatar', 'rating');
@@ -103,8 +107,8 @@ function gravatar_addon_admin (&$a, &$o) {
        }
 
        // output Gravatar settings
-       $o .= '<input type="hidden" name="form_security_token" value="' .get_form_security_token("gravatarsave") .'">';
-       $o .= replace_macros( $t, [
+       $o .= '<input type="hidden" name="form_security_token" value="' . BaseModule::getFormSecurityToken("gravatarsave") .'">';
+       $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 at Gravatar. See README'), $default_avatars],
                '$rating' => ['rating', L10n::t('Rating of images'), $rating, L10n::t('Select the appropriate avatar rating for your site. See README'), $ratings],
@@ -115,10 +119,10 @@ function gravatar_addon_admin (&$a, &$o) {
  * Save admin settings
  */
 function gravatar_addon_admin_post (&$a) {
-       check_form_security_token('gravatarsave');
+       BaseModule::checkFormSecurityToken('gravatarsave');
 
-       $default_avatar = ((x($_POST, 'avatar')) ? notags(trim($_POST['avatar'])) : 'identicon');
-       $rating = ((x($_POST, 'rating')) ? notags(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);