Merge pull request #946 from nupplaphil/task/di_pconfig

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

diff --git a/blogger/blogger.php b/blogger/blogger.php
index 049ee0777558fdf767574a638a3873f4bcc673bc..18a1b8eac47c93b252611f01b381145d2b75c414 100644 (file)
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -11,7 +11,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
@@ -48,13 +47,13 @@ function blogger_jot_nets(App $a, array &$jotnets_fields)
                return;
        }
 
-       if (PConfig::get(local_user(), 'blogger', 'post')) {
+       if (DI::pConfig()->get(local_user(), 'blogger', 'post')) {
                $jotnets_fields[] = [
                        'type' => 'checkbox',
                        'field' => [
                                'blogger_enable',
                                L10n::t('Post to blogger'),
-                               PConfig::get(local_user(), 'blogger', 'post_by_default')
+                               DI::pConfig()->get(local_user(), 'blogger', 'post_by_default')
                        ]
                ];
        }
@@ -69,21 +68,21 @@ function blogger_settings(App $a, &$s)
 
        /* Add our stylesheet to the page so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/blogger/blogger.css' . '" media="all" />' . "\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/blogger/blogger.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variables */
 
-       $enabled = PConfig::get(local_user(), 'blogger', 'post');
+       $enabled = DI::pConfig()->get(local_user(), 'blogger', 'post');
        $checked = (($enabled) ? ' checked="checked" ' : '');
        $css = (($enabled) ? '' : '-disabled');
 
-       $def_enabled = PConfig::get(local_user(), 'blogger', 'post_by_default');
+       $def_enabled = DI::pConfig()->get(local_user(), 'blogger', 'post_by_default');
 
        $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
 
-       $bl_username = PConfig::get(local_user(), 'blogger', 'bl_username');
-       $bl_password = PConfig::get(local_user(), 'blogger', 'bl_password');
-       $bl_blog = PConfig::get(local_user(), 'blogger', 'bl_blog');
+       $bl_username = DI::pConfig()->get(local_user(), 'blogger', 'bl_username');
+       $bl_password = DI::pConfig()->get(local_user(), 'blogger', 'bl_password');
+       $bl_blog = DI::pConfig()->get(local_user(), 'blogger', 'bl_blog');
 
        /* Add some HTML to the existing form */
        $s .= '<span id="settings_blogger_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">';
@@ -127,11 +126,11 @@ function blogger_settings(App $a, &$s)
 function blogger_settings_post(App $a, array &$b)
 {
        if (!empty($_POST['blogger-submit'])) {
-               PConfig::set(local_user(), 'blogger', 'post',            $_POST['blogger'] ?? false);
-               PConfig::set(local_user(), 'blogger', 'post_by_default', $_POST['bl_bydefault'] ?? false);
-               PConfig::set(local_user(), 'blogger', 'bl_username',     trim($_POST['bl_username']));
-               PConfig::set(local_user(), 'blogger', 'bl_password',     trim($_POST['bl_password']));
-               PConfig::set(local_user(), 'blogger', 'bl_blog',         trim($_POST['bl_blog']));
+               DI::pConfig()->set(local_user(), 'blogger', 'post',            $_POST['blogger'] ?? false);
+               DI::pConfig()->set(local_user(), 'blogger', 'post_by_default', $_POST['bl_bydefault'] ?? false);
+               DI::pConfig()->set(local_user(), 'blogger', 'bl_username',     trim($_POST['bl_username']));
+               DI::pConfig()->set(local_user(), 'blogger', 'bl_password',     trim($_POST['bl_password']));
+               DI::pConfig()->set(local_user(), 'blogger', 'bl_blog',         trim($_POST['bl_blog']));
        }
 }
 
@@ -166,11 +165,11 @@ function blogger_post_local(App $a, array &$b)
                return;
        }
 
-       $bl_post   = intval(PConfig::get(local_user(), 'blogger', 'post'));
+       $bl_post   = intval(DI::pConfig()->get(local_user(), 'blogger', 'post'));
 
        $bl_enable = (($bl_post && !empty($_REQUEST['blogger_enable'])) ? intval($_REQUEST['blogger_enable']) : 0);
 
-       if ($b['api_source'] && intval(PConfig::get(local_user(), 'blogger', 'post_by_default'))) {
+       if ($b['api_source'] && intval(DI::pConfig()->get(local_user(), 'blogger', 'post_by_default'))) {
                $bl_enable = 1;
        }
 
@@ -199,9 +198,9 @@ function blogger_send(App $a, array &$b)
                return;
        }
 
-       $bl_username = XML::escape(PConfig::get($b['uid'], 'blogger', 'bl_username'));
-       $bl_password = XML::escape(PConfig::get($b['uid'], 'blogger', 'bl_password'));
-       $bl_blog = PConfig::get($b['uid'], 'blogger', 'bl_blog');
+       $bl_username = XML::escape(DI::pConfig()->get($b['uid'], 'blogger', 'bl_username'));
+       $bl_password = XML::escape(DI::pConfig()->get($b['uid'], 'blogger', 'bl_password'));
+       $bl_blog = DI::pConfig()->get($b['uid'], 'blogger', 'bl_blog');
 
        if ($bl_username && $bl_password && $bl_blog) {
                $title = '<title>' . (($b['title']) ? $b['title'] : L10n::t('Post from Friendica')) . '</title>';