[testdrive] Add addon config

- Update mentions of .htconfig.php

diff --git a/testdrive/README.md b/testdrive/README.md
index edc63ed57c5939857f391e6fd6242ea9e960ed22..a880cc86dafb352288644f64370dc2c56e5f4bdd 100644 (file)
--- a/testdrive/README.md
+++ b/testdrive/README.md
@@ -3,21 +3,20 @@ TestDrive
 
 
 Testdrive is a Friendica addon which implements automatic account expiration so that a site may be used as a public
-test bed. 
+test bed.
 
-When an account is created on the site, it is given a hard expiration date of 
+When an account is created on the site, it is given a hard expiration date of
 
+       [testdrive]
+       expiredays = 30
 
-$a->config['testdrive']['expiredays'] = 30;
-
-Set this in your .htconfig.php file to allow a 30 day test drive period. By default no expiration period is defined 
-in case the addon is activated accidentally. 
+Set this in your config/local.ini.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. Expiration is final. Other addons may be created
 which charge for service and extend the expiration as long as a balance is maintained. This addon is purely for creating
-a limited use test site. 
+a limited use test site.
 
-An email warning will be sent out approximately five days before the expiration occurs. Once it occurs logins and many 
-system functions are disabled. Five days later the account is removed completely. 
-   
\ No newline at end of file
+An email warning will be sent out approximately five days before the expiration occurs. Once it occurs logins and many
+system functions are disabled. Five days later the account is removed completely.

diff --git a/testdrive/config/testdrive.ini.php b/testdrive/config/testdrive.ini.php
new file mode 100644 (file)
index 0000000..253a21d
--- /dev/null
+++ b/testdrive/config/testdrive.ini.php
@@ -0,0 +1,12 @@
+<?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
+
+[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 5c3930cd35188167186d1b21fc185c18debf210e..2f778d57678429ffd46dfabd4c637b2dfd23936a 100644 (file)
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -14,6 +14,7 @@ use Friendica\Util\DateTimeFormat;
 
 function testdrive_install() {
 
+       Addon::registerHook('load_config',      'addon/testdrive/testdrive.php', 'testdrive_load_config');
        Addon::registerHook('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account');
        Addon::registerHook('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron');
        Addon::registerHook('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify');
@@ -24,6 +25,7 @@ function testdrive_install() {
 
 function testdrive_uninstall() {
 
+       Addon::unregisterHook('load_config',      'addon/testdrive/testdrive.php', 'testdrive_load_config');
        Addon::unregisterHook('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account');
        Addon::unregisterHook('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron');
        Addon::unregisterHook('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify');
@@ -31,6 +33,11 @@ function testdrive_uninstall() {
 
 }
 
+function testdrive_load_config(\Friendica\App $a)
+{
+       $a->loadConfigFile(__DIR__. '/config/testdrive.ini.php');
+}
+
 function testdrive_globaldir_update($a,&$b) {
        $b['url'] = '';
 }