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 1705a9c148bdbfb0da4041c0ceac3843a31fbe88..4b87799fd962ff2d9c779f7e9029e6b851b258d2 100644 (file)
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -2,10 +2,12 @@
 /**
  * Name: Libravatar Support
  * Description: If there is no avatar image for a new user or contact this plugin will look for one at Libravatar. Please disable Gravatar addon if you use this one. (requires PHP >= 5.3)
- * Version: 1.0
+ * Version: 1.1
  * Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus>
  */
 
+use Friendica\Core\Config;
+
 /**
  * Installs the plugin hook
  */
@@ -26,7 +28,7 @@ function libravatar_install() {
 function libravatar_uninstall() {
        unregister_hook('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup');
 
-       logger("uninstalled libravatar");
+       logger("unregistered libravatar in avatar_lookup 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
@@ -48,10 +50,9 @@ function libravatar_lookup($a, &$b) {
 
        require_once 'Services/Libravatar.php';
        $libravatar = new Services_Libravatar();
-       $options = array();
-       $options['s'] = $b['size'];
-       $options['d'] = $default_avatar;
-       $avatar_url = $libravatar->url($b['email'], $options);
+       $libravatar->setSize($b['size']);
+       $libravatar->setDefault($default_avatar);
+       $avatar_url = $libravatar->getUrl($b['email']);
 
        $b['url'] = $avatar_url;
        $b['success'] = true;
@@ -61,9 +62,9 @@ function libravatar_lookup($a, &$b) {
  * Display admin settings for this addon
  */
 function libravatar_plugin_admin (&$a, &$o) {
-       $t = file_get_contents( dirname(__file__)."/admin.tpl");
+       $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)
@@ -81,8 +82,8 @@ function libravatar_plugin_admin (&$a, &$o) {
        // Show warning if PHP version is too old
        if (! version_compare(PHP_VERSION, '5.3.0', '>=')) {
                $o = '<h5>' .t('Warning') .'</h5><p>';
-               $o .= sprintf(t('Your PHP version %s is lower than the required PHP 5.3.'), PHP_VERSION);
-               $o .= '<br>' .t('This addon is not functional on you server.') .'<p><br>';
+               $o .= sprintf(t('Your PHP version %s is lower than the required PHP >= 5.3.'), PHP_VERSION);
+               $o .= '<br>' .t('This addon is not functional on your server.') .'<p><br>';
                return;
        }
 
@@ -91,13 +92,13 @@ function libravatar_plugin_admin (&$a, &$o) {
                dbesc('gravatar')
        );
        if (count($r)) {
-               $o = '<h5>' .t('Information') .'</h5><p>' .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>';
+               $o = '<h5>' .t('Information') .'</h5><p>' .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, array(
-               '$submit' => t('Submit'),
+               '$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),
        ));
 }
@@ -109,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);
 }
 ?>