use Friendica\App;
use Friendica\Content\Text\BBCode;
-use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
+use Friendica\Model\Tag;
use Friendica\Util\Strings;
function tumblr_install()
Hook::register('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
}
-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_module()
{
}
$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(DI::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)
$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)) {
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"];
$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;
}
}
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 = DI::config()->get('tumblr','consumer_key');