[various] Remove App dependency from hook functions

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

diff --git a/wppost/wppost.php b/wppost/wppost.php
index f57772d3f9ea9a0f5d284da9ec1b188a1737d006..7f96bfea04a69547fc5498de9703458f78b5e548 100644 (file)
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -27,38 +27,38 @@ function wppost_install()
        Hook::register('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post');
 }
 
-function wppost_jot_nets(App &$a, array &$jotnets_fields)
+function wppost_jot_nets(array &$jotnets_fields)
 {
-       if (!local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                return;
        }
 
-       if (DI::pConfig()->get(local_user(),'wppost','post')) {
+       if (DI::pConfig()->get(DI::userSession()->getLocalUserId(),'wppost','post')) {
                $jotnets_fields[] = [
                        'type' => 'checkbox',
                        'field' => [
                                'wppost_enable',
                                DI::l10n()->t('Post to Wordpress'),
-                               DI::pConfig()->get(local_user(),'wppost','post_by_default')
+                               DI::pConfig()->get(DI::userSession()->getLocalUserId(),'wppost','post_by_default')
                        ]
                ];
        }
 }
 
 
-function wppost_settings(App &$a, array &$data)
+function wppost_settings(array &$data)
 {
-       if (!local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                return;
        }
 
-       $enabled            = DI::pConfig()->get(local_user(), 'wppost', 'post', false);
-       $wp_username        = DI::pConfig()->get(local_user(), 'wppost', 'wp_username');
-       $wp_blog            = DI::pConfig()->get(local_user(), 'wppost', 'wp_blog');
-       $def_enabled        = DI::pConfig()->get(local_user(), 'wppost', 'post_by_default', false);
-       $back_enabled       = DI::pConfig()->get(local_user(), 'wppost', 'backlink', false);
-       $wp_backlink_text   = DI::pConfig()->get(local_user(), 'wppost', 'wp_backlink_text');
-       $shortcheck_enabled = DI::pConfig()->get(local_user(), 'wppost', 'shortcheck', false);
+       $enabled            = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'post', false);
+       $wp_username        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'wp_username');
+       $wp_blog            = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'wp_blog');
+       $def_enabled        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'post_by_default', false);
+       $back_enabled       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'backlink', false);
+       $wp_backlink_text   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'wp_backlink_text');
+       $shortcheck_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'shortcheck', false);
 
        $t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/wppost/');
        $html = Renderer::replaceMacros($t, [
@@ -82,23 +82,23 @@ function wppost_settings(App &$a, array &$data)
 }
 
 
-function wppost_settings_post(&$a, &$b)
+function wppost_settings_post(array &$b)
 {
        if(!empty($_POST['wppost-submit'])) {
-               DI::pConfig()->set(local_user(), 'wppost', 'post'           , intval($_POST['wppost']));
-               DI::pConfig()->set(local_user(), 'wppost', 'post_by_default', intval($_POST['wp_bydefault']));
-               DI::pConfig()->set(local_user(), 'wppost', 'wp_username'    ,   trim($_POST['wp_username']));
-               DI::pConfig()->set(local_user(), 'wppost', 'wp_password'    ,   trim($_POST['wp_password']));
-               DI::pConfig()->set(local_user(), 'wppost', 'wp_blog'        ,   trim($_POST['wp_blog']));
-               DI::pConfig()->set(local_user(), 'wppost', 'backlink'       , intval($_POST['wp_backlink']));
-               DI::pConfig()->set(local_user(), 'wppost', 'shortcheck'     , intval($_POST['wp_shortcheck']));
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'post'           , intval($_POST['wppost']));
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'post_by_default', intval($_POST['wp_bydefault']));
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'wp_username'    ,   trim($_POST['wp_username']));
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'wp_password'    ,   trim($_POST['wp_password']));
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'wp_blog'        ,   trim($_POST['wp_blog']));
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'backlink'       , intval($_POST['wp_backlink']));
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'shortcheck'     , intval($_POST['wp_shortcheck']));
                $wp_backlink_text = BBCode::convert(trim($_POST['wp_backlink_text']), false, BBCode::BACKLINK);
                $wp_backlink_text = HTML::toPlaintext($wp_backlink_text, 0, true);
-               DI::pConfig()->set(local_user(), 'wppost', 'wp_backlink_text', $wp_backlink_text);
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'wp_backlink_text', $wp_backlink_text);
        }
 }
 
-function wppost_hook_fork(&$a, &$b)
+function wppost_hook_fork(array &$b)
 {
        if ($b['name'] != 'notifier_normal') {
                return;
@@ -107,13 +107,13 @@ function wppost_hook_fork(&$a, &$b)
        $post = $b['data'];
 
        if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
-               !strstr($post['postopts'], 'wppost') || ($post['parent'] != $post['id'])) {
+               !strstr($post['postopts'] ?? '', 'wppost') || ($post['parent'] != $post['id'])) {
                $b['execute'] = false;
                return;
        }
 }
 
-function wppost_post_local(&$a, &$b) {
+function wppost_post_local(array &$b) {
 
        // This can probably be changed to allow editing by pointing to a different API endpoint
 
@@ -121,7 +121,7 @@ function wppost_post_local(&$a, &$b) {
                return;
        }
 
-       if (!local_user() || (local_user() != $b['uid'])) {
+       if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
                return;
        }
 
@@ -129,11 +129,11 @@ function wppost_post_local(&$a, &$b) {
                return;
        }
 
-       $wp_post   = intval(DI::pConfig()->get(local_user(), 'wppost', 'post'));
+       $wp_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'post'));
 
        $wp_enable = (($wp_post && !empty($_REQUEST['wppost_enable'])) ? intval($_REQUEST['wppost_enable']) : 0);
 
-       if ($b['api_source'] && intval(DI::pConfig()->get(local_user(), 'wppost', 'post_by_default'))) {
+       if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'post_by_default'))) {
                $wp_enable = 1;
        }
 
@@ -151,7 +151,7 @@ function wppost_post_local(&$a, &$b) {
 
 
 
-function wppost_send(&$a, &$b)
+function wppost_send(array &$b)
 {
        if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
                return;
@@ -172,7 +172,7 @@ function wppost_send(&$a, &$b)
                return;
        }
 
-       $b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], $b['body']);
+       $b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
 
        $wp_username = XML::escape(DI::pConfig()->get($b['uid'], 'wppost', 'wp_username'));
        $wp_password = XML::escape(DI::pConfig()->get($b['uid'], 'wppost', 'wp_password'));
@@ -248,8 +248,7 @@ function wppost_send(&$a, &$b)
 
                $wp_backlink = intval(DI::pConfig()->get($b['uid'],'wppost','backlink'));
                if($wp_backlink && $b['plink']) {
-                       $post .= EOL . EOL . '<a href="' . $b['plink'] . '">'
-                               . $wp_backlink_text . '</a>' . EOL . EOL;
+                       $post .= '<p><a href="' . $b['plink'] . '">' . $wp_backlink_text . '</a></p>';
                }
 
                $post = XML::escape($post);