X-Git-Url: https://git.mxchange.org/?p=friendica-addons.git;a=blobdiff_plain;f=tumblr%2Ftumblr.php;h=008027c04b3566e4e6274c3d49b6a5aba60c2e26;hp=5685ed4b3bf02fc0e7e2fed2e45e78fea5acf828;hb=f8c162cbfb777793891f885e019eb8eae319dce1;hpb=dd08a0164894ef192111a3fc20124797ab8eee15 diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index 5685ed4b..008027c0 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'); +require_once 'library/OAuth1.php'; +require_once 'addon/tumblr/tumblroauth/tumblroauth.php'; + +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() {} @@ -32,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 ''; } @@ -54,23 +58,23 @@ function tumblr_content(&$a) { return $o; } -function tumblr_plugin_admin(&$a, &$o){ +function tumblr_addon_admin(&$a, &$o){ $t = get_markup_template( "admin.tpl", "addon/tumblr/" ); - $o = replace_macros($t, array( - '$submit' => t('Save Settings'), + $o = replace_macros($t, [ + '$submit' => L10n::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' ), ''), - )); + '$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){ +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'])): ''); - set_config('tumblr','consumer_key',$consumer_key); - set_config('tumblr','consumer_secret',$consumer_secret); - info( t('Settings updated.'). EOL ); + Config::set('tumblr','consumer_key',$consumer_key); + Config::set('tumblr','consumer_secret',$consumer_secret); + info(L10n::t('Settings updated.'). EOL); } function tumblr_connect($a) { @@ -81,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 @@ -131,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) @@ -158,11 +162,11 @@ function tumblr_callback($a) { } // 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); } @@ -170,12 +174,12 @@ function tumblr_jot_nets(&$a,&$b) { if(! local_user()) return; - $tmbl_post = get_pconfig(local_user(),'tumblr','post'); + $tmbl_post = PConfig::get(local_user(),'tumblr','post'); if(intval($tmbl_post) == 1) { - $tmbl_defpost = get_pconfig(local_user(),'tumblr','post_by_default'); + $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') . ''; } } @@ -191,58 +195,58 @@ function tumblr_settings(&$a,&$s) { /* 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 .= '
'; } @@ -265,39 +269,46 @@ 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) + if (!$tmbl_enable) { return; + } - if(strlen($b['postopts'])) + if (strlen($b['postopts'])) { $b['postopts'] .= ','; + } + $b['postopts'] .= 'tumblr'; } @@ -306,25 +317,35 @@ function tumblr_post_local(&$a,&$b) { function tumblr_send(&$a,&$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; + } + + // 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); @@ -341,11 +362,11 @@ function tumblr_send(&$a,&$b) { $siteinfo = get_attached_data($b["body"]); - $params = array( + $params = [ 'state' => 'published', 'tags' => $tags, 'tweet' => 'off', - 'format' => 'html'); + 'format' => 'html']; if (!isset($siteinfo["type"])) $siteinfo["type"] = ""; @@ -398,8 +419,8 @@ function tumblr_send(&$a,&$b) { 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'); + $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);