Merge pull request #457 from tobiasd/20171127-langXMPPandIFTTT

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

diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index c966052f75508d8e218a72f67fb1e7ecd6d58fa3..4b87799fd962ff2d9c779f7e9029e6b851b258d2 100644 (file)
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -6,6 +6,8 @@
  * Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus>
  */
 
+use Friendica\Core\Config;
+
 /**
  * Installs the plugin hook
  */
@@ -36,11 +38,11 @@ function libravatar_uninstall() {
  * @param &$b array
  */
 function libravatar_lookup($a, &$b) {
-       $default_avatar = get_config('libravatar', 'default_img');
+       $default_avatar = Config::get('libravatar', 'default_img');
 
        if (! $default_avatar) {
                // if not set, look up if there was one from the gravatar addon
-               $default_avatar = get_config('gravatar', 'default_img');
+               $default_avatar = Config::get('gravatar', 'default_img');
                // setting default avatar if nothing configured
                if (! $default_avatar)
                        $default_avatar = 'identicon'; // default image will be a random pattern
@@ -62,7 +64,7 @@ function libravatar_lookup($a, &$b) {
 function libravatar_plugin_admin (&$a, &$o) {
        $t = get_markup_template( "admin.tpl", "addon/libravatar" );
 
-       $default_avatar = get_config('libravatar', 'default_img');
+       $default_avatar = Config::get('libravatar', 'default_img');
 
        // set default values for first configuration
        if(! $default_avatar)
@@ -95,14 +97,8 @@ function libravatar_plugin_admin (&$a, &$o) {
 
        // output Libravatar settings
        $o .= '<input type="hidden" name="form_security_token" value="' .get_form_security_token("libravatarsave") .'">';
- 
-       $includes = array(
-               '$field_input' => 'field_input.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros( $t, $includes + array(
-               '$submit' => t('Submit'),
+       $o .= replace_macros( $t, array(
+               '$submit' => t('Save Settings'),
                '$default_avatar' => array('avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found. See README'), $default_avatars),
        ));
 }
@@ -114,7 +110,7 @@ function libravatar_plugin_admin_post (&$a) {
        check_form_security_token('libravatarrsave');
 
        $default_avatar = ((x($_POST, 'avatar')) ? notags(trim($_POST['avatar'])) : 'identicon');
-       set_config('libravatar', 'default_img', $default_avatar);
+       Config::set('libravatar', 'default_img', $default_avatar);
        info(t('Libravatar settings updated.') .EOL);
 }
 ?>