X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=libertree%2Flibertree.php;h=c0f896c0c43346e295af163f63aeb29bb5538033;hb=77ad52d1f41f99de3e2ee3a1f894b56fafae5389;hp=7847f60e0f8cd6e4a765a806752f85caf63a6cd4;hpb=5d8129600d2848901c88805b21fee09456d90a36;p=friendica-addons.git

diff --git a/libertree/libertree.php b/libertree/libertree.php
index 7847f60e..c0f896c0 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -11,7 +11,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Post;
@@ -26,34 +25,34 @@ function libertree_install()
 	Hook::register('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post');
 }
 
-function libertree_jot_nets(App &$a, array &$jotnets_fields)
+function libertree_jot_nets(array &$jotnets_fields)
 {
-	if (!Session::getLocalUser()) {
+	if (!DI::userSession()->getLocalUserId()) {
 		return;
 	}
 
-	if (DI::pConfig()->get(Session::getLocalUser(), 'libertree', 'post')) {
+	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'post')) {
 		$jotnets_fields[] = [
 			'type' => 'checkbox',
 			'field' => [
 				'libertree_enable',
 				DI::l10n()->t('Post to libertree'),
-				DI::pConfig()->get(Session::getLocalUser(), 'libertree', 'post_by_default'),
+				DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'post_by_default'),
 			],
 		];
 	}
 }
 
-function libertree_settings(App $a, array &$data)
+function libertree_settings(array &$data)
 {
-	if (!Session::getLocalUser()) {
+	if (!DI::userSession()->getLocalUserId()) {
 		return;
 	}
 
-	$enabled         = DI::pConfig()->get(Session::getLocalUser(), 'libertree', 'post', false);
-	$ltree_api_token = DI::pConfig()->get(Session::getLocalUser(), 'libertree', 'libertree_api_token');
-	$ltree_url       = DI::pConfig()->get(Session::getLocalUser(), 'libertree', 'libertree_url');
-	$def_enabled     = DI::pConfig()->get(Session::getLocalUser(), 'libertree', 'post_by_default');
+	$enabled         = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'post', false);
+	$ltree_api_token = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'libertree_api_token');
+	$ltree_url       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'libertree_url');
+	$def_enabled     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'post_by_default');
 
 	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/libertree/');
 	$html = Renderer::replaceMacros($t, [
@@ -72,19 +71,19 @@ function libertree_settings(App $a, array &$data)
 	];
 }
 
-function libertree_settings_post(App $a, array &$b)
+function libertree_settings_post(array &$b)
 {
 	if (!empty($_POST['libertree-submit'])) {
-		DI::pConfig()->set(Session::getLocalUser(),'libertree','post',intval($_POST['libertree']));
-		DI::pConfig()->set(Session::getLocalUser(),'libertree','post_by_default',intval($_POST['libertree_bydefault']));
-		DI::pConfig()->set(Session::getLocalUser(),'libertree','libertree_api_token',trim($_POST['libertree_api_token']));
-		DI::pConfig()->set(Session::getLocalUser(),'libertree','libertree_url',trim($_POST['libertree_url']));
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','post',intval($_POST['libertree']));
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','post_by_default',intval($_POST['libertree_bydefault']));
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','libertree_api_token',trim($_POST['libertree_api_token']));
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','libertree_url',trim($_POST['libertree_url']));
 
 	}
 
 }
 
-function libertree_hook_fork(App &$a, array &$b)
+function libertree_hook_fork(array &$b)
 {
 	if ($b['name'] != 'notifier_normal') {
 		return;
@@ -99,7 +98,7 @@ function libertree_hook_fork(App &$a, array &$b)
 	}
 }
 
-function libertree_post_local(App $a, array &$b)
+function libertree_post_local(array &$b)
 {
 
 	// This can probably be changed to allow editing by pointing to a different API endpoint
@@ -108,7 +107,7 @@ function libertree_post_local(App $a, array &$b)
 		return;
 	}
 
-	if ((!Session::getLocalUser()) || (Session::getLocalUser() != $b['uid'])) {
+	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
 		return;
 	}
 
@@ -116,11 +115,11 @@ function libertree_post_local(App $a, array &$b)
 		return;
 	}
 
-	$ltree_post   = intval(DI::pConfig()->get(Session::getLocalUser(),'libertree','post'));
+	$ltree_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'libertree','post'));
 
 	$ltree_enable = (($ltree_post && !empty($_REQUEST['libertree_enable'])) ? intval($_REQUEST['libertree_enable']) : 0);
 
-	if ($b['api_source'] && intval(DI::pConfig()->get(Session::getLocalUser(),'libertree','post_by_default'))) {
+	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'libertree','post_by_default'))) {
 		$ltree_enable = 1;
 	}
 
@@ -135,7 +134,7 @@ function libertree_post_local(App $a, array &$b)
 	$b['postopts'] .= 'libertree';
 }
 
-function libertree_send(App $a, array &$b)
+function libertree_send(array &$b)
 {
 	Logger::notice('libertree_send: invoked');
 
@@ -152,18 +151,18 @@ function libertree_send(App $a, array &$b)
 	}
 
 	// Dont't post if the post doesn't belong to us.
-	// This is a check for forum postings
+	// This is a check for group postings
 	$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 	if ($b['contact-id'] != $self['id']) {
 		return;
 	}
 
-	$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], $b['body']);
+	$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
 
 	$ltree_api_token = DI::pConfig()->get($b['uid'],'libertree','libertree_api_token');
 	$ltree_url = DI::pConfig()->get($b['uid'],'libertree','libertree_url');
 	$ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token";
-	$ltree_source = DI::baseUrl()->getHostname();
+	$ltree_source = DI::baseUrl()->getHost();
 
 	if ($b['app'] != "")
 		$ltree_source .= " (".$b['app'].")";