Merge pull request #439 from zeroadam/Issue3873

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

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index fc5358eb41673088f87bad781fcbe1cc4420eec1..f1c89f9e473980b8dc9c4a4d9d2238149e66b602 100644 (file)
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -6,6 +6,8 @@
  * Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus>
  */
 
+use Friendica\Core\Config;
+
 /**
  * Installs the plugin hook
  */
@@ -31,8 +33,8 @@ function gravatar_uninstall() {
  * @param &$b array
  */
 function gravatar_lookup($a, &$b) {
-       $default_avatar = get_config('gravatar', 'default_img');
-       $rating = get_config('gravatar', 'rating');
+       $default_avatar = Config::get('gravatar', 'default_img');
+       $rating = Config::get('gravatar', 'rating');
 
        // setting default value if nothing configured
        if(! $default_avatar)
@@ -42,7 +44,7 @@ function gravatar_lookup($a, &$b) {
 
        $hash = md5(trim(strtolower($b['email'])));
 
-       $url = 'http://www.gravatar.com/avatar/' .$hash .'.jpg';
+       $url = 'https://secure.gravatar.com/avatar/' .$hash .'.jpg';
        $url .= '?s=' .$b['size'] .'&r=' .$rating;
        if ($default_avatar != "gravatar")
                $url .= '&d=' .$default_avatar;
@@ -55,10 +57,10 @@ function gravatar_lookup($a, &$b) {
  * Display admin settings for this addon
  */
 function gravatar_plugin_admin (&$a, &$o) {
-       $t = file_get_contents( dirname(__file__)."/admin.tpl");
+       $t = get_markup_template( "admin.tpl", "addon/gravatar/" );
 
-       $default_avatar = get_config('gravatar', 'default_img');
-       $rating = get_config('gravatar', 'rating');
+       $default_avatar = Config::get('gravatar', 'default_img');
+       $rating = Config::get('gravatar', 'rating');
 
        // set default values for first configuration
        if(! $default_avatar)
@@ -92,7 +94,7 @@ function gravatar_plugin_admin (&$a, &$o) {
        // output Gravatar settings
        $o .= '<input type="hidden" name="form_security_token" value="' .get_form_security_token("gravatarsave") .'">';
        $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 at Gravatar. See README'), $default_avatars),
                '$rating' => array('rating', t('Rating of images'), $rating, t('Select the appropriate avatar rating for your site. See README'), $ratings),
        ));
@@ -106,8 +108,8 @@ function gravatar_plugin_admin_post (&$a) {
 
        $default_avatar = ((x($_POST, 'avatar')) ? notags(trim($_POST['avatar'])) : 'identicon');
        $rating = ((x($_POST, 'rating')) ? notags(trim($_POST['rating'])) : 'g');
-       set_config('gravatar', 'default_img', $default_avatar);
-       set_config('gravatar', 'rating', $rating);
+       Config::set('gravatar', 'default_img', $default_avatar);
+       Config::set('gravatar', 'rating', $rating);
        info( t('Gravatar settings updated.') .EOL);
 }
 ?>