[testdrive] Update config file style/name

diff --git a/testdrive/README.md b/testdrive/README.md
index ad9414eb5bb96bdda2da0a66958cd60f3d062cad..59512aefd057a85714d9cd277c68a4b49313c66c 100644 (file)
--- a/testdrive/README.md
+++ b/testdrive/README.md
@@ -6,10 +6,11 @@ Testdrive is a Friendica addon which implements automatic account expiration so
 
 When an account is created on the site, it is given a hard expiration date of
 
-       [testdrive]
-       expiredays = 30
+       'testdrive' => [
+               'expiredays' => 30,
+       ],
 
-Set this in your config/addon.ini.php file to allow a 30 day test drive period.
+Set this in your `config/addon.config.php` file to allow a 30 day test drive period.
 By default no expiration period is defined in case the addon is activated accidentally.
 
 There is no opportunity to extend an expired account using this addon.

diff --git a/testdrive/config/testdrive.config.php b/testdrive/config/testdrive.config.php
new file mode 100644 (file)
index 0000000..c10acf8
--- /dev/null
+++ b/testdrive/config/testdrive.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 [
+       'testdrive' => [
+               // expiredays (Integer)
+               // When an account is created on the site, it is given a hard expiration date of this many days. 0 to disable.
+               'expiredays' => 0,
+       ],
+];

diff --git a/testdrive/config/testdrive.ini.php b/testdrive/config/testdrive.ini.php
deleted file mode 100644 (file)
index 8d3f863..0000000
--- a/testdrive/config/testdrive.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
-
-[testdrive]
-; expiredays (Integer)
-; When an account is created on the site, it is given a hard expiration date of this many days.
-expiredays =
-
-INI;
-//Keep this line
\ No newline at end of file

diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 2a65692885b24b0e19f025a329b0299ac269017a..4da5959b0867c51dfed1ba6e06f79297ab89d90e 100644 (file)
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -37,7 +37,7 @@ function testdrive_uninstall() {
 
 function testdrive_load_config(App $a)
 {
-       $a->loadConfigFile(__DIR__. '/config/testdrive.ini.php');
+       $a->loadConfigFile(__DIR__ . '/config/testdrive.config.php');
 }
 
 function testdrive_globaldir_update($a,&$b) {