From c7764068cc8b946fc747a039e09c46f66848a679 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <Quix0r@users.noreply.github.com>
Date: Sat, 21 Jul 2018 04:21:06 +0200
Subject: [PATCH] [blogger] Cleanups: (#656)

* [blogger] Cleanups:
- used `use Friendica\App;`
- added type-hints for `App` and `array` where applyable
- removed extra space
- added other spaces

* [blogger]:
- ops, curly brace in new line in function/method declaration
- proper way for x() replacement
---
 blogger/blogger.php | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/blogger/blogger.php b/blogger/blogger.php
index 30c450bd..3114f98e 100644
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -6,6 +6,7 @@
  *
  */
 
+use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
@@ -14,35 +15,36 @@ use Friendica\Util\Network;
 
 function blogger_install()
 {
-	Addon::registerHook('post_local',           'addon/blogger/blogger.php', 'blogger_post_local');
-	Addon::registerHook('notifier_normal',      'addon/blogger/blogger.php', 'blogger_send');
-	Addon::registerHook('jot_networks',         'addon/blogger/blogger.php', 'blogger_jot_nets');
+	Addon::registerHook('post_local',              'addon/blogger/blogger.php', 'blogger_post_local');
+	Addon::registerHook('notifier_normal',         'addon/blogger/blogger.php', 'blogger_send');
+	Addon::registerHook('jot_networks',            'addon/blogger/blogger.php', 'blogger_jot_nets');
 	Addon::registerHook('connector_settings',      'addon/blogger/blogger.php', 'blogger_settings');
 	Addon::registerHook('connector_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post');
 }
 
 function blogger_uninstall()
 {
-	Addon::unregisterHook('post_local',       'addon/blogger/blogger.php', 'blogger_post_local');
-	Addon::unregisterHook('notifier_normal',  'addon/blogger/blogger.php', 'blogger_send');
-	Addon::unregisterHook('jot_networks',     'addon/blogger/blogger.php', 'blogger_jot_nets');
+	Addon::unregisterHook('post_local',              'addon/blogger/blogger.php', 'blogger_post_local');
+	Addon::unregisterHook('notifier_normal',         'addon/blogger/blogger.php', 'blogger_send');
+	Addon::unregisterHook('jot_networks',            'addon/blogger/blogger.php', 'blogger_jot_nets');
 	Addon::unregisterHook('connector_settings',      'addon/blogger/blogger.php', 'blogger_settings');
 	Addon::unregisterHook('connector_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post');
 
 	// obsolete - remove
-	Addon::unregisterHook('post_local_end',   'addon/blogger/blogger.php', 'blogger_send');
-	Addon::unregisterHook('addon_settings',  'addon/blogger/blogger.php', 'blogger_settings');
-	Addon::unregisterHook('addon_settings_post',  'addon/blogger/blogger.php', 'blogger_settings_post');
+	Addon::unregisterHook('post_local_end',      'addon/blogger/blogger.php', 'blogger_send');
+	Addon::unregisterHook('addon_settings',      'addon/blogger/blogger.php', 'blogger_settings');
+	Addon::unregisterHook('addon_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post');
 }
 
 
-function blogger_jot_nets(&$a, &$b)
+function blogger_jot_nets(App $a, &$b)
 {
 	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" ' : '');
@@ -52,7 +54,7 @@ function blogger_jot_nets(&$a, &$b)
 }
 
 
-function blogger_settings(&$a, &$s)
+function blogger_settings(App $a, &$s)
 {
 	if (! local_user()) {
 		return;
@@ -115,18 +117,18 @@ function blogger_settings(&$a, &$s)
 }
 
 
-function blogger_settings_post(&$a, &$b)
+function blogger_settings_post(App $a, array &$b)
 {
-	if (x($_POST, 'blogger-submit')) {
-		PConfig::set(local_user(), 'blogger', 'post', intval($_POST['blogger']));
+	if (!empty($_POST['blogger-submit'])) {
+		PConfig::set(local_user(), 'blogger', 'post',            intval($_POST['blogger']));
 		PConfig::set(local_user(), 'blogger', 'post_by_default', intval($_POST['bl_bydefault']));
-		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']));
+		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']));
 	}
 }
 
-function blogger_post_local(&$a, &$b)
+function blogger_post_local(App $a, array &$b)
 {
 	// This can probably be changed to allow editing by pointing to a different API endpoint
 
@@ -158,13 +160,10 @@ function blogger_post_local(&$a, &$b)
 		$b['postopts'] .= ',';
 	}
 
-	 $b['postopts'] .= 'blogger';
+	$b['postopts'] .= 'blogger';
 }
 
-
-
-
-function blogger_send(&$a, &$b)
+function blogger_send(App $a, array &$b)
 {
 	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
 		return;
-- 
2.39.5