X-Git-Url: https://git.mxchange.org/?p=friendica-addons.git;a=blobdiff_plain;f=libravatar%2Flibravatar.php;h=3979416f154f8ee74d6c549c2e20dec77b049a11;hp=8cbf1e980a611fae3332c58bb127072e7f93350d;hb=0afd633346b517894ff8e92c705bd5d052dd06a2;hpb=6728d714cbdb1552ccb2684dbc123a5dd3cda5a8

diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 8cbf1e98..3979416f 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -5,6 +5,8 @@
  * Version: 1.1
  * Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus>
  */
+use Friendica\Core\Addon;
+use Friendica\Core\Config;
 
 /**
  * Installs the plugin hook
@@ -15,7 +17,7 @@ function libravatar_install() {
 		// avoid registering the hook
 		return false;
 	}
-	register_hook('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup');
+	Addon::registerHook('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup');
 
 	logger("registered libravatar in avatar_lookup hook");
 }
@@ -24,7 +26,7 @@ function libravatar_install() {
  * Removes the plugin hook
  */
 function libravatar_uninstall() {
-	unregister_hook('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup');
+	Addon::unregisterHook('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup');
 
 	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
@@ -62,20 +64,20 @@ 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)
 		$default_avatar = 'identicon'; // pseudo-random geometric pattern based on email hash
 
 	// 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'),
-	);
+	];
 
 	// Show warning if PHP version is too old
 	if (! version_compare(PHP_VERSION, '5.3.0', '>=')) {
@@ -95,10 +97,10 @@ function libravatar_plugin_admin (&$a, &$o) {
 
 	// 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'),
-		'$default_avatar' => array('avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found. See README'), $default_avatars),
-	));
+	$o .= replace_macros( $t, [
+		'$submit' => t('Save Settings'),
+		'$default_avatar' => ['avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found. See README'), $default_avatars],
+	]);
 }
 
 /**
@@ -108,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);
 }
 ?>