From c2970ad6d521326dcaac4371961b7d5112b4ba82 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 24 Mar 2019 22:44:50 -0400
Subject: [PATCH] [various] Replace HTML string by structured array in
 jot_networks hook

---
 blogger/blogger.php     | 18 ++++++++++--------
 buffer/buffer.php       | 18 ++++++++++--------
 diaspora/diaspora.php   | 20 ++++++++++----------
 dwpost/dwpost.php       | 19 ++++++++++---------
 ijpost/ijpost.php       | 17 ++++++++++-------
 libertree/libertree.php | 23 ++++++++++++++---------
 ljpost/ljpost.php       | 21 +++++++++++++--------
 pumpio/pumpio.php       | 18 ++++++++++--------
 statusnet/statusnet.php | 17 ++++++++++-------
 tumblr/tumblr.php       | 18 ++++++++++--------
 twitter/twitter.php     | 18 +++++++++++-------
 wppost/wppost.php       | 17 ++++++++++-------
 12 files changed, 128 insertions(+), 96 deletions(-)

diff --git a/blogger/blogger.php b/blogger/blogger.php
index 563d0ce4..5c03e760 100644
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -41,19 +41,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')
+			]
+		];
 	}
 }
 
diff --git a/buffer/buffer.php b/buffer/buffer.php
index 84ea0be8..4705260c 100644
--- a/buffer/buffer.php
+++ b/buffer/buffer.php
@@ -125,19 +125,21 @@ function buffer_connect(App $a)
 	return $o;
 }
 
-function buffer_jot_nets(App $a, &$b)
+function buffer_jot_nets(App $a, array &$jotnets_fields)
 {
 	if (!local_user()) {
 		return;
 	}
 
-	$buffer_post = PConfig::get(local_user(), 'buffer', 'post');
-
-	if (intval($buffer_post) == 1) {
-		$buffer_defpost = PConfig::get(local_user(), 'buffer', 'post_by_default');
-		$selected = ((intval($buffer_defpost) == 1) ? ' checked="checked" ' : '');
-		$b .= '<div class="profile-jot-net"><input type="checkbox" name="buffer_enable"' . $selected . ' value="1" /> '
-		    . L10n::t('Post to Buffer') . '</div>';
+	if (PConfig::get(local_user(), 'buffer', 'post')) {
+		$jotnets_fields[] = [
+			'type' => 'checkbox',
+			'field' => [
+				'buffer_enable',
+				L10n::t('Post to Buffer'),
+				PConfig::get(local_user(), 'buffer', 'post_by_default')
+			]
+		];
 	}
 }
 
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 75256fff..88630fe0 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -41,21 +41,21 @@ function diaspora_uninstall()
 	Hook::unregister('queue_predeliver',        'addon/diaspora/diaspora.php', 'diaspora_queue_hook');
 }
 
