From aa97060491d679133511da1dedd1b609923d85d3 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 25 Nov 2018 02:14:04 -0500
Subject: [PATCH] [libravatar] Update config file style/name

---
 libravatar/README.md                    | 16 ++++++++++------
 libravatar/config/libravatar.config.php | 18 ++++++++++++++++++
 libravatar/config/libravatar.ini.php    | 18 ------------------
 libravatar/libravatar.php               |  2 +-
 4 files changed, 29 insertions(+), 25 deletions(-)
 create mode 100644 libravatar/config/libravatar.config.php
 delete mode 100644 libravatar/config/libravatar.ini.php

diff --git a/libravatar/README.md b/libravatar/README.md
index 33c3679c..bcc0f824 100644
--- a/libravatar/README.md
+++ b/libravatar/README.md
@@ -23,14 +23,18 @@ If no avatar was found for an email Libravatar can create some pseudo-random gen
 See examples at [Libravatar][1].
 
 ## Alternative Configuration
-Open the config/local.ini.php file and add "libravatar" to the list of activated addons:
+Open the `config/local.config.php` file and add "libravatar" to the list of activated addons:
 
-        [system]
-		addon = ...,libravatar
+    'system' => [
+        ...
+        'addon' => '...,libravatar'
+        ...
+    ]
 
-You can add one configuration variables for the addon to the config/addon.ini.php file:
+You can add one configuration variables for the addon to the `config/addon.config.php` file:
 
-        [libravatar]
-		default_avatar = identicon
+    'libravatar' => [
+        'default_avatar' => 'identicon',
+    ],
 
 [1]: http://wiki.libravatar.org/api/ "See API documentation at Libravatar for more information"
diff --git a/libravatar/config/libravatar.config.php b/libravatar/config/libravatar.config.php
new file mode 100644
index 00000000..7f4f50f6
--- /dev/null
+++ b/libravatar/config/libravatar.config.php
@@ -0,0 +1,18 @@
+<?php
+
+// Warning: Don't change this file! It only holds the default config values for this addon.
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
+
+return [
+	'libravatar' => [
+		// default_avatar (String)
+		// If no avatar was found for an email Gravatar can create some pseudo-random generated avatars based on an email hash.
+		// You can choose between these presets:
+		// - mm       : (mystery-man) a static image
+		// - identicon: a generated geometric pattern based on email hash
+		// - monsterid: a generated 'monster' with different colors, faces, etc. based on email hash
+		// - wavatar  : faces with different features and backgrounds based on email hash
+		// - retro    : 8-bit arcade-styled pixelated faces based on email hash
+		'default_avatar' => 'identicon',
+	],
+];
diff --git a/libravatar/config/libravatar.ini.php b/libravatar/config/libravatar.ini.php
deleted file mode 100644
index e3631204..00000000
--- a/libravatar/config/libravatar.ini.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php return <<<INI
-
-; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
-
-[libravatar]
-; default_avatar (String)
-; If no avatar was found for an email Gravatar can create some pseudo-random generated avatars based on an email hash.
-; You can choose between these presets:
-; - mm       : (mystery-man) a static image
-; - identicon: a generated geometric pattern based on email hash
-; - monsterid: a generated 'monster' with different colors, faces, etc. based on email hash
-; - wavatar  : faces with different features and backgrounds based on email hash
-; - retro    : 8-bit arcade-styled pixelated faces based on email hash
-default_avatar = identicon
-
-INI;
-//Keep this line
\ No newline at end of file
diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index c711bf5e..09f31c5b 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -39,7 +39,7 @@ function libravatar_uninstall()
 
 function libravatar_load_config(App $a)
 {
-	$a->loadConfigFile(__DIR__. '/config/libravatar.ini.php');
+	$a->loadConfigFile(__DIR__ . '/config/libravatar.config.php');
 }
 
 /**