Merge pull request #927 from nupplaphil/task/replace_getClass

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

diff --git a/blogger/blogger.php b/blogger/blogger.php
index 563d0ce423fd097c6a1e5e2a18c4c144d5398e47..049ee0777558fdf767574a638a3873f4bcc673bc 100644 (file)
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -12,6 +12,7 @@ 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;
 
@@ -41,19 +42,21 @@ function blogger_uninstall()
 }
 
 
-function blogger_jot_nets(App $a, &$b)
+function blogger_jot_nets(App $a, array &$jotnets_fields)
 {
        if (!local_user()) {
                return;
        }
 
-       $bl_post = PConfig::get(local_user(), 'blogger', 'post');
-
-       if (intval($bl_post) == 1) {
-               $bl_defpost = PConfig::get(local_user(), 'blogger', 'post_by_default');
-               $selected = ((intval($bl_defpost) == 1) ? ' checked="checked" ' : '');
-               $b .= '<div class="profile-jot-net"><input type="checkbox" name="blogger_enable" ' . $selected . ' value="1" /> '
-               . L10n::t('Post to blogger') . '</div>';
+       if (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')
+                       ]
+               ];
        }
 }
 
@@ -66,7 +69,7 @@ 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="' . $a->getBaseURL() . '/addon/blogger/blogger.css' . '" media="all" />' . "\r\n";
+       $a->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 */
 
@@ -124,8 +127,8 @@ 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',            defaults($_POST, 'blogger', false));
-               PConfig::set(local_user(), 'blogger', 'post_by_default', defaults($_POST, 'bl_bydefault', false));
+               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']));