friendica/friendica-addons
7
2
Fork 14
Code Issues 3 Pull requests 3 Releases 16 Wiki Activity

[twitter] Update config file style/name

Browse source
This commit is contained in:
Hypolite Petovan 2018-11-25 02:16:41 -05:00
parent 336276727f
commit b655c18adb
4 changed files with 36 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
twitter/README.md
View file

@ -16,13 +16,21 @@ After the registration please enter the values for "Consumer Key" and "Consumer
## Alternative configuration ## Alternative configuration
Add your key pair to your global config/addon.ini.php. Open the `config/local.config.php` file and add "twitter" to the list of activated addons:
[twitter] 'system' => [
consumerkey = your consumer_key here ...
consumersecret = your consumer_secret here 'addon' => '...,twitter'
...
]
Add your key pair to your global `config/addon.config.php`.
'twitter' => [
'consumerkey' => 'your consumer_key here',
'consumersecret' => 'your consumer_secret here',
],
To activate the addon itself add it to the [system] addon setting.
After this, users can configure their Twitter account settings from "Settings -> Addon Settings". After this, users can configure their Twitter account settings from "Settings -> Addon Settings".
## License ## License

16
twitter/config/twitter.config.php Normal file
View file

@ -0,0 +1,16 @@
<?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 [
'twitter' => [
// consumerkey (String)
// OAuth Consumer Key provided by Twitter on registering an app at https://twitter.com/apps
'consumerkey' => '',
// consumersecret (String)
// OAuth Consumer Secret provided by Twitter on registering an app at https://twitter.com/apps
'consumersecret' => '',
],
];

16
twitter/config/twitter.ini.php
View file

@ -1,16 +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
[twitter]
; consumerkey (String)
; OAuth Consumer Key provided by Twitter on registering an app at https://twitter.com/apps
consumerkey =
; consumersecret (String)
; OAuth Consumer Secret provided by Twitter on registering an app at https://twitter.com/apps
consumersecret =
INI;
//Keep this line

13
twitter/twitter.php
View file

@ -48,13 +48,14 @@
* we do not need "Twitter as login". When you've registered the app you get the * we do not need "Twitter as login". When you've registered the app you get the
* OAuth Consumer key and secret pair for your application/site. * OAuth Consumer key and secret pair for your application/site.
* *
* Add this key pair to your global config/addon.ini.php or use the admin panel. * Add this key pair to your global config/addon.config.php or use the admin panel.
* *
* [twitter] * 'twitter' => [
* consumerkey = your consumer_key here * 'consumerkey' => '',
* consumersecret = your consumer_secret here * 'consumersecret' => '',
* ],
* *
* To activate the addon itself add it to the [system] addon * To activate the addon itself add it to the system.addon
* setting. After this, your user can configure their Twitter account settings * setting. After this, your user can configure their Twitter account settings
* from "Settings -> Addon Settings". * from "Settings -> Addon Settings".
* *
@ -141,7 +142,7 @@ function twitter_uninstall()
function twitter_load_config(App $a) function twitter_load_config(App $a)
{ {
$a->loadConfigFile(__DIR__ . '/config/twitter.ini.php'); $a->loadConfigFile(__DIR__ . '/config/twitter.config.php');
} }
function twitter_check_item_notification(App $a, array &$notification_data) function twitter_check_item_notification(App $a, array &$notification_data)