X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=dwpost%2Fdwpost.php;h=ebba023279e13b128afbc0a364fbd9d41f45cbbc;hb=80ec21c76bc7a0cc5f1e73acf91db16ceaa06b04;hp=bc8959fc36aa16e87c7ccb305fca512e6f22db71;hpb=2e8d9ba39b30c9f8803ed85e25c19a1a509d1418;p=friendica-addons.git

diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index bc8959fc..ebba0232 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -10,45 +10,48 @@
 
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\XML;
 
 function dwpost_install()
 {
-	Addon::registerHook('post_local',              'addon/dwpost/dwpost.php', 'dwpost_post_local');
-	Addon::registerHook('notifier_normal',         'addon/dwpost/dwpost.php', 'dwpost_send');
-	Addon::registerHook('jot_networks',            'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
-	Addon::registerHook('connector_settings',      'addon/dwpost/dwpost.php', 'dwpost_settings');
-	Addon::registerHook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
+	Hook::register('post_local',              'addon/dwpost/dwpost.php', 'dwpost_post_local');
+	Hook::register('notifier_normal',         'addon/dwpost/dwpost.php', 'dwpost_send');
+	Hook::register('jot_networks',            'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
+	Hook::register('connector_settings',      'addon/dwpost/dwpost.php', 'dwpost_settings');
+	Hook::register('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
 }
 
 function dwpost_uninstall()
 {
-	Addon::unregisterHook('post_local',              'addon/dwpost/dwpost.php', 'dwpost_post_local');
-	Addon::unregisterHook('notifier_normal',         'addon/dwpost/dwpost.php', 'dwpost_send');
-	Addon::unregisterHook('jot_networks',            'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
-	Addon::unregisterHook('connector_settings',      'addon/dwpost/dwpost.php', 'dwpost_settings');
-	Addon::unregisterHook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
+	Hook::unregister('post_local',              'addon/dwpost/dwpost.php', 'dwpost_post_local');
+	Hook::unregister('notifier_normal',         'addon/dwpost/dwpost.php', 'dwpost_send');
+	Hook::unregister('jot_networks',            'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
+	Hook::unregister('connector_settings',      'addon/dwpost/dwpost.php', 'dwpost_settings');
+	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')
+			]
+		];
 	}
 }
 
@@ -135,7 +138,7 @@ function dwpost_post_local(App $a, array &$b)
 
 	$dw_post = intval(PConfig::get(local_user(),'dwpost','post'));
 
-	$dw_enable = (($dw_post && x($_REQUEST,'dwpost_enable')) ? intval($_REQUEST['dwpost_enable']) : 0);
+	$dw_enable = (($dw_post && !empty($_REQUEST['dwpost_enable'])) ? intval($_REQUEST['dwpost_enable']) : 0);
 
 	if ($b['api_source'] && intval(PConfig::get(local_user(),'dwpost','post_by_default'))) {
 		$dw_enable = 1;
@@ -188,7 +191,7 @@ function dwpost_send(App $a, array &$b)
 	if ($dw_username && $dw_password && $dw_blog) {
 		$title = $b['title'];
 		$post = BBCode::convert($b['body']);
-		$post = xmlify($post);
+		$post = XML::escape($post);
 		$tags = dwpost_get_tags($b['tag']);
 
 		$date = DateTimeFormat::convert($b['created'], $tz);
@@ -225,13 +228,13 @@ function dwpost_send(App $a, array &$b)
 
 EOT;
 
-		logger('dwpost: data: ' . $xml, LOGGER_DATA);
+		Logger::log('dwpost: data: ' . $xml, Logger::DATA);
 
 		if ($dw_blog !== 'test') {
 			$x = Network::post($dw_blog, $xml, ["Content-Type: text/xml"])->getBody();
 		}
 
-		logger('posted to dreamwidth: ' . ($x) ? $x : '', LOGGER_DEBUG);
+		Logger::log('posted to dreamwidth: ' . ($x) ? $x : '', Logger::DEBUG);
 	}
 }