X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tumblr%2Ftumblr.php;h=4504534cbdc737fff9c7a0215513426b07d45ccf;hb=05d2707d501b7b1cdd98b0802121e69a6df7d05d;hp=97ac8bf49291a87b317bc267d747511f28c39a14;hpb=4a667f640f20dd54bd30ca8887eda7748d973a16;p=friendica-addons.git diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index 97ac8bf4..4504534c 100644 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -11,31 +11,22 @@ require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . ' use Friendica\App; use Friendica\Content\Text\BBCode; -use Friendica\Core\Addon; -use Friendica\Core\Config; -use Friendica\Core\L10n; +use Friendica\Core\Hook; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Database\DBA; +use Friendica\DI; +use Friendica\Model\Tag; use Friendica\Util\Strings; 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'); + 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() @@ -45,7 +36,7 @@ function tumblr_module() function tumblr_content(App $a) { if (! local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return ''; } @@ -75,22 +66,20 @@ function tumblr_addon_admin(App $a, &$o) $t = Renderer::getMarkupTemplate( "admin.tpl", "addon/tumblr/" ); $o = Renderer::replaceMacros($t, [ - '$submit' => L10n::t('Save Settings'), + '$submit' => DI::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' ), ''], + '$consumer_key' => ['consumer_key', DI::l10n()->t('Consumer Key'), DI::config()->get('tumblr', 'consumer_key' ), ''], + '$consumer_secret' => ['consumer_secret', DI::l10n()->t('Consumer Secret'), DI::config()->get('tumblr', 'consumer_secret' ), ''], ]); } 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'])): ''); + $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); + DI::config()->set('tumblr', 'consumer_key',$consumer_key); + DI::config()->set('tumblr', 'consumer_secret',$consumer_secret); } function tumblr_connect(App $a) @@ -102,12 +91,12 @@ function tumblr_connect(App $a) //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'); + $consumer_key = DI::config()->get('tumblr', 'consumer_key'); + $consumer_secret = DI::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->getBaseURL()."/tumblr/callback"; + $callback_url = DI::baseUrl()->get()."/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. @@ -155,8 +144,8 @@ function tumblr_callback(App $a) //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'); + $consumer_key = DI::config()->get('tumblr', 'consumer_key'); + $consumer_secret = DI::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) @@ -182,28 +171,30 @@ function tumblr_callback(App $a) } // 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']); + DI::pConfig()->set(local_user(), "tumblr", "oauth_token", $access_token['oauth_token']); + DI::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").''; + $o = DI::l10n()->t("You are now authenticated to tumblr."); + $o .= '
' . DI::l10n()->t("return to the connector page") . ''; return $o; } -function tumblr_jot_nets(App $a, &$b) +function tumblr_jot_nets(App $a, array &$jotnets_fields) { 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') . '
'; + if (DI::pConfig()->get(local_user(),'tumblr','post')) { + $jotnets_fields[] = [ + 'type' => 'checkbox', + 'field' => [ + 'tumblr_enable', + DI::l10n()->t('Post to Tumblr'), + DI::pConfig()->get(local_user(),'tumblr','post_by_default') + ] + ]; } } @@ -215,51 +206,53 @@ function tumblr_settings(App $a, &$s) /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + DI::page()['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ - $enabled = PConfig::get(local_user(), 'tumblr', 'post'); + $enabled = DI::pConfig()->get(local_user(), 'tumblr', 'post'); $checked = (($enabled) ? ' checked="checked" ' : ''); $css = (($enabled) ? '' : '-disabled'); - $def_enabled = PConfig::get(local_user(), 'tumblr', 'post_by_default'); + $def_enabled = DI::pConfig()->get(local_user(), 'tumblr', 'post_by_default'); $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); /* Add some HTML to the existing form */ $s .= ''; - $s .= '

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

'; + $s .= '

