[pumpio] Add addon config

- Update mentions of .htconfig.php

diff --git a/pumpio/README.md b/pumpio/README.md
index 4dd90d5f5c3d8dc62b0af295c1e3e1c470abd15c..8db84f6175d6c75ce5e91224a04be264b3b5ad7d 100644 (file)
--- a/pumpio/README.md
+++ b/pumpio/README.md
@@ -1,5 +1,6 @@
-To let the connector work properly you should define an application name in the .htconfig:
+To let the connector work properly you should define an application name in config/local.ini.php:
 
-$a->config['pumpio']['application_name'] = "Name of you site";
+[pumpio]
+application_name = Name of you site
 
-This name appears at pump.io and is important for not mirroring back posts that came from friendica.
+This name appears at pump.io and is important for not mirroring back posts that came from Friendica.

diff --git a/pumpio/config/pumpio.ini.php b/pumpio/config/pumpio.ini.php
new file mode 100644 (file)
index 0000000..1840cea
--- /dev/null
+++ b/pumpio/config/pumpio.ini.php
@@ -0,0 +1,21 @@
+<?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
+
+[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 9e02a74d459f1e503a64b64b36bdb5258116303f..c0d70e1ce273b1cd52adebeb71a2cb5496ec9ceb 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -32,6 +32,7 @@ define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 
 function pumpio_install()
 {
+       Addon::registerHook('load_config',          'addon/pumpio/pumpio.php', 'pumpio_load_config');
        Addon::registerHook('post_local',           'addon/pumpio/pumpio.php', 'pumpio_post_local');
        Addon::registerHook('notifier_normal',      'addon/pumpio/pumpio.php', 'pumpio_send');
        Addon::registerHook('jot_networks',         'addon/pumpio/pumpio.php', 'pumpio_jot_nets');
@@ -44,6 +45,7 @@ function pumpio_install()
 
 function pumpio_uninstall()
 {
+       Addon::unregisterHook('load_config',      'addon/pumpio/pumpio.php', 'pumpio_load_config');
        Addon::unregisterHook('post_local',       'addon/pumpio/pumpio.php', 'pumpio_post_local');
        Addon::unregisterHook('notifier_normal',  'addon/pumpio/pumpio.php', 'pumpio_send');
        Addon::unregisterHook('jot_networks',     'addon/pumpio/pumpio.php', 'pumpio_jot_nets');
@@ -372,6 +374,11 @@ function pumpio_settings_post(&$a, &$b)
        }
 }
 
+function pumpio_load_config(\Friendica\App $a)
+{
+       $a->loadConfigFile(__DIR__. '/config/pumpio.ini.php');
+}
+
 function pumpio_post_local(&$a, &$b)
 {
        if (!local_user() || (local_user() != $b['uid'])) {