Merge pull request #633 from MrPetovan/task/4889-move-config-to-config

Move configuration to config/
This commit is contained in:
Michael Vogel 2018-07-18 11:04:38 +02:00 committed by GitHub
commit 3940618a4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 607 additions and 223 deletions

View file

@ -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/addon.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.

View file

@ -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/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

View file

@ -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');
@ -101,7 +103,7 @@ function pumpio_registerclient(&$a, $host)
$application_name = $a->get_hostname();
}
$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
$adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
$params["type"] = "client_associate";
$params["contacts"] = $adminlist[0];
@ -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'])) {

View file

@ -2,7 +2,7 @@
use Friendica\Core\Config;
function pumpio_sync_run(&$argv, &$argc) {
global $a;
$a = Friendica\BaseObject::getApp();
require_once("addon/pumpio/pumpio.php");