X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=libertree%2Flibertree.php;h=c0f896c0c43346e295af163f63aeb29bb5538033;hb=dad3d477d31844eac0f653345fd09659bf42c2fa;hp=902442ab8671c384b330b9d76743e82fb2939aba;hpb=48fecb9a40d0a1bac959f239be1d937edd5b7f09;p=friendica-addons.git

diff --git a/libertree/libertree.php b/libertree/libertree.php
index 902442ab..c0f896c0 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -9,11 +9,11 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Util\Network;
+use Friendica\Model\Post;
 
 function libertree_install()
 {
@@ -25,109 +25,65 @@ function libertree_install()
 	Hook::register('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post');
 }
 
-function libertree_uninstall()
+function libertree_jot_nets(array &$jotnets_fields)
 {
-	Hook::unregister('hook_fork',        'addon/libertree/libertree.php', 'libertree_hook_fork');
-	Hook::unregister('post_local',       'addon/libertree/libertree.php', 'libertree_post_local');
-	Hook::unregister('notifier_normal',  'addon/libertree/libertree.php', 'libertree_send');
-	Hook::unregister('jot_networks',     'addon/libertree/libertree.php', 'libertree_jot_nets');
-	Hook::unregister('connector_settings',      'addon/libertree/libertree.php', 'libertree_settings');
-	Hook::unregister('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post');
-}
-
-function libertree_jot_nets(App &$a, array &$jotnets_fields)
-{
-    if(! local_user()) {
-        return;
-    }
+	if (!DI::userSession()->getLocalUserId()) {
+		return;
+	}
 
-	if (DI::pConfig()->get(local_user(), 'libertree', 'post')) {
+	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'post')) {
 		$jotnets_fields[] = [
 			'type' => 'checkbox',
 			'field' => [
 				'libertree_enable',
 				DI::l10n()->t('Post to libertree'),
-				DI::pConfig()->get(local_user(), 'libertree', 'post_by_default')
-			]
+				DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'post_by_default'),
+			],
 		];
 	}
 }
 
+function libertree_settings(array &$data)
+{
+	if (!DI::userSession()->getLocalUserId()) {
+		return;
+	}
 
-function libertree_settings(&$a,&$s) {
-
-    if(! local_user())
-        return;
-
-    /* Add our stylesheet to the page so we can make our settings look nice */
-
-    DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/libertree/libertree.css' . '" media="all" />' . "\r\n";
-
-    /* Get the current state of our config variables */
-
-    $enabled = DI::pConfig()->get(local_user(),'libertree','post');
-    $checked = (($enabled) ? ' checked="checked" ' : '');
-    $css = (($enabled) ? '' : '-disabled');
-
-    $def_enabled = DI::pConfig()->get(local_user(),'libertree','post_by_default');
-
-    $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
-
-    $ltree_api_token = DI::pConfig()->get(local_user(), 'libertree', 'libertree_api_token');
-    $ltree_url = DI::pConfig()->get(local_user(), 'libertree', 'libertree_url');
-
-
-    /* Add some HTML to the existing form */
-
-    $s .= '<span id="settings_libertree_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">';
-    $s .= '<img class="connector'.$css.'" src="images/libertree.png" /><h3 class="connector">'. DI::l10n()->t('libertree Export').'</h3>';
-    $s .= '</span>';
-    $s .= '<div id="settings_libertree_expanded" class="settings-block" style="display: none;">';
-    $s .= '<span class="fakelink" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">';
-    $s .= '<img class="connector'.$css.'" src="images/libertree.png" /><h3 class="connector">'. DI::l10n()->t('libertree Export').'</h3>';
-    $s .= '</span>';
-
-    $s .= '<div id="libertree-enable-wrapper">';
-    $s .= '<label id="libertree-enable-label" for="libertree-checkbox">' . DI::l10n()->t('Enable Libertree Post Addon') . '</label>';
-    $s .= '<input id="libertree-checkbox" type="checkbox" name="libertree" value="1" ' . $checked . '/>';
-    $s .= '</div><div class="clear"></div>';
-
-    $s .= '<div id="libertree-api_token-wrapper">';
-    $s .= '<label id="libertree-api_token-label" for="libertree-api_token">' . DI::l10n()->t('Libertree API token') . '</label>';
-    $s .= '<input id="libertree-api_token" type="text" name="libertree_api_token" value="' . $ltree_api_token . '" />';
-    $s .= '</div><div class="clear"></div>';
-
-    $s .= '<div id="libertree-url-wrapper">';
-    $s .= '<label id="libertree-url-label" for="libertree-url">' . DI::l10n()->t('Libertree site URL') . '</label>';
-    $s .= '<input id="libertree-url" type="text" name="libertree_url" value="' . $ltree_url . '" />';
-    $s .= '</div><div class="clear"></div>';
-
-    $s .= '<div id="libertree-bydefault-wrapper">';
-    $s .= '<label id="libertree-bydefault-label" for="libertree-bydefault">' . DI::l10n()->t('Post to Libertree by default') . '</label>';
-    $s .= '<input id="libertree-bydefault" type="checkbox" name="libertree_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="libertree-submit" name="libertree-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
-
+	$enabled         = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'post', false);
+	$ltree_api_token = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'libertree_api_token');
+	$ltree_url       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'libertree_url');
+	$def_enabled     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'post_by_default');
+
+	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/libertree/');
+	$html = Renderer::replaceMacros($t, [
+		'$enabled'         => ['libertree', DI::l10n()->t('Enable Libertree Post Addon'), $enabled],
+		'$ltree_url'       => ['libertree_url', DI::l10n()->t('Libertree site URL'), $ltree_url],
+		'$ltree_api_token' => ['libertree_api_token', DI::l10n()->t('Libertree API token'), $ltree_api_token],
+		'$bydefault'       => ['ij_bydefault', DI::l10n()->t('Post to Libertree by default'), $def_enabled],
+	]);
+
+	$data = [
+		'connector' => 'libertree',
+		'title'     => DI::l10n()->t('Libertree Export'),
+		'image'     => 'images/libertree.png',
+		'enabled'   => $enabled,
+		'html'      => $html,
+	];
 }
 
