X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=blogger%2Fblogger.php;h=5cf0d27b3f22397a717bd42437ed5c1fd5192e76;hb=05d2707d501b7b1cdd98b0802121e69a6df7d05d;hp=049ee0777558fdf767574a638a3873f4bcc673bc;hpb=bbc629544f66f90d2e47d71094d34b436aaf70b8;p=friendica-addons.git

diff --git a/blogger/blogger.php b/blogger/blogger.php
index 049ee077..5cf0d27b 100644
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -9,11 +9,8 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 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;
 
 function blogger_install()
@@ -26,35 +23,19 @@ function blogger_install()
 	Hook::register('connector_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post');
 }
 
-function blogger_uninstall()
-{
-	Hook::unregister('hook_fork',               'addon/blogger/blogger.php', 'blogger_hook_fork');
-	Hook::unregister('post_local',              'addon/blogger/blogger.php', 'blogger_post_local');
-	Hook::unregister('notifier_normal',         'addon/blogger/blogger.php', 'blogger_send');
-	Hook::unregister('jot_networks',            'addon/blogger/blogger.php', 'blogger_jot_nets');
-	Hook::unregister('connector_settings',      'addon/blogger/blogger.php', 'blogger_settings');
-	Hook::unregister('connector_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post');
-
-	// obsolete - remove
-	Hook::unregister('post_local_end',      'addon/blogger/blogger.php', 'blogger_send');
-	Hook::unregister('addon_settings',      'addon/blogger/blogger.php', 'blogger_settings');
-	Hook::unregister('addon_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post');
-}
-
-
 function blogger_jot_nets(App $a, array &$jotnets_fields)
 {
 	if (!local_user()) {
 		return;
 	}
 
-	if (PConfig::get(local_user(), 'blogger', 'post')) {
+	if (DI::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')
+				DI::l10n()->t('Post to blogger'),
+				DI::pConfig()->get(local_user(), 'blogger', 'post_by_default')
 			]
 		];
 	}
@@ -69,69 +50,69 @@ 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="' . DI::baseUrl()->get() . '/addon/blogger/blogger.css' . '" media="all" />' . "\r\n";
+	DI::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 */
 
-	$enabled = PConfig::get(local_user(), 'blogger', 'post');
+	$enabled = DI::pConfig()->get(local_user(), 'blogger', 'post');
 	$checked = (($enabled) ? ' checked="checked" ' : '');
 	$css = (($enabled) ? '' : '-disabled');
 
-	$def_enabled = PConfig::get(local_user(), 'blogger', 'post_by_default');
+	$def_enabled = DI::pConfig()->get(local_user(), 'blogger', 'post_by_default');
 
 	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
 
-	$bl_username = PConfig::get(local_user(), 'blogger', 'bl_username');
-	$bl_password = PConfig::get(local_user(), 'blogger', 'bl_password');
-	$bl_blog = PConfig::get(local_user(), 'blogger', 'bl_blog');
+	$bl_username = DI::pConfig()->get(local_user(), 'blogger', 'bl_username');
+	$bl_password = DI::pConfig()->get(local_user(), 'blogger', 'bl_password');
+	$bl_blog = DI::pConfig()->get(local_user(), 'blogger', 'bl_blog');
 
 	/* Add some HTML to the existing form */
 	$s .= '<span id="settings_blogger_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">';
-	$s .= '<img class="connector'.$css.'" src="images/blogger.png" /><h3 class="connector">'. L10n::t('Blogger Export').'</h3>';
+	$s .= '<img class="connector'.$css.'" src="images/blogger.png" /><h3 class="connector">'. DI::l10n()->t('Blogger Export').'</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_blogger_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">';
-	$s .= '<img class="connector'.$css.'" src="images/blogger.png" /><h3 class="connector">'. L10n::t('Blogger Export').'</h3>';
+	$s .= '<img class="connector'.$css.'" src="images/blogger.png" /><h3 class="connector">'. DI::l10n()->t('Blogger Export').'</h3>';
 	$s .= '</span>';
 
 	$s .= '<div id="blogger-enable-wrapper">';
-	$s .= '<label id="blogger-enable-label" for="blogger-checkbox">' . L10n::t('Enable Blogger Post Addon') . '</label>';
+	$s .= '<label id="blogger-enable-label" for="blogger-checkbox">' . DI::l10n()->t('Enable Blogger Post Addon') . '</label>';
 	$s .= '<input id="blogger-checkbox" type="checkbox" name="blogger" value="1" ' . $checked . '/>';
 	$s .= '</div><div class="clear"></div>';
 
 	$s .= '<div id="blogger-username-wrapper">';
-	$s .= '<label id="blogger-username-label" for="blogger-username">' . L10n::t('Blogger username') . '</label>';
+	$s .= '<label id="blogger-username-label" for="blogger-username">' . DI::l10n()->t('Blogger username') . '</label>';
 	$s .= '<input id="blogger-username" type="text" name="bl_username" value="' . $bl_username . '" />';
 	$s .= '</div><div class="clear"></div>';
 
 	$s .= '<div id="blogger-password-wrapper">';
