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

---
 impressum/README.md                   | 19 +++++++--------
 impressum/config/impressum.config.php | 33 +++++++++++++++++++++++++++
 impressum/config/impressum.ini.php    | 33 ---------------------------
 impressum/impressum.php               |  2 +-
 4 files changed, 44 insertions(+), 43 deletions(-)
 create mode 100644 impressum/config/impressum.config.php
 delete mode 100644 impressum/config/impressum.ini.php

diff --git a/impressum/README.md b/impressum/README.md
index 0d0aa51c..ca78d9a0 100644
--- a/impressum/README.md
+++ b/impressum/README.md
@@ -16,13 +16,14 @@ Simply fill in the fields in the impressium settings page in the addons area of
 
 Manual Configuration
 --------------------
-If you for any reason you prefer to use a configuration file instead, you can set the following variables in the config/addon.ini.php file
+If you for any reason you prefer to use a configuration file instead, you can set the following variables in the `config/addon.config.php` file
 
-	[impressum]
-	owner =           this is the Name of the Operator
-	ownerprofile =    this is an optional Friendica account where the above owner name will link to
-	email =           a contact email address (optional)
-					  will be displayed slightly obfuscated as name(at)example(dot)com
-	postal =          should contain a postal address where you can be reached at (optional)
-	notes =           additional informations that should be displayed in the Impressum block
-	footer_text =     Text that will be displayed at the bottom of the pages.
+	'impressum' => [
+        'owner' => '',           This is the Name of the Operator
+        'ownerprofile' => '',    This is an optional Friendica account where the above owner name will link to
+        'email' => '',           A contact email address (optional)
+                                 Will be displayed slightly obfuscated as name(at)example(dot)com
+        'postal' => '',          Should contain a postal address where you can be reached at (optional)
+        'notes' => '',           Additional informations that should be displayed in the Impressum block
+        'footer_text' => '',     Text that will be displayed at the bottom of the pages.
+    ],
diff --git a/impressum/config/impressum.config.php b/impressum/config/impressum.config.php
new file mode 100644
index 00000000..9fe672fc
--- /dev/null
+++ b/impressum/config/impressum.config.php
@@ -0,0 +1,33 @@
+<?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 [
+	'impressum' => [
+		// owner (String)
+		// This is the Name of the Operator
+		'owner' => '',
+
+		// ownerprofile (String)
+		// This is an optional Friendica account where the above owner name will link to
+		'ownerprofile' => '',
+
+		// email (String)
+		// A contact email address (optional)
+		// Will be displayed slightly obfuscated as name(at)example(dot)com
+		'email' => '',
+
+		// postal (String)
+		// Should contain a postal address where you can be reached at (optional)
+		'postal' => '',
+
+		// notes (String)
+		// Additional informations that should be displayed in the Impressum block
+		'notes' => '',
+
+		// footer_text (String)
+		// Text that will be displayed at the bottom of the pages.
+		'footer_text' => '',
+	],
+];
diff --git a/impressum/config/impressum.ini.php b/impressum/config/impressum.ini.php
deleted file mode 100644
index 1de4468c..00000000
--- a/impressum/config/impressum.ini.php
+++ /dev/null
@@ -1,33 +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
-
-[impressum]
-; owner (String)
-; This is the Name of the Operator
-owner =
-
-; ownerprofile (String)
-; This is an optional Friendica account where the above owner name will link to
-ownerprofile =
-
-; email (String)
-; A contact email address (optional)
-; Will be displayed slightly obfuscated as name(at)example(dot)com
-email =
-
-; postal (String)
-; Should contain a postal address where you can be reached at (optional)
-postal =
-
-; notes (String)
-; Additional informations that should be displayed in the Impressum block
-notes =
-
-; footer_text (String)
-; Text that will be displayed at the bottom of the pages.
-footer_text =
-
-INI;
-//Keep this line
\ No newline at end of file
diff --git a/impressum/impressum.php b/impressum/impressum.php
index 3e04c64f..6300efca 100644
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -54,7 +54,7 @@ function impressum_footer($a, &$b) {
 
 function impressum_load_config(\Friendica\App $a)
 {
-	$a->loadConfigFile(__DIR__. '/config/impressum.ini.php');
+	$a->loadConfigFile(__DIR__ . '/config/impressum.config.php');
 }
 
 function impressum_show($a,&$b) {
-- 
2.39.5