Merge pull request #512 from MrPetovan/task/4116-move-twitteroauth-to-composer

Add missing use in statusnet addon

diff --git a/statusnet/library/statusnetoauth.php b/statusnet/library/statusnetoauth.php
index beed59e7f5139780fd3a9c4df3d7bb21031e8a5c..27d91638b860f7d271b2d346aa489cfeba5a1ed8 100644 (file)
--- a/statusnet/library/statusnetoauth.php
+++ b/statusnet/library/statusnetoauth.php
@@ -1,5 +1,7 @@
 <?php\r
 \r
+use Friendica\Core\Config;\r
+\r
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'twitteroauth.php';\r
 \r
 /*\r

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 8b483c9ea0ef91f8a6a29024e9fe4653c3bc396d..bca5e7db715510dc7d00a783041785b741f4f27d 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -298,17 +298,17 @@ function twitter_settings(App $a, &$s)
                         * account at Twitter.
                         */
                        $connection = new TwitterOAuth($ckey, $csecret);
-                       $request_token = $connection->url('oauth/request_token', ['oauth_callback' => 'oob']);
+                       $result = $connection->oauth('oauth/request_token', ['oauth_callback' => 'oob']);
                        /*                       * *
                         *  make some nice form
                         */
                        $s .= '<p>' . L10n::t('At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.') . '</p>';
-                       $s .= '<a href="' . $connection->url('oauth/authorize', ['oauth_token' => $request_token['oauth_token']]) . '" target="_twitter"><img src="addon/twitter/lighter.png" alt="' . L10n::t('Log in with Twitter') . '"></a>';
+                       $s .= '<a href="' . $connection->url('oauth/authorize', ['oauth_token' => $result->oauth_token]) . '" target="_twitter"><img src="addon/twitter/lighter.png" alt="' . L10n::t('Log in with Twitter') . '"></a>';
                        $s .= '<div id="twitter-pin-wrapper">';
                        $s .= '<label id="twitter-pin-label" for="twitter-pin">' . L10n::t('Copy the PIN from Twitter here') . '</label>';
                        $s .= '<input id="twitter-pin" type="text" name="twitter-pin" />';
-                       $s .= '<input id="twitter-token" type="hidden" name="twitter-token" value="' . $request_token['oauth_token'] . '" />';
-                       $s .= '<input id="twitter-token2" type="hidden" name="twitter-token2" value="' . $request_token['oauth_token_secret'] . '" />';
+                       $s .= '<input id="twitter-token" type="hidden" name="twitter-token" value="' . $result->oauth_token . '" />';
+                       $s .= '<input id="twitter-token2" type="hidden" name="twitter-token2" value="' . $result->oauth_token_secret . '" />';
                        $s .= '</div><div class="clear"></div>';
                        $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
                } else {