-
-function libertree_settings_post(&$a,&$b) {
-
-	if(!empty($_POST['libertree-submit'])) {
-
-		DI::pConfig()->set(local_user(),'libertree','post',intval($_POST['libertree']));
-		DI::pConfig()->set(local_user(),'libertree','post_by_default',intval($_POST['libertree_bydefault']));
-		DI::pConfig()->set(local_user(),'libertree','libertree_api_token',trim($_POST['libertree_api_token']));
-		DI::pConfig()->set(local_user(),'libertree','libertree_url',trim($_POST['libertree_url']));
+function libertree_settings_post(array &$b)
+{
+	if (!empty($_POST['libertree-submit'])) {
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','post',intval($_POST['libertree']));
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','post_by_default',intval($_POST['libertree_bydefault']));
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','libertree_api_token',trim($_POST['libertree_api_token']));
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','libertree_url',trim($_POST['libertree_url']));
 
 	}
 
 }
 
-function libertree_hook_fork(App &$a, array &$b)
+function libertree_hook_fork(array &$b)
 {
 	if ($b['name'] != 'notifier_normal') {
 		return;
@@ -142,7 +98,8 @@ function libertree_hook_fork(App &$a, array &$b)
 	}
 }
 
-function libertree_post_local(&$a,&$b) {
+function libertree_post_local(array &$b)
+{
 
 	// This can probably be changed to allow editing by pointing to a different API endpoint
 
@@ -150,7 +107,7 @@ function libertree_post_local(&$a,&$b) {
 		return;
 	}
 
-	if ((! local_user()) || (local_user() != $b['uid'])) {
+	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
 		return;
 	}
 
@@ -158,11 +115,11 @@ function libertree_post_local(&$a,&$b) {
 		return;
 	}
 
-	$ltree_post   = intval(DI::pConfig()->get(local_user(),'libertree','post'));
+	$ltree_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'libertree','post'));
 
 	$ltree_enable = (($ltree_post && !empty($_REQUEST['libertree_enable'])) ? intval($_REQUEST['libertree_enable']) : 0);
 
-	if ($b['api_source'] && intval(DI::pConfig()->get(local_user(),'libertree','post_by_default'))) {
+	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'libertree','post_by_default'))) {
 		$ltree_enable = 1;
 	}
 
@@ -177,12 +134,9 @@ function libertree_post_local(&$a,&$b) {
 	$b['postopts'] .= 'libertree';
 }
 
-
-
-
-function libertree_send(&$a,&$b) {
-
-	Logger::log('libertree_send: invoked');
+function libertree_send(array &$b)
+{
+	Logger::notice('libertree_send: invoked');
 
 	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
 		return;
@@ -197,33 +151,23 @@ function libertree_send(&$a,&$b) {
 	}
 
 	// Dont't post if the post doesn't belong to us.
-	// This is a check for forum postings
+	// This is a check for group postings
 	$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 	if ($b['contact-id'] != $self['id']) {
 		return;
 	}
 
+	$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
+
 	$ltree_api_token = DI::pConfig()->get($b['uid'],'libertree','libertree_api_token');
 	$ltree_url = DI::pConfig()->get($b['uid'],'libertree','libertree_url');
 	$ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token";
-	$ltree_source = DI::baseUrl()->getHostname();
+	$ltree_source = DI::baseUrl()->getHost();
 
 	if ($b['app'] != "")
 		$ltree_source .= " (".$b['app'].")";
 
 	if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) {
-		$tag_arr = [];
-		$tags = '';
-		$x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
-
-		if($x) {
-			foreach($matches as $mtch) {
-				$tag_arr[] = $mtch[2];
-			}
-		}
-		if(count($tag_arr))
-			$tags = implode(',',$tag_arr);
-
 		$title = $b['title'];
 		$body = $b['body'];
 		// Insert a newline before and after a quote
@@ -239,15 +183,16 @@ function libertree_send(&$a,&$b) {
 		// remove multiple newlines
 		do {
 			$oldbody = $body;
-                        $body = str_replace("\n\n\n", "\n\n", $body);
-                } while ($oldbody != $body);
+			$body = str_replace("\n\n\n", "\n\n", $body);
+		} while ($oldbody != $body);
 
 		// convert to markdown
 		$body = BBCode::toMarkdown($body, false);
 
 		// Adding the title
-		if(strlen($title))
-			$body = "## ".html_entity_decode($title)."\n\n".$body;
+		if (strlen($title)) {
+			$body = '## ' . html_entity_decode($title) . "\n\n" . $body;
+		}
 
 
 		$params = [
@@ -256,7 +201,7 @@ function libertree_send(&$a,&$b) {
 		//	'token' => $ltree_api_token
 		];
 
-		$result = Network::post($ltree_blog, $params)->getBody();
-		Logger::log('libertree: ' . $result);
+		$result = DI::httpClient()->post($ltree_blog, $params)->getBody();
+		Logger::notice('libertree: ' . $result);
 	}
 }