X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tumblr%2Ftumblr.php;h=b2dec5b544a3735c35fc74fc785f011b66abb372;hb=3b0decec7f868c831ccba12e82d88b122a637de1;hp=114fcc5b2367941bb39827a7eeb6ac4f06d4126b;hpb=7fb604f0ff544faa567aa93212649413ef727811;p=friendica-addons.git diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php old mode 100755 new mode 100644 index 114fcc5b..b2dec5b5 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -1,29 +1,34 @@ + * Author: Michael Vogel */ -require_once('library/OAuth1.php'); -require_once('addon/tumblr/tumblroauth/tumblroauth.php'); +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() { - 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'); + 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() { - 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'); + 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() {} @@ -31,7 +36,7 @@ function tumblr_module() {} function tumblr_content(&$a) { if(! local_user()) { - notice( t('Permission denied.') . EOL); + notice(L10n::t('Permission denied.') . EOL); return ''; } @@ -53,6 +58,25 @@ function tumblr_content(&$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(); @@ -61,8 +85,8 @@ function tumblr_connect($a) { //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'); + $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 @@ -84,22 +108,22 @@ function tumblr_connect($a) { // 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.'; + 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); } @@ -111,8 +135,8 @@ function tumblr_callback($a) { //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'); + $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) @@ -123,7 +147,7 @@ function tumblr_callback($a) { // 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. + // 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. @@ -132,111 +156,111 @@ function tumblr_callback($a) { // Make sure nothing went wrong. if (200 == $tum_oauth->http_code) { - // good to go + // good to go } else { - return('Unable to authenticate'); + 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']); + 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 = t("You are now authenticated to tumblr."); - $o .= '
'.t("return to the connector page").''; + $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 = 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') . '
'; - } + 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 */ + if(! local_user()) + return; - $a->page['htmlhead'] .= '' . "\r\n"; + /* Add our stylesheet to the page so we can make our settings look nice */ - /* Get the current state of our config variables */ + $a->page['htmlhead'] .= '' . "\r\n"; - $enabled = get_pconfig(local_user(),'tumblr','post'); + /* Get the current state of our config variables */ - $checked = (($enabled) ? ' checked="checked" ' : ''); + $enabled = PConfig::get(local_user(),'tumblr','post'); + $checked = (($enabled) ? ' checked="checked" ' : ''); + $css = (($enabled) ? '' : '-disabled'); - $def_enabled = get_pconfig(local_user(),'tumblr','post_by_default'); + $def_enabled = PConfig::get(local_user(),'tumblr','post_by_default'); - $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); + $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); - /* Add some HTML to the existing form */ + /* Add some HTML to the existing form */ - $s .= ''; - $s .= '

' . t('Tumblr') . '

'; - $s .= ''; - $s .= ''; } @@ -245,40 +269,47 @@ function tumblr_settings_post(&$a,&$b) { if(x($_POST,'tumblr-submit')) { - set_pconfig(local_user(),'tumblr','post',intval($_POST['tumblr'])); - set_pconfig(local_user(),'tumblr','page',$_POST['tumblr_page']); - set_pconfig(local_user(),'tumblr','post_by_default',intval($_POST['tumblr_bydefault'])); + PConfig::set(local_user(),'tumblr','post',intval($_POST['tumblr'])); + PConfig::set(local_user(),'tumblr','page',$_POST['tumblr_page']); + PConfig::set(local_user(),'tumblr','post_by_default',intval($_POST['tumblr_bydefault'])); } } -function tumblr_post_local(&$a,&$b) { +function tumblr_post_local(&$a, &$b) { // This can probably be changed to allow editing by pointing to a different API endpoint - if($b['edit']) + if ($b['edit']) { return; + } - if((! local_user()) || (local_user() != $b['uid'])) + if (!local_user() || (local_user() != $b['uid'])) { return; + } - if($b['private'] || $b['parent']) + if ($b['private'] || $b['parent']) { return; + } - $tmbl_post = intval(get_pconfig(local_user(),'tumblr','post')); + $tmbl_post = intval(PConfig::get(local_user(),'tumblr','post')); $tmbl_enable = (($tmbl_post && x($_REQUEST,'tumblr_enable')) ? intval($_REQUEST['tumblr_enable']) : 0); - if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'tumblr','post_by_default'))) + if ($b['api_source'] && intval(PConfig::get(local_user(),'tumblr','post_by_default'))) { $tmbl_enable = 1; + } - if(! $tmbl_enable) - return; + if (!$tmbl_enable) { + return; + } + + if (strlen($b['postopts'])) { + $b['postopts'] .= ','; + } - if(strlen($b['postopts'])) - $b['postopts'] .= ','; - $b['postopts'] .= 'tumblr'; + $b['postopts'] .= 'tumblr'; } @@ -286,25 +317,32 @@ function tumblr_post_local(&$a,&$b) { function tumblr_send(&$a,&$b) { - if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) - return; + if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) { + return; + } + + if(! strstr($b['postopts'],'tumblr')) { + return; + } - if(! strstr($b['postopts'],'tumblr')) - return; + if($b['parent'] != $b['id']) { + return; + } - if($b['parent'] != $b['id']) - return; + // Dont't post if the post doesn't belong to us. + // This is a check for forum postings + $self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]); + if ($b['contact-id'] != $self['id']) { + return; + } - $oauth_token = get_pconfig($b['uid'], "tumblr", "oauth_token"); - $oauth_token_secret = get_pconfig($b['uid'], "tumblr", "oauth_token_secret"); - $page = get_pconfig($b['uid'], "tumblr", "page"); + $oauth_token = PConfig::get($b['uid'], "tumblr", "oauth_token"); + $oauth_token_secret = PConfig::get($b['uid'], "tumblr", "oauth_token_secret"); + $page = PConfig::get($b['uid'], "tumblr", "page"); $tmbl_blog = 'blog/'.$page.'/post'; if($oauth_token && $oauth_token_secret && $tmbl_blog) { - - require_once('include/bbcode.php'); - - $tag_arr = array(); + $tag_arr = []; $tags = ''; $x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER); @@ -316,64 +354,76 @@ function tumblr_send(&$a,&$b) { if(count($tag_arr)) $tags = implode(',',$tag_arr); - $link = ""; - $video = false; $title = trim($b['title']); - // Checking for a bookmark - if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches)) { - $link = $matches[1]; - if ($title == '') - $title = html_entity_decode($matches[2],ENT_QUOTES,'UTF-8'); + $siteinfo = BBCode::getAttachedData($b["body"]); - $body = $b['body']; - // splitting the text in two parts: - // before and after the bookmark - $pos = strpos($body, "[bookmark"); - $body1 = substr($body, 0, $pos); - $body2 = substr($body, $pos); + $params = [ + 'state' => 'published', + 'tags' => $tags, + 'tweet' => 'off', + 'format' => 'html']; - // Removing the bookmark - $body2 = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'',$body2); - $body = $body1.$body2; + if (!isset($siteinfo["type"])) + $siteinfo["type"] = ""; - $video = ((stristr($link,'youtube')) || (stristr($link,'youtu.be')) || (stristr($mtch[1],'vimeo'))); - } + if (($title == "") && isset($siteinfo["title"])) + $title = $siteinfo["title"]; - $params = array( - 'format' => 'html', - 'tweet' => 'off', - 'tags' => $tags); - - if (($link != '') and $video) { - $params['type'] = "video"; - $params['embed'] = $link; - if ($title != '') - $params['caption'] = '

'.$title. - "

".bbcode($body, false, false, 4)."

"; - else - $params['caption'] = bbcode($body, false, false, 4); - } else if (($link != '') and !$video) { - $params['type'] = "link"; - $params['title'] = $title; - $params['url'] = $link; - $params['description'] = bbcode($b["body"], false, false, 4); - } else { - $params['type'] = "text"; - $params['title'] = $title; - $params['body'] = bbcode($b['body'], false, false, 4); + if (isset($siteinfo["text"])) + $body = $siteinfo["text"]; + else + $body = BBCode::removeShareInformation($b["body"]); + + switch ($siteinfo["type"]) { + case "photo": + $params['type'] = "photo"; + $params['caption'] = BBCode::convert($body, false, 4); + + if (isset($siteinfo["url"])) + $params['link'] = $siteinfo["url"]; + + $params['source'] = $siteinfo["image"]; + break; + case "link": + $params['type'] = "link"; + $params['title'] = $title; + $params['url'] = $siteinfo["url"]; + $params['description'] = BBCode::convert($body, false, 4); + break; + case "audio": + $params['type'] = "audio"; + $params['external_url'] = $siteinfo["url"]; + $params['caption'] = BBCode::convert($body, false, 4); + break; + case "video": + $params['type'] = "video"; + $params['embed'] = $siteinfo["url"]; + $params['caption'] = BBCode::convert($body, false, 4); + break; + default: + $params['type'] = "text"; + $params['title'] = $title; + $params['body'] = BBCode::convert($b['body'], false, 4); + break; } - $consumer_key = get_config('tumblr','consumer_key'); - $consumer_secret = get_config('tumblr','consumer_secret'); + if (isset($params['caption']) && (trim($title) != "")) + $params['caption'] = '

'.$title."

". + "

".$params['caption']."

"; + + if (trim($params['caption']) == "") + $params['caption'] = BBCode::convert("[quote]" . $siteinfo["description"] . "[/quote]", false, 4); + + $consumer_key = Config::get('tumblr','consumer_key'); + $consumer_secret = Config::get('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; - + //print_r($params); if($ret_code == 201) logger('tumblr_send: success'); elseif($ret_code == 403)