Merge pull request 'CLD2: Use ISO-639-1 for the language detection' (#1433) from...

[friendica-addons.git] / libertree / libertree.php

diff --git a/libertree/libertree.php b/libertree/libertree.php
index df53aa188bd136df31c2aece417061e9f679b14c..c0f896c0c43346e295af163f63aeb29bb5538033 100644 (file)
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -25,35 +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(! local_user()) {
-        return;
-    }
+       if (!DI::userSession()->getLocalUserId()) {
+               return;
+       }
 
-       if (DI::pConfig()->get(local_user(), '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(local_user(), '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 (!local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                return;
        }
 
-       $enabled         = DI::pConfig()->get(local_user(), 'libertree', 'post', false);
-       $ltree_api_token = DI::pConfig()->get(local_user(), 'libertree', 'libertree_api_token');
-       $ltree_url       = DI::pConfig()->get(local_user(), 'libertree', 'libertree_url');
-       $def_enabled     = DI::pConfig()->get(local_user(), '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,21 +71,19 @@ function libertree_settings(App $a, array &$data)
        ];
 }
 
-
-function libertree_settings_post(&$a,&$b) {
-
-       if(!empty($_POST['libertree-submit'])) {
-
-               DI::pConfig()->set(local_user(),'libertree','post',intval($_POST['libertree']));
-               DI::pConfig()->set(local_user(),'libertree','post_by_default',intval($_POST['libertree_bydefault']));
-               DI::pConfig()->set(local_user(),'libertree','libertree_api_token',trim($_POST['libertree_api_token']));
-               DI::pConfig()->set(local_user(),'libertree','libertree_url',trim($_POST['libertree_url']));
+function libertree_settings_post(array &$b)
+{
+       if (!empty($_POST['libertree-submit'])) {
+               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;
@@ -101,7 +98,8 @@ function libertree_hook_fork(App &$a, array &$b)
        }
 }
 
-function libertree_post_local(&$a,&$b) {
+function libertree_post_local(array &$b)
+{
 
        // This can probably be changed to allow editing by pointing to a different API endpoint
 
@@ -109,7 +107,7 @@ function libertree_post_local(&$a,&$b) {
                return;
        }
 
-       if ((! local_user()) || (local_user() != $b['uid'])) {
+       if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
                return;
        }
 
@@ -117,11 +115,11 @@ function libertree_post_local(&$a,&$b) {
                return;
        }
 
-       $ltree_post   = intval(DI::pConfig()->get(local_user(),'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(local_user(),'libertree','post_by_default'))) {
+       if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'libertree','post_by_default'))) {
                $ltree_enable = 1;
        }
 
@@ -136,11 +134,8 @@ function libertree_post_local(&$a,&$b) {
        $b['postopts'] .= 'libertree';
 }
 
-
-
-
-function libertree_send(&$a,&$b) {
-
+function libertree_send(array &$b)
+{
        Logger::notice('libertree_send: invoked');
 
        if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
@@ -156,18 +151,18 @@ function libertree_send(&$a,&$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'].")";
@@ -188,15 +183,16 @@ function libertree_send(&$a,&$b) {
                // remove multiple newlines
                do {
                        $oldbody = $body;
-                        $body = str_replace("\n\n\n", "\n\n", $body);
-                } while ($oldbody != $body);
+                       $body = str_replace("\n\n\n", "\n\n", $body);
+               } while ($oldbody != $body);
 
                // convert to markdown
                $body = BBCode::toMarkdown($body, false);
 
                // Adding the title
-               if(strlen($title))
-                       $body = "## ".html_entity_decode($title)."\n\n".$body;
+               if (strlen($title)) {
+                       $body = '## ' . html_entity_decode($title) . "\n\n" . $body;
+               }
 
 
                $params = [