X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tumblr%2Ftumblr.php;h=8f258f56f324064342e9219370fe0f88521aa83a;hb=215a18093a2822ccd0ba40b7b07142780bfd917b;hp=01ba04bb0a5f7f38f9f6fbbe0c034e34e718c80b;hpb=57232bcaa4f01053a1c31c44fdb30b9b31710537;p=friendica-addons.git
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
old mode 100755
new mode 100644
index 01ba04bb..8f258f56
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -1,379 +1,439 @@
-
- */
-
-require_once('library/OAuth1.php');
-require_once('addon/tumblr/tumblroauth/tumblroauth.php');
-
-function tumblr_install() {
- register_hook('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local');
- register_hook('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send');
- register_hook('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets');
- register_hook('connector_settings', 'addon/tumblr/tumblr.php', 'tumblr_settings');
- register_hook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
-
-}
-function tumblr_uninstall() {
- unregister_hook('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local');
- unregister_hook('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send');
- unregister_hook('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets');
- unregister_hook('connector_settings', 'addon/tumblr/tumblr.php', 'tumblr_settings');
- unregister_hook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
-}
-
-function tumblr_module() {}
-
-function tumblr_content(&$a) {
-
- if(! local_user()) {
- notice( t('Permission denied.') . EOL);
- return '';
- }
-
- if (isset($a->argv[1]))
- switch ($a->argv[1]) {
- case "connect":
- $o = tumblr_connect($a);
- break;
- case "callback":
- $o = tumblr_callback($a);
- break;
- default:
- $o = print_r($a->argv, true);
- break;
- }
- else
- $o = tumblr_connect($a);
-
- return $o;
-}
-
-function tumblr_connect($a) {
- // Start a session. This is necessary to hold on to a few keys the callback script will also need
- session_start();
-
- // Include the TumblrOAuth library
- //require_once('addon/tumblr/tumblroauth/tumblroauth.php');
-
- // Define the needed keys
- $consumer_key = get_config('tumblr','consumer_key');
- $consumer_secret = get_config('tumblr','consumer_secret');
-
- // The callback URL is the script that gets called after the user authenticates with tumblr
- // In this example, it would be the included callback.php
- $callback_url = $a->get_baseurl()."/tumblr/callback";
-
- // Let's begin. First we need a Request Token. The request token is required to send the user
- // to Tumblr's login page.
-
- // Create a new instance of the TumblrOAuth library. For this step, all we need to give the library is our
- // Consumer Key and Consumer Secret
- $tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret);
-
- // Ask Tumblr for a Request Token. Specify the Callback URL here too (although this should be optional)
- $request_token = $tum_oauth->getRequestToken($callback_url);
-
- // Store the request token and Request Token Secret as out callback.php script will need this
- $_SESSION['request_token'] = $token = $request_token['oauth_token'];
- $_SESSION['request_token_secret'] = $request_token['oauth_token_secret'];
-
- // Check the HTTP Code. It should be a 200 (OK), if it's anything else then something didn't work.
- switch ($tum_oauth->http_code) {
- case 200:
- // Ask Tumblr to give us a special address to their login page
- $url = $tum_oauth->getAuthorizeURL($token);
-
- // Redirect the user to the login URL given to us by Tumblr
- header('Location: ' . $url);
-
- // That's it for our side. The user is sent to a Tumblr Login page and
- // asked to authroize our app. After that, Tumblr sends the user back to
- // our Callback URL (callback.php) along with some information we need to get
- // an access token.
-
- break;
- default:
- // Give an error message
- $o = 'Could not connect to Tumblr. Refresh the page or try again later.';
- }
- return($o);
-}
-
-function tumblr_callback($a) {
-
- // Start a session, load the library
- session_start();
- //require_once('addon/tumblr/tumblroauth/tumblroauth.php');
-
- // Define the needed keys
- $consumer_key = get_config('tumblr','consumer_key');
- $consumer_secret = get_config('tumblr','consumer_secret');
-
- // Once the user approves your app at Tumblr, they are sent back to this script.
- // This script is passed two parameters in the URL, oauth_token (our Request Token)
- // and oauth_verifier (Key that we need to get Access Token).
- // We'll also need out Request Token Secret, which we stored in a session.
-
- // Create instance of TumblrOAuth.
- // It'll need our Consumer Key and Secret as well as our Request Token and Secret
- $tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $_SESSION['request_token'], $_SESSION['request_token_secret']);
-
- // Ok, let's get an Access Token. We'll need to pass along our oauth_verifier which was given to us in the URL.
- $access_token = $tum_oauth->getAccessToken($_REQUEST['oauth_verifier']);
-
- // We're done with the Request Token and Secret so let's remove those.
- unset($_SESSION['request_token']);
- unset($_SESSION['request_token_secret']);
-
- // Make sure nothing went wrong.
- if (200 == $tum_oauth->http_code) {
- // good to go
- } else {
- return('Unable to authenticate');
- }
-
- // What's next? Now that we have an Access Token and Secret, we can make an API call.
- set_pconfig(local_user(), "tumblr", "oauth_token", $access_token['oauth_token']);
- set_pconfig(local_user(), "tumblr", "oauth_token_secret", $access_token['oauth_token_secret']);
-
- $o = t("You are now authenticated to tumblr.");
- $o .= ' '.t("return to the connector page").'';
- return($o);
-}
-
-function tumblr_jot_nets(&$a,&$b) {
- if(! local_user())
- return;
-
- $tmbl_post = get_pconfig(local_user(),'tumblr','post');
- if(intval($tmbl_post) == 1) {
- $tmbl_defpost = get_pconfig(local_user(),'tumblr','post_by_default');
- $selected = ((intval($tmbl_defpost) == 1) ? ' checked="checked" ' : '');
- $b .= '
'
- . t('Post to Tumblr') . '
';
- }
-}
-
-
-function tumblr_settings(&$a,&$s) {
-
- if(! local_user())
- return;
-
- /* Add our stylesheet to the page so we can make our settings look nice */
-
- $a->page['htmlhead'] .= '' . "\r\n";
-
- /* Get the current state of our config variables */
-
- $enabled = get_pconfig(local_user(),'tumblr','post');
-
- $checked = (($enabled) ? ' checked="checked" ' : '');
-
- $def_enabled = get_pconfig(local_user(),'tumblr','post_by_default');
-
- $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
-
- /* Add some HTML to the existing form */
-
- $s .= '
";
- else
- $params['caption'] = bbcode($body, false, false);
- } else if (($link != '') and !$video) {
- $params['type'] = "link";
- $params['title'] = $title;
- $params['url'] = $link;
- $params['description'] = bbcode($b["body"], false, false);
- } else {
- $params['type'] = "text";
- $params['title'] = $title;
- $params['body'] = bbcode($b['body'], false, false);
- }
-
- $consumer_key = get_config('tumblr','consumer_key');
- $consumer_secret = get_config('tumblr','consumer_secret');
-
- $tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);
-
- // Make an API call with the TumblrOAuth instance.
- $x = $tum_oauth->post($tmbl_blog,$params);
-
- $ret_code = $tum_oauth->http_code;
-
- if($ret_code == 201)
- logger('tumblr_send: success');
- elseif($ret_code == 403)
- logger('tumblr_send: authentication failure');
- else
- logger('tumblr_send: general error: ' . print_r($x,true));
-
- }
-}
+
+ * Author: Michael Vogel
+ */
+
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'tumblroauth.php';
+
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\Addon;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
+
+function tumblr_install() {
+ Addon::registerHook('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local');
+ Addon::registerHook('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send');
+ Addon::registerHook('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets');
+ Addon::registerHook('connector_settings', 'addon/tumblr/tumblr.php', 'tumblr_settings');
+ Addon::registerHook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
+
+}
+function tumblr_uninstall() {
+ Addon::unregisterHook('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local');
+ Addon::unregisterHook('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send');
+ Addon::unregisterHook('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets');
+ Addon::unregisterHook('connector_settings', 'addon/tumblr/tumblr.php', 'tumblr_settings');
+ Addon::unregisterHook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
+}
+
+function tumblr_module() {}
+
+function tumblr_content(&$a) {
+
+ if(! local_user()) {
+ notice(L10n::t('Permission denied.') . EOL);
+ return '';
+ }
+
+ if (isset($a->argv[1]))
+ switch ($a->argv[1]) {
+ case "connect":
+ $o = tumblr_connect($a);
+ break;
+ case "callback":
+ $o = tumblr_callback($a);
+ break;
+ default:
+ $o = print_r($a->argv, true);
+ break;
+ }
+ else
+ $o = tumblr_connect($a);
+
+ return $o;
+}
+
+function tumblr_addon_admin(&$a, &$o){
+ $t = get_markup_template( "admin.tpl", "addon/tumblr/" );
+
+ $o = replace_macros($t, [
+ '$submit' => L10n::t('Save Settings'),
+ // name, label, value, help, [extra values]
+ '$consumer_key' => ['consumer_key', L10n::t('Consumer Key'), Config::get('tumblr', 'consumer_key' ), ''],
+ '$consumer_secret' => ['consumer_secret', L10n::t('Consumer Secret'), Config::get('tumblr', 'consumer_secret' ), ''],
+ ]);
+}
+
+function tumblr_addon_admin_post(&$a){
+ $consumer_key = ((x($_POST,'consumer_key')) ? notags(trim($_POST['consumer_key'])) : '');
+ $consumer_secret = ((x($_POST,'consumer_secret')) ? notags(trim($_POST['consumer_secret'])): '');
+ Config::set('tumblr','consumer_key',$consumer_key);
+ Config::set('tumblr','consumer_secret',$consumer_secret);
+ info(L10n::t('Settings updated.'). EOL);
+}
+
+function tumblr_connect($a) {
+ // Start a session. This is necessary to hold on to a few keys the callback script will also need
+ session_start();
+
+ // Include the TumblrOAuth library
+ //require_once('addon/tumblr/tumblroauth/tumblroauth.php');
+
+ // Define the needed keys
+ $consumer_key = Config::get('tumblr','consumer_key');
+ $consumer_secret = Config::get('tumblr','consumer_secret');
+
+ // The callback URL is the script that gets called after the user authenticates with tumblr
+ // In this example, it would be the included callback.php
+ $callback_url = $a->get_baseurl()."/tumblr/callback";
+
+ // Let's begin. First we need a Request Token. The request token is required to send the user
+ // to Tumblr's login page.
+
+ // Create a new instance of the TumblrOAuth library. For this step, all we need to give the library is our
+ // Consumer Key and Consumer Secret
+ $tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret);
+
+ // Ask Tumblr for a Request Token. Specify the Callback URL here too (although this should be optional)
+ $request_token = $tum_oauth->getRequestToken($callback_url);
+
+ // Store the request token and Request Token Secret as out callback.php script will need this
+ $_SESSION['request_token'] = $token = $request_token['oauth_token'];
+ $_SESSION['request_token_secret'] = $request_token['oauth_token_secret'];
+
+ // Check the HTTP Code. It should be a 200 (OK), if it's anything else then something didn't work.
+ switch ($tum_oauth->http_code) {
+ case 200:
+ // Ask Tumblr to give us a special address to their login page
+ $url = $tum_oauth->getAuthorizeURL($token);
+
+ // Redirect the user to the login URL given to us by Tumblr
+ header('Location: ' . $url);
+
+ // That's it for our side. The user is sent to a Tumblr Login page and
+ // asked to authroize our app. After that, Tumblr sends the user back to
+ // our Callback URL (callback.php) along with some information we need to get
+ // an access token.
+
+ break;
+ default:
+ // Give an error message
+ $o = 'Could not connect to Tumblr. Refresh the page or try again later.';
+ }
+ return($o);
+}
+
+function tumblr_callback($a) {
+
+ // Start a session, load the library
+ session_start();
+ //require_once('addon/tumblr/tumblroauth/tumblroauth.php');
+
+ // Define the needed keys
+ $consumer_key = Config::get('tumblr','consumer_key');
+ $consumer_secret = Config::get('tumblr','consumer_secret');
+
+ // Once the user approves your app at Tumblr, they are sent back to this script.
+ // This script is passed two parameters in the URL, oauth_token (our Request Token)
+ // and oauth_verifier (Key that we need to get Access Token).
+ // We'll also need out Request Token Secret, which we stored in a session.
+
+ // Create instance of TumblrOAuth.
+ // It'll need our Consumer Key and Secret as well as our Request Token and Secret
+ $tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $_SESSION['request_token'], $_SESSION['request_token_secret']);
+
+ // Ok, let's get an Access Token. We'll need to pass along our oauth_verifier which was given to us in the URL.
+ $access_token = $tum_oauth->getAccessToken($_REQUEST['oauth_verifier']);
+
+ // We're done with the Request Token and Secret so let's remove those.
+ unset($_SESSION['request_token']);
+ unset($_SESSION['request_token_secret']);
+
+ // Make sure nothing went wrong.
+ if (200 == $tum_oauth->http_code) {
+ // good to go
+ } else {
+ return('Unable to authenticate');
+ }
+
+ // What's next? Now that we have an Access Token and Secret, we can make an API call.
+ PConfig::set(local_user(), "tumblr", "oauth_token", $access_token['oauth_token']);
+ PConfig::set(local_user(), "tumblr", "oauth_token_secret", $access_token['oauth_token_secret']);
+
+ $o = L10n::t("You are now authenticated to tumblr.");
+ $o .= ' '.L10n::t("return to the connector page").'';
+ return($o);
+}
+
+function tumblr_jot_nets(&$a,&$b) {
+ if(! local_user())
+ return;
+
+ $tmbl_post = PConfig::get(local_user(),'tumblr','post');
+ if(intval($tmbl_post) == 1) {
+ $tmbl_defpost = PConfig::get(local_user(),'tumblr','post_by_default');
+ $selected = ((intval($tmbl_defpost) == 1) ? ' checked="checked" ' : '');
+ $b .= '
'
+ . L10n::t('Post to Tumblr') . '
';
+ }
+}
+
+
+function tumblr_settings(&$a,&$s) {
+
+ if(! local_user())
+ return;
+
+ /* Add our stylesheet to the page so we can make our settings look nice */
+
+ $a->page['htmlhead'] .= '' . "\r\n";
+
+ /* Get the current state of our config variables */
+
+ $enabled = PConfig::get(local_user(),'tumblr','post');
+ $checked = (($enabled) ? ' checked="checked" ' : '');
+ $css = (($enabled) ? '' : '-disabled');
+
+ $def_enabled = PConfig::get(local_user(),'tumblr','post_by_default');
+
+ $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
+
+ /* Add some HTML to the existing form */
+
+ $s .= '';
+ $s .= '