[geonames] Update config file style/name

diff --git a/geonames/README.md b/geonames/README.md
index ba90dc5d3a581f3bceb9613429b47f830d7e17b5..443ddf3f0b958efa8bc5fd5c1de07cf66252af8e 100644 (file)
--- a/geonames/README.md
+++ b/geonames/README.md
@@ -7,9 +7,10 @@ Use Geonames service to resolve nearest populated location for given latitude, l
 
 ## Installation
 
-Pre-requisite: Register a username at geonames.org and set in config/addon.ini.php
+Pre-requisite: Register a username at geonames.org and set in `config/addon.config.php`
 
-    [geonames]
-    username = your_username
+    'geonames' => [
+        'username' => 'your_username'
+    ],
 
 Also visit http://geonames.org/manageaccount and enable access to the free web services.
\ No newline at end of file

diff --git a/geonames/config/geonames.config.php b/geonames/config/geonames.config.php
new file mode 100644 (file)
index 0000000..6af3634
--- /dev/null
+++ b/geonames/config/geonames.config.php
@@ -0,0 +1,12 @@
+<?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 [
+       'geonames' => [
+               //username (String)
+               //The geonames.org API username
+               'username' => '',
+       ],
+];

diff --git a/geonames/config/geonames.ini.php b/geonames/config/geonames.ini.php
deleted file mode 100644 (file)
index 280e7a9..0000000
--- a/geonames/config/geonames.ini.php
+++ /dev/null
@@ -1,12 +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
-
-[geonames]
-; username (String)
-; The geonames.org API username
-username =
-
-INI;
-//Keep this line
\ No newline at end of file

diff --git a/geonames/geonames.php b/geonames/geonames.php
index 709e015be4bd7cb7d8dbc43f78295cb52cfff4f5..552ecf5963eb69cd36a8a46c3021093673ff0157 100644 (file)
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -7,7 +7,7 @@
  *
  *
  * Pre-requisite: Register a username at geonames.org
- * and set in config/addon.ini.php
+ * and set in config/addon.config.php
  *
  * [geonames]
  * username = your_username
@@ -78,7 +78,7 @@ function geonames_uninstall() {
 
 function geonames_load_config(\Friendica\App $a)
 {
-       $a->loadConfigFile(__DIR__. '/config/geonames.ini.php');
+       $a->loadConfigFile(__DIR__. '/config/geonames.config.php');
 }
 
 function geonames_post_hook($a, &$item) {