-function diaspora_jot_nets(App $a, &$b)
+function diaspora_jot_nets(App $a, array &$jotnets_fields)
 {
 	if (!local_user()) {
 		return;
 	}
 
-	$diaspora_post = PConfig::get(local_user(), 'diaspora', 'post');
-
-	if (intval($diaspora_post) == 1) {
-		$diaspora_defpost = PConfig::get(local_user(), 'diaspora', 'post_by_default');
-
-		$selected = ((intval($diaspora_defpost) == 1) ? ' checked="checked" ' : '');
-
-		$b .= '<div class="profile-jot-net"><input type="checkbox" name="diaspora_enable"' . $selected . ' value="1" /> '
-		. L10n::t('Post to Diaspora') . '</div>';
+	if (PConfig::get(local_user(), 'diaspora', 'post')) {
+		$jotnets_fields[] = [
+			'type' => 'checkbox',
+			'field' => [
+				'diaspora_enable',
+				L10n::t('Post to Diaspora'),
+				PConfig::get(local_user(), 'diaspora', 'post_by_default')
+			]
+		];
 	}
 }
 
diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 1fdf003d..ebba0232 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -37,20 +37,21 @@ function dwpost_uninstall()
 	Hook::unregister('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
 }
 
-function dwpost_jot_nets(App $a, &$b)
+function dwpost_jot_nets(App $a, array &$jotnets_fields)
 {
 	if (!local_user()) {
 		return;
 	}
 
-	$dw_post = PConfig::get(local_user(), 'dwpost', 'post');
-
-	if (intval($dw_post) == 1) {
-		$dw_defpost = PConfig::get(local_user(), 'dwpost', 'post_by_default');
-		$selected = ((intval($dw_defpost) == 1) ? ' checked="checked" ' : '');
-
-		$b .= '<div class="profile-jot-net"><input type="checkbox" name="dwpost_enable" ' . $selected . ' value="1" /> '
-		. L10n::t('Post to Dreamwidth') . '</div>';
+	if (PConfig::get(local_user(), 'dwpost', 'post')) {
+		$jotnets_fields[] = [
+			'type' => 'checkbox',
+			'field' => [
+				'dwpost_enable',
+				L10n::t('Post to Dreamwidth'),
+				PConfig::get(local_user(), 'dwpost', 'post_by_default')
+			]
+		];
 	}
 }
 
diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index b3ae2ed9..020dd221 100644
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -35,18 +35,21 @@ function ijpost_uninstall()
 	Hook::unregister('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
 }
 
-function ijpost_jot_nets(&$a, &$b)
+function ijpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
 {
 	if (!local_user()) {
 		return;
 	}
 
-	$ij_post = PConfig::get(local_user(), 'ijpost', 'post');
-	if (intval($ij_post) == 1) {
-		$ij_defpost = PConfig::get(local_user(), 'ijpost', 'post_by_default');
-		$selected = ((intval($ij_defpost) == 1) ? ' checked="checked" ' : '');
-		$b .= '<div class="profile-jot-net"><input type="checkbox" name="ijpost_enable" ' . $selected . ' value="1" /> '
-			. L10n::t('Post to Insanejournal') . '</div>';
+	if (PConfig::get(local_user(), 'ijpost', 'post')) {
+		$jotnets_fields[] = [
+			'type' => 'checkbox',
+			'field' => [
+				'ijpost_enable',
+				L10n::t('Post to Insanejournal'),
+				PConfig::get(local_user(), 'ijpost', 'post_by_default')
+			]
+		];
 	}
 }
 
diff --git a/libertree/libertree.php b/libertree/libertree.php
index a864b9eb..034833e8 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -35,17 +35,22 @@ function libertree_uninstall()
 	Hook::unregister('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post');
 }
 
-function libertree_jot_nets(&$a,&$b) {
-    if(! local_user())
+function libertree_jot_nets(App &$a, array &$jotnets_fields)
+{
+    if(! local_user()) {
         return;
-
-    $ltree_post = PConfig::get(local_user(),'libertree','post');
-    if(intval($ltree_post) == 1) {
-        $ltree_defpost = PConfig::get(local_user(),'libertree','post_by_default');
-        $selected = ((intval($ltree_defpost) == 1) ? ' checked="checked" ' : '');
-        $b .= '<div class="profile-jot-net"><input type="checkbox" name="libertree_enable"' . $selected . ' value="1" /> '
-            . L10n::t('Post to libertree') . '</div>';
     }
+
+	if (PConfig::get(local_user(), 'libertree', 'post')) {
+		$jotnets_fields[] = [
+			'type' => 'checkbox',
+			'field' => [
+				'libertree_enable',
+				L10n::t('Post to libertree'),
+				PConfig::get(local_user(), 'libertree', 'post_by_default')
+			]
+		];
+	}
 }
 
 
diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index e8977b51..8bc33fc7 100644
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -35,16 +35,21 @@ function ljpost_uninstall() {
 }
 
 
-function ljpost_jot_nets(&$a,&$b) {
-    if(! local_user())
+function ljpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
+{
+    if(! local_user()) {
         return;
+    }
 
-    $lj_post = PConfig::get(local_user(),'ljpost','post');
-    if(intval($lj_post) == 1) {
-        $lj_defpost = PConfig::get(local_user(),'ljpost','post_by_default');
-        $selected = ((intval($lj_defpost) == 1) ? ' checked="checked" ' : '');
-        $b .= '<div class="profile-jot-net"><input type="checkbox" name="ljpost_enable" ' . $selected . ' value="1" /> '
-            . L10n::t('Post to LiveJournal') . '</div>';
+    if (PConfig::get(local_user(),'ljpost','post')) {
+	    $jotnets_fields[] = [
+		    'type' => 'checkbox',
+		    'field' => [
+			    'ljpost_enable',
+			    L10n::t('Post to LiveJournal'),
+			    PConfig::get(local_user(),'ljpost','post_by_default')
+		    ]
+	    ];
     }
 }
 
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index d7b3adb4..319c109a 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -214,19 +214,21 @@ function pumpio_connect(App $a)
 	return $o;
 }
 
-function pumpio_jot_nets(App $a, &$b)
+function pumpio_jot_nets(App $a, array &$jotnets_fields)
 {
 	if (! local_user()) {
 		return;
 	}
 
-	$pumpio_post = PConfig::get(local_user(), 'pumpio', 'post');
-
-	if (intval($pumpio_post) == 1) {
-		$pumpio_defpost = PConfig::get(local_user(), 'pumpio', 'post_by_default');
-		$selected = ((intval($pumpio_defpost) == 1) ? ' checked="checked" ' : '');
-		$b .= '<div class="profile-jot-net"><input type="checkbox" name="pumpio_enable"' . $selected . ' value="1" /> '
-			. L10n::t('Post to pumpio') . '</div>';
+	if (PConfig::get(local_user(), 'pumpio', 'post')) {
+		$jotnets_fields[] = [
+			'type' => 'checkbox',
+			'field' => [
+				'pumpio_enable',
+				L10n::t('Post to pumpio'),
+				PConfig::get(local_user(), 'pumpio', 'post_by_default')
+			]
+		];
 	}
 }
 
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index bc4ef363..ab4cceb7 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -101,18 +101,21 @@ function statusnet_check_item_notification(App $a, &$notification_data)
 	}
 }
 
-function statusnet_jot_nets(App $a, &$b)
+function statusnet_jot_nets(App $a, array &$jotnets_fields)
 {
 	if (!local_user()) {
 		return;
 	}
 
-	$statusnet_post = PConfig::get(local_user(), 'statusnet', 'post');
-	if (intval($statusnet_post) == 1) {
-		$statusnet_defpost = PConfig::get(local_user(), 'statusnet', 'post_by_default');
-		$selected = ((intval($statusnet_defpost) == 1) ? ' checked="checked" ' : '');
-		$b .= '<div class="profile-jot-net"><input type="checkbox" name="statusnet_enable"' . $selected . ' value="1" /> '
-			. L10n::t('Post to GNU Social') . '</div>';
+	if (PConfig::get(local_user(), 'statusnet', 'post')) {
+		$jotnets_fields[] = [
+			'type' => 'checkbox',
+			'field' => [
+				'statusnet_enable',
+				L10n::t('Post to GNU Social'),
+				PConfig::get(local_user(), 'statusnet', 'post_by_default')
+			]
+		];
 	}
 }
 
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 62f71132..3bf258b3 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -193,19 +193,21 @@ function tumblr_callback(App $a)
 	return $o;
 }
 
-function tumblr_jot_nets(App $a, &$b)
+function tumblr_jot_nets(App $a, array &$jotnets_fields)
 {
 	if (! local_user()) {
 		return;
 	}
 
-	$tmbl_post = PConfig::get(local_user(), 'tumblr', 'post');
-
-	if (intval($tmbl_post) == 1) {
-		$tmbl_defpost = PConfig::get(local_user(), 'tumblr', 'post_by_default');
-		$selected = ((intval($tmbl_defpost) == 1) ? ' checked="checked" ' : '');
-		$b .= '<div class="profile-jot-net"><input type="checkbox" name="tumblr_enable"' . $selected . ' value="1" /> '
-			. L10n::t('Post to Tumblr') . '</div>';
+	if (PConfig::get(local_user(),'tumblr','post')) {
+		$jotnets_fields[] = [
+			'type' => 'checkbox',
+			'field' => [
+				'tumblr_enable',
+				L10n::t('Post to Tumblr'),
+				PConfig::get(local_user(),'tumblr','post_by_default')
+			]
+		];
 	}
 }
 
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 3dbaf37b..99bed6e2 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -194,21 +194,25 @@ function twitter_follow(App $a, array &$contact)
 	}
 }
 
-function twitter_jot_nets(App $a, &$b)
+function twitter_jot_nets(App $a, array &$jotnets_fields)
 {
 	if (!local_user()) {
 		return;
 	}
 
-	$tw_post = PConfig::get(local_user(), 'twitter', 'post');
-	if (intval($tw_post) == 1) {
-		$tw_defpost = PConfig::get(local_user(), 'twitter', 'post_by_default');
-		$selected = ((intval($tw_defpost) == 1) ? ' checked="checked" ' : '');
-		$b .= '<div class="profile-jot-net"><input type="checkbox" name="twitter_enable"' . $selected . ' value="1" /> '
-			. L10n::t('Post to Twitter') . '</div>';
+	if (PConfig::get(local_user(), 'twitter', 'post')) {
+		$jotnets_fields[] = [
+			'type' => 'checkbox',
+			'field' => [
+				'twitter_enable',
+				L10n::t('Post to Twitter'),
+				PConfig::get(local_user(), 'twitter', 'post_by_default')
+			]
+		];
 	}
 }
 
+
 function twitter_settings_post(App $a)
 {
 	if (!local_user()) {
diff --git a/wppost/wppost.php b/wppost/wppost.php
index 4e4ae713..c3840d52 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -43,18 +43,21 @@ function wppost_uninstall()
 }
 
 
-function wppost_jot_nets(&$a, &$b)
+function wppost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
 {
 	if (!local_user()) {
 		return;
 	}
 
-	$wp_post = PConfig::get(local_user(), 'wppost', 'post');
-	if (intval($wp_post) == 1) {
-		$wp_defpost = PConfig::get(local_user(),'wppost','post_by_default');
-		$selected = ((intval($wp_defpost) == 1) ? ' checked="checked" ' : '');
-		$b .= '<div class="profile-jot-net"><input type="checkbox" name="wppost_enable" ' . $selected . ' value="1" /> '
-			. L10n::t('Post to Wordpress') . '</div>';
+	if (PConfig::get(local_user(),'wppost','post')) {
+		$jotnets_fields[] = [
+			'type' => 'checkbox',
+			'field' => [
+				'wppost_enable',
+				L10n::t('Post to Wordpress'),
+				PConfig::get(local_user(),'wppost','post_by_default')
+			]
+		];
 	}
 }