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

---
 pumpio/README.md                | 11 ++++++++---
 pumpio/config/pumpio.config.php | 21 +++++++++++++++++++++
 pumpio/config/pumpio.ini.php    | 21 ---------------------
 pumpio/pumpio.php               |  2 +-
 4 files changed, 30 insertions(+), 25 deletions(-)
 create mode 100644 pumpio/config/pumpio.config.php
 delete mode 100644 pumpio/config/pumpio.ini.php

diff --git a/pumpio/README.md b/pumpio/README.md
index 9fb01055..33137984 100644
--- a/pumpio/README.md
+++ b/pumpio/README.md
@@ -1,6 +1,11 @@
-To let the connector work properly you should define an application name in config/addon.ini.php:
+To let the connector work properly you should define an application name in `config/addon.config.php`:
 
-[pumpio]
-application_name = Name of you site
+	'pumpio' => [
+		'application_name' => '',
+		// Displays forwarded posts like "wall-to-wall" posts.
+		'wall-to-wall_share' => false,
+		// Given in minutes
+		'poll_interval' => 5,
+	],
 
 This name appears at pump.io and is important for not mirroring back posts that came from Friendica.
diff --git a/pumpio/config/pumpio.config.php b/pumpio/config/pumpio.config.php
new file mode 100644
index 00000000..4f3dc460
--- /dev/null
+++ b/pumpio/config/pumpio.config.php
@@ -0,0 +1,21 @@
+<?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 [
+	'pumpio' => [
+		// application_name (String)
+		// To let the connector work properly you should define an application name.
+		// This name appears at pump.io and is important for not mirroring back posts that came from Friendica.
+		'application_name' => '',
+
+		// wall-to-wall_share (Boolean)
+		// Displays forwarded posts like "wall-to-wall" posts.
+		'wall-to-wall_share' => false,
+
+		// poll_interval (Integer)
+		// Given in minutes
+		'poll_interval' => 5,
+	],
+];
diff --git a/pumpio/config/pumpio.ini.php b/pumpio/config/pumpio.ini.php
deleted file mode 100644
index cd5e732c..00000000
--- a/pumpio/config/pumpio.ini.php
+++ /dev/null
@@ -1,21 +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
-
-[pumpio]
-; application_name (String)
-; To let the connector work properly you should define an application name.
-; This name appears at pump.io and is important for not mirroring back posts that came from Friendica.
-application_name =
-
-; wall-to-wall_share (Boolean)
-; Displays forwarded posts like "wall-to-wall" posts.
-wall-to-wall_share = false
-
-; poll_interval (Integer)
-; Given in minutes
-poll_interval = 5
-
-INI;
-//Keep this line
\ No newline at end of file
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index ebef1a22..4d196418 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -380,7 +380,7 @@ function pumpio_settings_post(App $a, array &$b)
 
 function pumpio_load_config(App $a)
 {
-	$a->loadConfigFile(__DIR__. '/config/pumpio.ini.php');
+	$a->loadConfigFile(__DIR__ . '/config/pumpio.config.php');
 }
 
 function pumpio_hook_fork(App $a, array &$b)
-- 
2.39.5