From 723625f95f65a0c85bc7eb806224bb0275e770f5 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Wed, 27 Jun 2018 23:13:20 -0400
Subject: [PATCH] [impressum] Add addon config

- Update mentions to .htconfig.php
---
 impressum/README.md                | 26 ++++++++++-------------
 impressum/config/impressum.ini.php | 33 ++++++++++++++++++++++++++++++
 impressum/impressum.php            |  8 ++++++++
 3 files changed, 52 insertions(+), 15 deletions(-)
 create mode 100644 impressum/config/impressum.ini.php

diff --git a/impressum/README.md b/impressum/README.md
index 963a085e2..1dde2ac3c 100644
--- a/impressum/README.md
+++ b/impressum/README.md
@@ -7,7 +7,7 @@ Impressum Addon for Friendica
 
 About
 -----
-This addon adds an Impressum (contact) block to the /friendica page with 
+This addon adds an Impressum (contact) block to the /friendica page with
 informations about the page operator/owner and how to contact you in case of
 any questions.
 
@@ -16,23 +16,19 @@ normal friendica postings..
 
 Configuration
 -------------
-Simply fill in the fields in the impressium settings page in the addons 
+Simply fill in the fields in the impressium settings page in the addons
 area of your admin panel. For email adresses the "@" symbol will be obfuscated
 in the source of the page to make in harder for harvesting tools.
 
 Manual Configuration
 --------------------
-If you for any reason prefer to use a configuration file instead, you can set the following variables in the .htconfig file
+If you for any reason you prefer to use a configuration file instead, you can set the following variables in the config/local.ini.php file
 
-	$a->config['impressum']['owner']           this is the Name of the Operator
- 	$a->config['impressum']['ownerprofile']    this is an optional Friendica account
- 	                                           where the above owner name will link to
-	$a->config['impressum']['email']           a contact email address (optional)
-	                                           will be displayed slightly obfuscated
-	                                           as name(at)example(dot)com
-	$a->config['impressum']['postal']          should contain a postal address where
-	                                           you can be reached at (optional)
-	$a->config['impressum']['notes']           additional informations that should
-	                                           be displayed in the Impressum block
-	$a->config['impressum']['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.ini.php b/impressum/config/impressum.ini.php
new file mode 100644
index 000000000..93c03cc21
--- /dev/null
+++ b/impressum/config/impressum.ini.php
@@ -0,0 +1,33 @@
+<?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/local.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 50458ee5e..149b13954 100644
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -15,12 +15,14 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 
 function impressum_install() {
+	Addon::registerHook('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
     Addon::registerHook('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
     Addon::registerHook('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
     logger("installed impressum Addon");
 }
 
 function impressum_uninstall() {
+	Addon::unregisterHook('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
     Addon::unregisterHook('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
     Addon::unregisterHook('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
     logger("uninstalled impressum Addon");
@@ -46,6 +48,12 @@ function impressum_footer($a, &$b) {
         $b .= '<div id="impressum_footer">'.$text.'</div>';
     }
 }
+
+function impressum_load_config(\Friendica\App $a)
+{
+	$a->loadConfigFile(__DIR__. '/config/impressum.ini.php');
+}
+
 function impressum_show($a,&$b) {
     $b .= '<h3>'.L10n::t('Impressum').'</h3>';
     $owner = Config::get('impressum', 'owner');