X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=blogger%2Fblogger.php;h=bf4c7eac5a146554f559253114dbe8e56e737b3d;hb=c9a8974165c34bb70874d80a2639b46baf533ffc;hp=7d1a3f4a0db5f78bdd19048fb43908bf02ca4c24;hpb=ca3c45101e7d1faac2f19dea1f49fe4300fdd04e;p=friendica-addons.git

diff --git a/blogger/blogger.php b/blogger/blogger.php
index 7d1a3f4a..bf4c7eac 100644
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -5,42 +5,47 @@
  * Version: 1.0
  *
  */
+
+use Friendica\App;
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 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" ' : '');
@@ -50,7 +55,7 @@ function blogger_jot_nets(&$a, &$b)
 }
 
 
-function blogger_settings(&$a, &$s)
+function blogger_settings(App $a, &$s)
 {
 	if (! local_user()) {
 		return;
@@ -58,7 +63,7 @@ function blogger_settings(&$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->get_baseurl() . '/addon/blogger/blogger.css' . '" media="all" />' . "\r\n";
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/blogger/blogger.css' . '" media="all" />' . "\r\n";
 
 	/* Get the current state of our config variables */
 
@@ -113,18 +118,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']));
-		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']));
+	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', '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
 
@@ -156,13 +161,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;
@@ -181,10 +183,8 @@ function blogger_send(&$a, &$b)
 	$bl_blog = PConfig::get($b['uid'], 'blogger', 'bl_blog');
 
 	if ($bl_username && $bl_password && $bl_blog) {
-		require_once('include/bbcode.php');
-
 		$title = '<title>' . (($b['title']) ? $b['title'] : L10n::t('Post from Friendica')) . '</title>';
-		$post = $title . bbcode($b['body']);
+		$post = $title . BBCode::convert($b['body']);
 		$post = xmlify($post);
 
 		$xml = <<< EOT
@@ -203,12 +203,12 @@ function blogger_send(&$a, &$b)
 
 EOT;
 
-		logger('blogger: data: ' . $xml, LOGGER_DATA);
+		Logger::log('blogger: data: ' . $xml, Logger::DATA);
 
 		if ($bl_blog !== 'test') {
-			$x = Network::postURL($bl_blog, $xml);
+			$x = Network::post($bl_blog, $xml)->getBody();
 		}
 
-		logger('posted to blogger: ' . (($x) ? $x : ''), LOGGER_DEBUG);
+		Logger::log('posted to blogger: ' . (($x) ? $x : ''), Logger::DEBUG);
 	}
 }