X-Git-Url: https://git.mxchange.org/?p=friendica-addons.git;a=blobdiff_plain;f=gravatar%2Fgravatar.php;h=731129c0754e50d2c0c79b8e3ac5e0203717de6c;hp=c23d1b30f83c2255d2e68ea98a4897d0752fe813;hb=0afd633346b517894ff8e92c705bd5d052dd06a2;hpb=b2e60b8c61565abf60367f1919ba5ae6b9c0a5fb

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index c23d1b30..731129c0 100644
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -5,12 +5,14 @@
  * Version: 1.1
  * Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus>
  */
+use Friendica\Core\Addon;
+use Friendica\Core\Config;
 
 /**
  * Installs the plugin hook
  */
 function gravatar_install() {
-	register_hook('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
+	Addon::registerHook('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
 
 	logger("registered gravatar in avatar_lookup hook");
 }
@@ -19,7 +21,7 @@ function gravatar_install() {
  * Removes the plugin hook
  */
 function gravatar_uninstall() {
-	unregister_hook('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
+	Addon::unregisterHook('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
 
 	logger("unregistered gravatar in avatar_lookup 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,12 +44,12 @@ 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;
 
-	$b['url'] = $url;	
+	$b['url'] = $url;
 	$b['success'] = true;
 }
 
@@ -57,8 +59,8 @@ function gravatar_lookup($a, &$b) {
 function gravatar_plugin_admin (&$a, &$o) {
 	$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)
@@ -67,19 +69,19 @@ function gravatar_plugin_admin (&$a, &$o) {
 		$rating = 'g'; // suitable for display on all websites with any audience type
 
 	// Available options for the select boxes
-	$default_avatars = array(
+	$default_avatars = [
 		'mm' => t('generic profile image'),
 		'identicon' => t('random geometric pattern'),
 		'monsterid' => t('monster face'),
 		'wavatar' => t('computer generated face'),
 		'retro' => t('retro arcade style face'),
-	);
-	$ratings = array(
+	];
+	$ratings = [
 		'g' => 'g',
 		'pg' => 'pg',
 		'r' => 'r',
 		'x' => 'x'
-	);
+	];
 
 	// Check if Libravatar is enabled and show warning
 	$r = q("SELECT * FROM `addon` WHERE `name` = '%s' and `installed` = 1",
@@ -91,11 +93,11 @@ 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(
+	$o .= replace_macros( $t, [
 		'$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),
-	));
+		'$default_avatar' => ['avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found at Gravatar. See README'), $default_avatars],
+		'$rating' => ['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);
 }
 ?>