X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=twitter%2Ftwitter.php;h=673b3b75301f56a05c6b54f7defca0f206eb3aec;hb=81dc1e5eb1bc4a42fa485cb668b200a63fb1feaa;hp=7fe8bd844a5b8a2214c8b28566129521cbab73ad;hpb=bbaf463a204f84d0ac05336925abf99ae3583b8e;p=friendica-addons.git
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 7fe8bd84..673b3b75 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -69,9 +69,7 @@ use Friendica\App;
use Friendica\Content\OEmbed;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\Plaintext;
-use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
@@ -167,8 +165,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');
@@ -203,7 +201,7 @@ function twitter_jot_nets(App $a, array &$jotnets_fields)
'type' => 'checkbox',
'field' => [
'twitter_enable',
- L10n::t('Post to Twitter'),
+ DI::l10n()->t('Post to Twitter'),
DI::pConfig()->get(local_user(), 'twitter', 'post_by_default')
]
];
@@ -241,14 +239,14 @@ 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
try {
if (empty($_POST['twitter-pin'])) {
- throw new Exception(L10n::t('You submitted an empty PIN, please Sign In with Twitter again to get a new one.'));
+ throw new Exception(DI::l10n()->t('You submitted an empty PIN, please Sign In with Twitter again to get a new one.'));
}
$connection = new TwitterOAuth($ckey, $csecret, $_POST['twitter-token'], $_POST['twitter-token2']);
@@ -277,7 +275,7 @@ function twitter_settings_post(App $a)
DI::pConfig()->delete(local_user(), 'twitter', 'lastid');
}
- info(L10n::t('Twitter settings updated.') . EOL);
+ info(DI::l10n()->t('Twitter settings updated.') . EOL);
}
}
}
@@ -293,8 +291,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');
@@ -307,18 +305,18 @@ function twitter_settings(App $a, &$s)
$css = (($enabled) ? '' : '-disabled');
$s .= '';
- $s .= '' . L10n::t('Twitter Import/Export/Mirror') . '
';
+ $s .= '' . DI::l10n()->t('Twitter Import/Export/Mirror') . '
';
$s .= '';
$s .= '