-	$s .= '<label id="blogger-password-label" for="blogger-password">' . L10n::t('Blogger password') . '</label>';
+	$s .= '<label id="blogger-password-label" for="blogger-password">' . DI::l10n()->t('Blogger password') . '</label>';
 	$s .= '<input id="blogger-password" type="password" name="bl_password" value="' . $bl_password . '" />';
 	$s .= '</div><div class="clear"></div>';
 
 	$s .= '<div id="blogger-blog-wrapper">';
-	$s .= '<label id="blogger-blog-label" for="blogger-blog">' . L10n::t('Blogger API URL') . '</label>';
+	$s .= '<label id="blogger-blog-label" for="blogger-blog">' . DI::l10n()->t('Blogger API URL') . '</label>';
 	$s .= '<input id="blogger-blog" type="text" name="bl_blog" value="' . $bl_blog . '" />';
 	$s .= '</div><div class="clear"></div>';
 
 	$s .= '<div id="blogger-bydefault-wrapper">';
-	$s .= '<label id="blogger-bydefault-label" for="blogger-bydefault">' . L10n::t('Post to Blogger by default') . '</label>';
+	$s .= '<label id="blogger-bydefault-label" for="blogger-bydefault">' . DI::l10n()->t('Post to Blogger by default') . '</label>';
 	$s .= '<input id="blogger-bydefault" type="checkbox" name="bl_bydefault" value="1" ' . $def_checked . '/>';
 	$s .= '</div><div class="clear"></div>';
 
 	/* provide a submit button */
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="blogger-submit" name="blogger-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="blogger-submit" name="blogger-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
 }
 
 
 function blogger_settings_post(App $a, array &$b)
 {
 	if (!empty($_POST['blogger-submit'])) {
-		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']));
+		DI::pConfig()->set(local_user(), 'blogger', 'post',            $_POST['blogger'] ?? false);
+		DI::pConfig()->set(local_user(), 'blogger', 'post_by_default', $_POST['bl_bydefault'] ?? false);
+		DI::pConfig()->set(local_user(), 'blogger', 'bl_username',     trim($_POST['bl_username']));
+		DI::pConfig()->set(local_user(), 'blogger', 'bl_password',     trim($_POST['bl_password']));
+		DI::pConfig()->set(local_user(), 'blogger', 'bl_blog',         trim($_POST['bl_blog']));
 	}
 }
 
@@ -166,11 +147,11 @@ function blogger_post_local(App $a, array &$b)
 		return;
 	}
 
-	$bl_post   = intval(PConfig::get(local_user(), 'blogger', 'post'));
+	$bl_post   = intval(DI::pConfig()->get(local_user(), 'blogger', 'post'));
 
 	$bl_enable = (($bl_post && !empty($_REQUEST['blogger_enable'])) ? intval($_REQUEST['blogger_enable']) : 0);
 
-	if ($b['api_source'] && intval(PConfig::get(local_user(), 'blogger', 'post_by_default'))) {
+	if ($b['api_source'] && intval(DI::pConfig()->get(local_user(), 'blogger', 'post_by_default'))) {
 		$bl_enable = 1;
 	}
 
@@ -199,12 +180,12 @@ function blogger_send(App $a, array &$b)
 		return;
 	}
 
-	$bl_username = XML::escape(PConfig::get($b['uid'], 'blogger', 'bl_username'));
-	$bl_password = XML::escape(PConfig::get($b['uid'], 'blogger', 'bl_password'));
-	$bl_blog = PConfig::get($b['uid'], 'blogger', 'bl_blog');
+	$bl_username = XML::escape(DI::pConfig()->get($b['uid'], 'blogger', 'bl_username'));
+	$bl_password = XML::escape(DI::pConfig()->get($b['uid'], 'blogger', 'bl_password'));
+	$bl_blog = DI::pConfig()->get($b['uid'], 'blogger', 'bl_blog');
 
 	if ($bl_username && $bl_password && $bl_blog) {
-		$title = '<title>' . (($b['title']) ? $b['title'] : L10n::t('Post from Friendica')) . '</title>';
+		$title = '<title>' . (($b['title']) ? $b['title'] : DI::l10n()->t('Post from Friendica')) . '</title>';
 		$post = $title . BBCode::convert($b['body']);
 		$post = XML::escape($post);
 
@@ -227,7 +208,7 @@ EOT;
 		Logger::log('blogger: data: ' . $xml, Logger::DATA);
 
 		if ($bl_blog !== 'test') {
-			$x = Network::post($bl_blog, $xml)->getBody();
+			$x = DI::httpRequest()->post($bl_blog, $xml)->getBody();
 		}
 
 		Logger::log('posted to blogger: ' . (($x) ? $x : ''), Logger::DEBUG);