'. DI::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'])); + DI::pConfig()->set(local_user(), 'tumblr', 'post', intval($_POST['tumblr'])); + DI::pConfig()->set(local_user(), 'tumblr', 'page', $_POST['tumblr_page']); + DI::pConfig()->set(local_user(), 'tumblr', 'post_by_default', intval($_POST['tumblr_bydefault'])); + } +} + +function tumblr_hook_fork(&$a, &$b) +{ + if ($b['name'] != 'notifier_normal') { + return; + } + + $post = $b['data']; + + if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) || + !strstr($post['postopts'], 'tumblr') || ($post['parent'] != $post['id'])) { + $b['execute'] = false; + return; } } @@ -315,11 +323,11 @@ function tumblr_post_local(App $a, array &$b) return; } - $tmbl_post = intval(PConfig::get(local_user(), 'tumblr', 'post')); + $tmbl_post = intval(DI::pConfig()->get(local_user(), 'tumblr', 'post')); $tmbl_enable = (($tmbl_post && !empty($_REQUEST['tumblr_enable'])) ? intval($_REQUEST['tumblr_enable']) : 0); - if ($b['api_source'] && intval(PConfig::get(local_user(), 'tumblr', 'post_by_default'))) { + if ($b['api_source'] && intval(DI::pConfig()->get(local_user(), 'tumblr', 'post_by_default'))) { $tmbl_enable = 1; } @@ -358,20 +366,18 @@ function tumblr_send(App $a, array &$b) { return; } - $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"); + $oauth_token = DI::pConfig()->get($b['uid'], "tumblr", "oauth_token"); + $oauth_token_secret = DI::pConfig()->get($b['uid'], "tumblr", "oauth_token_secret"); + $page = DI::pConfig()->get($b['uid'], "tumblr", "page"); $tmbl_blog = 'blog/' . $page . '/post'; if ($oauth_token && $oauth_token_secret && $tmbl_blog) { + $tags = Tag::getByURIId($b['uri-id']); + $tag_arr = []; - $tags = ''; - preg_match_all('/\#\[(.*?)\](.*?)\[/', $b['tag'], $matches, PREG_SET_ORDER); - if (!empty($matches)) { - foreach($matches as $mtch) { - $tag_arr[] = $mtch[2]; - } + foreach($tags as $tag) { + $tag_arr[] = $tag['name']; } if (count($tag_arr)) { @@ -406,7 +412,7 @@ function tumblr_send(App $a, array &$b) { switch ($siteinfo["type"]) { case "photo": $params['type'] = "photo"; - $params['caption'] = BBCode::convert($body, false, 4); + $params['caption'] = BBCode::convert($body, false, BBCode::CONNECTORS); if (isset($siteinfo["url"])) { $params['link'] = $siteinfo["url"]; @@ -419,25 +425,25 @@ function tumblr_send(App $a, array &$b) { $params['type'] = "link"; $params['title'] = $title; $params['url'] = $siteinfo["url"]; - $params['description'] = BBCode::convert($body, false, 4); + $params['description'] = BBCode::convert($body, false, BBCode::CONNECTORS); break; case "audio": $params['type'] = "audio"; $params['external_url'] = $siteinfo["url"]; - $params['caption'] = BBCode::convert($body, false, 4); + $params['caption'] = BBCode::convert($body, false, BBCode::CONNECTORS); break; case "video": $params['type'] = "video"; $params['embed'] = $siteinfo["url"]; - $params['caption'] = BBCode::convert($body, false, 4); + $params['caption'] = BBCode::convert($body, false, BBCode::CONNECTORS); break; default: $params['type'] = "text"; $params['title'] = $title; - $params['body'] = BBCode::convert($b['body'], false, 4); + $params['body'] = BBCode::convert($b['body'], false, BBCode::CONNECTORS); break; } @@ -447,11 +453,11 @@ function tumblr_send(App $a, array &$b) { } if (empty($params['caption']) && !empty($siteinfo["description"])) { - $params['caption'] = BBCode::convert("[quote]" . $siteinfo["description"] . "[/quote]", false, 4); + $params['caption'] = BBCode::convert("[quote]" . $siteinfo["description"] . "[/quote]", false, BBCode::CONNECTORS); } - $consumer_key = Config::get('tumblr','consumer_key'); - $consumer_secret = Config::get('tumblr','consumer_secret'); + $consumer_key = DI::config()->get('tumblr','consumer_key'); + $consumer_secret = DI::config()->get('tumblr','consumer_secret'); $tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);