X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tumblr%2Ftumblr.php;h=4504534cbdc737fff9c7a0215513426b07d45ccf;hb=05d2707d501b7b1cdd98b0802121e69a6df7d05d;hp=aff58f26415b97abd5e71de5a0c8d24374b39f25;hpb=c67ad31c8bf3749ac21bc62116ecb21c52daa544;p=friendica-addons.git

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index aff58f26..4504534c 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -11,12 +11,12 @@ require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . '
 
 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()
@@ -29,16 +29,6 @@ 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()
 {
 }
@@ -78,8 +68,8 @@ function tumblr_addon_admin(App $a, &$o)
 	$o = Renderer::replaceMacros($t, [
 		'$submit' => DI::l10n()->t('Save Settings'),
 		// name, label, value, help, [extra values]
-		'$consumer_key' => ['consumer_key', DI::l10n()->t('Consumer Key'),  Config::get('tumblr', 'consumer_key' ), ''],
-		'$consumer_secret' => ['consumer_secret', DI::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' ), ''],
 	]);
 }
 
@@ -88,10 +78,8 @@ 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(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)
@@ -103,8 +91,8 @@ 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
@@ -156,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)
@@ -263,8 +251,8 @@ function tumblr_settings(App $a, &$s)
 
 	if (($oauth_token != "") && ($oauth_token_secret != "")) {
 		$page = DI::pConfig()->get(local_user(), 'tumblr', 'page');
-		$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);
 
@@ -384,14 +372,12 @@ function tumblr_send(App $a, array &$b) {
 	$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)) {
@@ -426,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"];
@@ -439,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;
 		}
 
@@ -467,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);