X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tumblr%2Ftumblr.php;h=619ff16e807f43611f6b7af7c963adca9372da99;hb=aa8c44dcc8df95db4d38fcd33103cb71562f3b66;hp=c07dc4cff2710fc6bccf3b3b154eec7c88ad3cdf;hpb=0b459e83794fff75fc9cbd980738147e367becf4;p=friendica-addons.git diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php old mode 100755 new mode 100644 index c07dc4cf..619ff16e --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -3,27 +3,28 @@ /** * Name: Tumblr Post Connector * Description: Post to Tumblr - * Version: 1.0 + * Version: 2.0 * Author: Mike Macgirvin + * Author: Michael Vogel */ 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'); + 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'); + 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() {} @@ -53,6 +54,25 @@ function tumblr_content(&$a) { return $o; } +function tumblr_plugin_admin(&$a, &$o){ + $t = get_markup_template( "admin.tpl", "addon/tumblr/" ); + + $o = replace_macros($t, array( + '$submit' => t('Save Settings'), + // name, label, value, help, [extra values] + '$consumer_key' => array('consumer_key', t('Consumer Key'), get_config('tumblr', 'consumer_key' ), ''), + '$consumer_secret' => array('consumer_secret', t('Consumer Secret'), get_config('tumblr', 'consumer_secret' ), ''), + )); +} + +function tumblr_plugin_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'])): ''); + set_config('tumblr','consumer_key',$consumer_key); + set_config('tumblr','consumer_secret',$consumer_secret); + info( 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(); @@ -84,22 +104,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); } @@ -132,9 +152,9 @@ 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. @@ -147,96 +167,96 @@ function tumblr_callback($a) { } 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 = 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 */ + 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 = get_pconfig(local_user(),'tumblr','post'); + $checked = (($enabled) ? ' checked="checked" ' : ''); + $css = (($enabled) ? '' : '-disabled'); - $def_enabled = get_pconfig(local_user(),'tumblr','post_by_default'); + $def_enabled = get_pconfig(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 Post Settings') . '

'; - $s .= ''; - $s .= ''; } @@ -266,19 +286,19 @@ function tumblr_post_local(&$a,&$b) { if($b['private'] || $b['parent']) return; - $tmbl_post = intval(get_pconfig(local_user(),'tumblr','post')); + $tmbl_post = intval(get_pconfig(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'))) $tmbl_enable = 1; - if(! $tmbl_enable) - return; + if(! $tmbl_enable) + return; - if(strlen($b['postopts'])) - $b['postopts'] .= ','; - $b['postopts'] .= 'tumblr'; + if(strlen($b['postopts'])) + $b['postopts'] .= ','; + $b['postopts'] .= 'tumblr'; } @@ -286,14 +306,14 @@ 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; $oauth_token = get_pconfig($b['uid'], "tumblr", "oauth_token"); $oauth_token_secret = get_pconfig($b['uid'], "tumblr", "oauth_token_secret"); @@ -316,54 +336,68 @@ function tumblr_send(&$a,&$b) { if(count($tag_arr)) $tags = implode(',',$tag_arr); - $link = ""; - $video = false; $title = trim($b['title']); + require_once('include/plaintext.php'); - // 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 = get_attached_data($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 = array( + '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 == "") AND 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)."

"; - 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); + if (isset($siteinfo["text"])) + $body = $siteinfo["text"]; + else + $body = bb_remove_share_information($b["body"]); + + switch ($siteinfo["type"]) { + case "photo": + $params['type'] = "photo"; + $params['caption'] = bbcode($body, false, 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($body, false, false, 4); + break; + case "audio": + $params['type'] = "audio"; + $params['external_url'] = $siteinfo["url"]; + $params['caption'] = bbcode($body, false, false, 4); + break; + case "video": + $params['type'] = "video"; + $params['embed'] = $siteinfo["url"]; + $params['caption'] = bbcode($body, false, false, 4); + break; + default: + $params['type'] = "text"; + $params['title'] = $title; + $params['body'] = bbcode($b['body'], false, false, 4); + break; } + if (isset($params['caption']) AND (trim($title) != "")) + $params['caption'] = '

'.$title."

". + "

".$params['caption']."

"; + + if (trim($params['caption']) == "") + $params['caption'] = bbcode("[quote]".$siteinfo["description"]."[/quote]", false, false, 4); + $consumer_key = get_config('tumblr','consumer_key'); $consumer_secret = get_config('tumblr','consumer_secret'); @@ -371,9 +405,8 @@ function tumblr_send(&$a,&$b) { // 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)