X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tumblr%2Ftumblr.php;h=62f711325ca99567d92f80cfca3a4f45c32111ea;hb=08206fdcc0750ec9dd12a68addb341cd05f8bcfb;hp=619ff16e807f43611f6b7af7c963adca9372da99;hpb=b21d24810484ec1a510c50e82277c04dec239d96;p=friendica-addons.git diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index 619ff16e..62f71132 100644 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -1,5 +1,4 @@ */ -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'); +require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'tumblroauth.php'; + +use Friendica\App; +use Friendica\Content\Text\BBCode; +use Friendica\Core\Config; +use Friendica\Core\Hook; +use Friendica\Core\L10n; +use Friendica\Core\Logger; +use Friendica\Core\PConfig; +use Friendica\Core\Renderer; +use Friendica\Database\DBA; +use Friendica\Util\Strings; + +function tumblr_install() +{ + Hook::register('hook_fork', 'addon/tumblr/tumblr.php', 'tumblr_hook_fork'); + Hook::register('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local'); + Hook::register('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send'); + Hook::register('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets'); + Hook::register('connector_settings', 'addon/tumblr/tumblr.php', 'tumblr_settings'); + Hook::register('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post'); } -function tumblr_module() {} +function tumblr_uninstall() +{ + Hook::unregister('hook_fork', 'addon/tumblr/tumblr.php', 'tumblr_hook_fork'); + Hook::unregister('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local'); + Hook::unregister('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send'); + Hook::unregister('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets'); + Hook::unregister('connector_settings', 'addon/tumblr/tumblr.php', 'tumblr_settings'); + Hook::unregister('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post'); +} -function tumblr_content(&$a) { +function tumblr_module() +{ +} - if(! local_user()) { - notice( t('Permission denied.') . EOL); +function tumblr_content(App $a) +{ + if (! local_user()) { + notice(L10n::t('Permission denied.') . EOL); return ''; } - if (isset($a->argv[1])) + 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 + } else { $o = tumblr_connect($a); + } return $o; } -function tumblr_plugin_admin(&$a, &$o){ - $t = get_markup_template( "admin.tpl", "addon/tumblr/" ); +function tumblr_addon_admin(App $a, &$o) +{ + $t = Renderer::getMarkupTemplate( "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' ), ''), - )); + $o = Renderer::replaceMacros($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_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_addon_admin_post(App $a) +{ + $consumer_key = (!empty($_POST['consumer_key']) ? Strings::escapeTags(trim($_POST['consumer_key'])) : ''); + $consumer_secret = (!empty($_POST['consumer_secret']) ? Strings::escapeTags(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) { +function tumblr_connect(App $a) +{ // Start a session. This is necessary to hold on to a few keys the callback script will also need session_start(); @@ -81,12 +104,12 @@ 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 - $callback_url = $a->get_baseurl()."/tumblr/callback"; + $callback_url = $a->getBaseURL()."/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. @@ -111,28 +134,31 @@ function tumblr_connect($a) { // 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. - + /* + * 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) { + return $o; +} +function tumblr_callback(App $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'); + $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) @@ -143,7 +169,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. @@ -154,266 +180,310 @@ function tumblr_callback($a) { if (200 == $tum_oauth->http_code) { // 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").''; - return($o); + $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()) +function tumblr_jot_nets(App $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'); + $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 .= '
' - . t('Post to Tumblr') . '
'; + . L10n::t('Post to Tumblr') . ''; } } - -function tumblr_settings(&$a,&$s) { - - if(! local_user()) +function tumblr_settings(App $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"; + $a->page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ - $enabled = get_pconfig(local_user(),'tumblr','post'); + $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" ' : ''); /* Add some HTML to the existing form */ $s .= ''; - $s .= '

'. t('Tumblr Export').'

'; + $s .= '

'. L10n::t('Tumblr Export').'

'; $s .= ''; $s .= ''; - + $s .= '
'; } +function tumblr_settings_post(App $a, array &$b) +{ + if (!empty($_POST['tumblr-submit'])) { + 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_settings_post(&$a,&$b) { - - if(x($_POST,'tumblr-submit')) { +function tumblr_hook_fork(&$a, &$b) +{ + if ($b['name'] != 'notifier_normal') { + return; + } - 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'])); + $post = $b['data']; + if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) || + !strstr($post['postopts'], 'tumblr') || ($post['parent'] != $post['id'])) { + $b['execute'] = false; + return; } - } -function tumblr_post_local(&$a,&$b) { - +function tumblr_post_local(App $a, array &$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); + $tmbl_enable = (($tmbl_post && !empty($_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) + if (!$tmbl_enable) { return; + } - if(strlen($b['postopts'])) + if (strlen($b['postopts'])) { $b['postopts'] .= ','; + } + $b['postopts'] .= 'tumblr'; } -function tumblr_send(&$a,&$b) { +function tumblr_send(App $a, array &$b) { - if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) + if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) { return; + } - if(! strstr($b['postopts'],'tumblr')) + if (! strstr($b['postopts'],'tumblr')) { return; + } - if($b['parent'] != $b['id']) + 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"); - $page = get_pconfig($b['uid'], "tumblr", "page"); - $tmbl_blog = 'blog/'.$page.'/post'; - - if($oauth_token && $oauth_token_secret && $tmbl_blog) { + // 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; + } - require_once('include/bbcode.php'); + $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'; - $tag_arr = array(); + if ($oauth_token && $oauth_token_secret && $tmbl_blog) { + $tag_arr = []; $tags = ''; - $x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER); + preg_match_all('/\#\[(.*?)\](.*?)\[/', $b['tag'], $matches, PREG_SET_ORDER); - if($x) { + if (!empty($matches)) { foreach($matches as $mtch) { $tag_arr[] = $mtch[2]; } } - if(count($tag_arr)) - $tags = implode(',',$tag_arr); + + if (count($tag_arr)) { + $tags = implode(',', $tag_arr); + } $title = trim($b['title']); - require_once('include/plaintext.php'); - $siteinfo = get_attached_data($b["body"]); + $siteinfo = BBCode::getAttachedData($b["body"]); - $params = array( - 'state' => 'published', - 'tags' => $tags, - 'tweet' => 'off', - 'format' => 'html'); + $params = [ + 'state' => 'published', + 'tags' => $tags, + 'tweet' => 'off', + 'format' => 'html', + ]; - if (!isset($siteinfo["type"])) + if (!isset($siteinfo["type"])) { $siteinfo["type"] = ""; + } - if (($title == "") AND isset($siteinfo["title"])) + if (($title == "") && isset($siteinfo["title"])) { $title = $siteinfo["title"]; + } - if (isset($siteinfo["text"])) + if (isset($siteinfo["text"])) { $body = $siteinfo["text"]; - else - $body = bb_remove_share_information($b["body"]); + } else { + $body = BBCode::removeShareInformation($b["body"]); + } switch ($siteinfo["type"]) { case "photo": - $params['type'] = "photo"; - $params['caption'] = bbcode($body, false, false, 4); + $params['type'] = "photo"; + $params['caption'] = BBCode::convert($body, false, 4); - if (isset($siteinfo["url"])) + 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); + $params['type'] = "link"; + $params['title'] = $title; + $params['url'] = $siteinfo["url"]; + $params['description'] = BBCode::convert($body, false, 4); break; + case "audio": - $params['type'] = "audio"; + $params['type'] = "audio"; $params['external_url'] = $siteinfo["url"]; - $params['caption'] = bbcode($body, false, false, 4); + $params['caption'] = BBCode::convert($body, false, 4); break; + case "video": - $params['type'] = "video"; - $params['embed'] = $siteinfo["url"]; - $params['caption'] = bbcode($body, false, false, 4); + $params['type'] = "video"; + $params['embed'] = $siteinfo["url"]; + $params['caption'] = BBCode::convert($body, false, 4); break; + default: - $params['type'] = "text"; + $params['type'] = "text"; $params['title'] = $title; - $params['body'] = bbcode($b['body'], false, false, 4); + $params['body'] = BBCode::convert($b['body'], false, 4); break; } - if (isset($params['caption']) AND (trim($title) != "")) + if (isset($params['caption']) && (trim($title) != "")) { $params['caption'] = '

'.$title."

". "

".$params['caption']."

"; + } - if (trim($params['caption']) == "") - $params['caption'] = bbcode("[quote]".$siteinfo["description"]."[/quote]", false, false, 4); + if (empty($params['caption']) && !empty($siteinfo["description"])) { + $params['caption'] = BBCode::convert("[quote]" . $siteinfo["description"] . "[/quote]", false, 4); + } - $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'); $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) - logger('tumblr_send: authentication failure'); - else - logger('tumblr_send: general error: ' . print_r($x,true)); + //print_r($params); + if ($ret_code == 201) { + Logger::log('tumblr_send: success'); + } elseif ($ret_code == 403) { + Logger::log('tumblr_send: authentication failure'); + } else { + Logger::log('tumblr_send: general error: ' . print_r($x,true)); + } } }