mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2025-06-17 04:45:14 +02:00
Move Config::get() to DI::config()->get()
This commit is contained in:
nupplaPhil
parent
c67ad31c8b
commit
1ce63185ab
38 changed files with 342 additions and 342 deletions
|
|
@ -166,8 +166,8 @@ function twitter_follow(App $a, array &$contact)
|
|||
|
||||
$uid = $a->user["uid"];
|
||||
|
||||
$ckey = Config::get('twitter', 'consumerkey');
|
||||
$csecret = Config::get('twitter', 'consumersecret');
|
||||
$ckey = DI::config()->get('twitter', 'consumerkey');
|
||||
$csecret = DI::config()->get('twitter', 'consumersecret');
|
||||
$otoken = DI::pConfig()->get($uid, 'twitter', 'oauthtoken');
|
||||
$osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret');
|
||||
|
||||
|
|
@ -240,8 +240,8 @@ function twitter_settings_post(App $a)
|
|||
if (isset($_POST['twitter-pin'])) {
|
||||
// if the user supplied us with a PIN from Twitter, let the magic of OAuth happen
|
||||
Logger::notice('got a Twitter PIN');
|
||||
$ckey = Config::get('twitter', 'consumerkey');
|
||||
$csecret = Config::get('twitter', 'consumersecret');
|
||||
$ckey = DI::config()->get('twitter', 'consumerkey');
|
||||
$csecret = DI::config()->get('twitter', 'consumersecret');
|
||||
// the token and secret for which the PIN was generated were hidden in the settings
|
||||
// form as token and token2, we need a new connection to Twitter using these token
|
||||
// and secret to request a Access Token with the PIN
|
||||
|
|
@ -292,8 +292,8 @@ function twitter_settings(App $a, &$s)
|
|||
* 2) If no OAuthtoken & stuff is present, generate button to get some
|
||||
* 3) Checkbox for "Send public notices (280 chars only)
|
||||
*/
|
||||
$ckey = Config::get('twitter', 'consumerkey');
|
||||
$csecret = Config::get('twitter', 'consumersecret');
|
||||
$ckey = DI::config()->get('twitter', 'consumerkey');
|
||||
$csecret = DI::config()->get('twitter', 'consumersecret');
|
||||
$otoken = DI::pConfig()->get(local_user(), 'twitter', 'oauthtoken');
|
||||
$osecret = DI::pConfig()->get(local_user(), 'twitter', 'oauthsecret');
|
||||
|
||||
|
|
@ -472,8 +472,8 @@ function twitter_post_local(App $a, array &$b)
|
|||
|
||||
function twitter_action(App $a, $uid, $pid, $action)
|
||||
{
|
||||
$ckey = Config::get('twitter', 'consumerkey');
|
||||
$csecret = Config::get('twitter', 'consumersecret');
|
||||
$ckey = DI::config()->get('twitter', 'consumerkey');
|
||||
$csecret = DI::config()->get('twitter', 'consumersecret');
|
||||
$otoken = DI::pConfig()->get($uid, 'twitter', 'oauthtoken');
|
||||
$osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret');
|
||||
|
||||
|
|
@ -588,8 +588,8 @@ function twitter_post_hook(App $a, array &$b)
|
|||
|
||||
DI::pConfig()->load($b['uid'], 'twitter');
|
||||
|
||||
$ckey = Config::get('twitter', 'consumerkey');
|
||||
$csecret = Config::get('twitter', 'consumersecret');
|
||||
$ckey = DI::config()->get('twitter', 'consumerkey');
|
||||
$csecret = DI::config()->get('twitter', 'consumersecret');
|
||||
$otoken = DI::pConfig()->get($b['uid'], 'twitter', 'oauthtoken');
|
||||
$osecret = DI::pConfig()->get($b['uid'], 'twitter', 'oauthsecret');
|
||||
|
||||
|
|
@ -728,16 +728,16 @@ function twitter_addon_admin(App $a, &$o)
|
|||
$o = Renderer::replaceMacros($t, [
|
||||
'$submit' => DI::l10n()->t('Save Settings'),
|
||||
// name, label, value, help, [extra values]
|
||||
'$consumerkey' => ['consumerkey', DI::l10n()->t('Consumer key'), Config::get('twitter', 'consumerkey'), ''],
|
||||
'$consumersecret' => ['consumersecret', DI::l10n()->t('Consumer secret'), Config::get('twitter', 'consumersecret'), ''],
|
||||
'$consumerkey' => ['consumerkey', DI::l10n()->t('Consumer key'), DI::config()->get('twitter', 'consumerkey'), ''],
|
||||
'$consumersecret' => ['consumersecret', DI::l10n()->t('Consumer secret'), DI::config()->get('twitter', 'consumersecret'), ''],
|
||||
]);
|
||||
}
|
||||
|
||||
function twitter_cron(App $a)
|
||||
{
|
||||
$last = Config::get('twitter', 'last_poll');
|
||||
$last = DI::config()->get('twitter', 'last_poll');
|
||||
|
||||
$poll_interval = intval(Config::get('twitter', 'poll_interval'));
|
||||
$poll_interval = intval(DI::config()->get('twitter', 'poll_interval'));
|
||||
if (!$poll_interval) {
|
||||
$poll_interval = TWITTER_DEFAULT_POLL_INTERVAL;
|
||||
}
|
||||
|
|
@ -759,7 +759,7 @@ function twitter_cron(App $a)
|
|||
}
|
||||
}
|
||||
|
||||
$abandon_days = intval(Config::get('system', 'account_abandon_days'));
|
||||
$abandon_days = intval(DI::config()->get('system', 'account_abandon_days'));
|
||||
if ($abandon_days < 1) {
|
||||
$abandon_days = 0;
|
||||
}
|
||||
|
|
@ -803,7 +803,7 @@ function twitter_cron(App $a)
|
|||
|
||||
function twitter_expire(App $a)
|
||||
{
|
||||
$days = Config::get('twitter', 'expire');
|
||||
$days = DI::config()->get('twitter', 'expire');
|
||||
|
||||
if ($days == 0) {
|
||||
return;
|
||||
|
|
@ -929,13 +929,13 @@ function twitter_do_mirrorpost(App $a, $uid, $post)
|
|||
|
||||
function twitter_fetchtimeline(App $a, $uid)
|
||||
{
|
||||
$ckey = Config::get('twitter', 'consumerkey');
|
||||
$csecret = Config::get('twitter', 'consumersecret');
|
||||
$ckey = DI::config()->get('twitter', 'consumerkey');
|
||||
$csecret = DI::config()->get('twitter', 'consumersecret');
|
||||
$otoken = DI::pConfig()->get($uid, 'twitter', 'oauthtoken');
|
||||
$osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret');
|
||||
$lastid = DI::pConfig()->get($uid, 'twitter', 'lastid');
|
||||
|
||||
$application_name = Config::get('twitter', 'application_name');
|
||||
$application_name = DI::config()->get('twitter', 'application_name');
|
||||
|
||||
if ($application_name == "") {
|
||||
$application_name = DI::baseUrl()->getHostname();
|
||||
|
|
@ -1095,8 +1095,8 @@ function twitter_fetch_contact($uid, $data, $create_user)
|
|||
|
||||
function twitter_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
|
||||
{
|
||||
$ckey = Config::get('twitter', 'consumerkey');
|
||||
$csecret = Config::get('twitter', 'consumersecret');
|
||||
$ckey = DI::config()->get('twitter', 'consumerkey');
|
||||
$csecret = DI::config()->get('twitter', 'consumersecret');
|
||||
$otoken = DI::pConfig()->get($uid, 'twitter', 'oauthtoken');
|
||||
$osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret');
|
||||
|
||||
|
|
@ -1619,8 +1619,8 @@ function twitter_fetchparentposts(App $a, $uid, $post, TwitterOAuth $connection,
|
|||
|
||||
function twitter_fetchhometimeline(App $a, $uid)
|
||||
{
|
||||
$ckey = Config::get('twitter', 'consumerkey');
|
||||
$csecret = Config::get('twitter', 'consumersecret');
|
||||
$ckey = DI::config()->get('twitter', 'consumerkey');
|
||||
$csecret = DI::config()->get('twitter', 'consumersecret');
|
||||
$otoken = DI::pConfig()->get($uid, 'twitter', 'oauthtoken');
|
||||
$osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret');
|
||||
$create_user = DI::pConfig()->get($uid, 'twitter', 'create_user');
|
||||
|
|
@ -1628,7 +1628,7 @@ function twitter_fetchhometimeline(App $a, $uid)
|
|||
|
||||
Logger::log("Fetching timeline for user " . $uid, Logger::DEBUG);
|
||||
|
||||
$application_name = Config::get('twitter', 'application_name');
|
||||
$application_name = DI::config()->get('twitter', 'application_name');
|
||||
|
||||
if ($application_name == "") {
|
||||
$application_name = DI::baseUrl()->getHostname();
|
||||
|
|
@ -1803,8 +1803,8 @@ function twitter_fetchhometimeline(App $a, $uid)
|
|||
|
||||
function twitter_fetch_own_contact(App $a, $uid)
|
||||
{
|
||||
$ckey = Config::get('twitter', 'consumerkey');
|
||||
$csecret = Config::get('twitter', 'consumersecret');
|
||||
$ckey = DI::config()->get('twitter', 'consumerkey');
|
||||
$csecret = DI::config()->get('twitter', 'consumersecret');
|
||||
$otoken = DI::pConfig()->get($uid, 'twitter', 'oauthtoken');
|
||||
$osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret');
|
||||
|
||||
|
|
@ -1878,8 +1878,8 @@ function twitter_is_retweet(App $a, $uid, $body)
|
|||
|
||||
Logger::log('twitter_is_retweet: Retweeting id ' . $id . ' for user ' . $uid, Logger::DEBUG);
|
||||
|
||||
$ckey = Config::get('twitter', 'consumerkey');
|
||||
$csecret = Config::get('twitter', 'consumersecret');
|
||||
$ckey = DI::config()->get('twitter', 'consumerkey');
|
||||
$csecret = DI::config()->get('twitter', 'consumersecret');
|
||||
$otoken = DI::pConfig()->get($uid, 'twitter', 'oauthtoken');
|
||||
$osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret');
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ function twitter_sync_run($argv, $argc)
|
|||
|
||||
if (function_exists('sys_getloadavg')) {
|
||||
$load = sys_getloadavg();
|
||||
if (intval($load[0]) > Config::get('system', 'maxloadavg', 50)) {
|
||||
if (intval($load[0]) > DI::config()->get('system', 'maxloadavg', 50)) {
|
||||
Logger::log('system: load ' . $load[0] . ' too high. Twitter sync deferred to next scheduled run.');
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue