X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=libertree%2Flibertree.php;h=1062ab5a126c61d22c3df96d0b240e107baa5137;hb=bdbfd9e9194a054e3b3380bd17f241d76a347af7;hp=e91996ccad10b850059af2a42ad022abac58e16e;hpb=715a7db9f6009031587f01d3ef0b7695b48724be;p=friendica-addons.git

diff --git a/libertree/libertree.php b/libertree/libertree.php
old mode 100755
new mode 100644
index e91996cc..1062ab5a
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Name: Libertree Post Connector
  * Description: Post to libertree accounts
@@ -7,34 +6,39 @@
  * Author: Tony Baldwin <https://free-haven.org/u/tony>
  */
 
-function libertree_install() {
-    register_hook('post_local',           'addon/libertree/libertree.php', 'libertree_post_local');
-    register_hook('notifier_normal',      'addon/libertree/libertree.php', 'libertree_send');
-    register_hook('jot_networks',         'addon/libertree/libertree.php', 'libertree_jot_nets');
-    register_hook('connector_settings',      'addon/libertree/libertree.php', 'libertree_settings');
-    register_hook('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post');
-
-}
-function libertree_uninstall() {
-    unregister_hook('post_local',       'addon/libertree/libertree.php', 'libertree_post_local');
-    unregister_hook('notifier_normal',  'addon/libertree/libertree.php', 'libertree_send');
-    unregister_hook('jot_networks',     'addon/libertree/libertree.php', 'libertree_jot_nets');
-    unregister_hook('connector_settings',      'addon/libertree/libertree.php', 'libertree_settings');
-    unregister_hook('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post');
+use Friendica\App;
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
+use Friendica\Database\DBA;
+use Friendica\DI;
+
+function libertree_install()
+{
+	Hook::register('hook_fork',            'addon/libertree/libertree.php', 'libertree_hook_fork');
+	Hook::register('post_local',           'addon/libertree/libertree.php', 'libertree_post_local');
+	Hook::register('notifier_normal',      'addon/libertree/libertree.php', 'libertree_send');
+	Hook::register('jot_networks',         'addon/libertree/libertree.php', 'libertree_jot_nets');
+	Hook::register('connector_settings',      'addon/libertree/libertree.php', 'libertree_settings');
+	Hook::register('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 = get_pconfig(local_user(),'libertree','post');
-    if(intval($ltree_post) == 1) {
-        $ltree_defpost = get_pconfig(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" /> '
-            . t('Post to libertree') . '</div>';
     }
+
+	if (DI::pConfig()->get(local_user(), 'libertree', 'post')) {
+		$jotnets_fields[] = [
+			'type' => 'checkbox',
+			'field' => [
+				'libertree_enable',
+				DI::l10n()->t('Post to libertree'),
+				DI::pConfig()->get(local_user(), 'libertree', 'post_by_default')
+			]
+		];
+	}
 }
 
 
@@ -45,92 +49,120 @@ function libertree_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/libertree/libertree.css' . '" media="all" />' . "\r\n";
+    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 = get_pconfig(local_user(),'libertree','post');
-
+    $enabled = DI::pConfig()->get(local_user(),'libertree','post');
     $checked = (($enabled) ? ' checked="checked" ' : '');
+    $css = (($enabled) ? '' : '-disabled');
 
-    $def_enabled = get_pconfig(local_user(),'libertree','post_by_default');
+    $def_enabled = DI::pConfig()->get(local_user(),'libertree','post_by_default');
 
     $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
 
-    $ltree_api_token = get_pconfig(local_user(), 'libertree', 'libertree_api_token');
-    $ltree_url = get_pconfig(local_user(), 'libertree', 'libertree_url');
+    $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 .= '<div class="settings-block">';
-    $s .= '<h3>' . t('libertree Post Settings') . '</h3>';
+    $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">' . t('Enable Libertree Post Plugin') . '</label>';
+    $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">' . t('Libertree API token') . '</label>';
+    $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">' . t('Libertree site URL') . '</label>';
+    $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">' . t('Post to Libertree by default') . '</label>';
+    $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="' . t('Submit') . '" /></div></div>';
+    $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>';
 
 }
 
 
 function libertree_settings_post(&$a,&$b) {
 
-	if(x($_POST,'libertree-submit')) {
+	if(!empty($_POST['libertree-submit'])) {
 
-		set_pconfig(local_user(),'libertree','post',intval($_POST['libertree']));
-		set_pconfig(local_user(),'libertree','post_by_default',intval($_POST['libertree_bydefault']));
-		set_pconfig(local_user(),'libertree','libertree_api_token',trim($_POST['libertree_api_token']));
-		set_pconfig(local_user(),'libertree','libertree_url',trim($_POST['libertree_url']));
+		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_hook_fork(App &$a, array &$b)
+{
+	if ($b['name'] != 'notifier_normal') {
+		return;
+	}
+
+	$post = $b['data'];
+
+	if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
+		!strstr($post['postopts'], 'libertree') || ($post['parent'] != $post['id'])) {
+		$b['execute'] = false;
+		return;
+	}
+}
+
 function libertree_post_local(&$a,&$b) {
 
 	// This can probably be changed to allow editing by pointing to a different API endpoint
 
-	if($b['edit'])
+	if ($b['edit']) {
 		return;
+	}
 
-	if((! local_user()) || (local_user() != $b['uid']))
+	if ((! local_user()) || (local_user() != $b['uid'])) {
 		return;
+	}
 
-	if($b['private'] || $b['parent'])
+	if ($b['private'] || $b['parent']) {
 		return;
+	}
 
-    $ltree_post   = intval(get_pconfig(local_user(),'libertree','post'));
+	$ltree_post   = intval(DI::pConfig()->get(local_user(),'libertree','post'));
 
-	$ltree_enable = (($ltree_post && x($_REQUEST,'libertree_enable')) ? intval($_REQUEST['libertree_enable']) : 0);
+	$ltree_enable = (($ltree_post && !empty($_REQUEST['libertree_enable'])) ? intval($_REQUEST['libertree_enable']) : 0);
 
-	if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'libertree','post_by_default')))
+	if ($b['api_source'] && intval(DI::pConfig()->get(local_user(),'libertree','post_by_default'))) {
 		$ltree_enable = 1;
+	}
+
+	if (!$ltree_enable) {
+		return;
+	}
 
-    if(! $ltree_enable)
-       return;
+	if (strlen($b['postopts'])) {
+		$b['postopts'] .= ',';
+	}
 
-    if(strlen($b['postopts']))
-       $b['postopts'] .= ',';
-     $b['postopts'] .= 'libertree';
+	$b['postopts'] .= 'libertree';
 }
 
 
@@ -138,58 +170,69 @@ function libertree_post_local(&$a,&$b) {
 
 function libertree_send(&$a,&$b) {
 
-	logger('libertree_send: invoked');
-	return;
+	Logger::log('libertree_send: invoked');
 
-    if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
-        return;
+	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
+		return;
+	}
 
-    if(! strstr($b['postopts'],'libertree'))
-        return;
+	if (! strstr($b['postopts'],'libertree')) {
+		return;
+	}
 
-    if($b['parent'] != $b['id'])
-        return;
+	if ($b['parent'] != $b['id']) {
+		return;
+	}
 
+	// Dont't post if the post doesn't belong to us.
+	// This is a check for forum postings
+	$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
+	if ($b['contact-id'] != $self['id']) {
+		return;
+	}
 
-	$ltree_api_token = get_pconfig($b['uid'],'libertree','libertree_api_token');
-	$ltree_url = get_pconfig($b['uid'],'libertree','libertree_url');
+	$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();
 
-	if($ltree_url && $ltree_api_token && $ltree_blog) {
+	if ($b['app'] != "")
+		$ltree_source .= " (".$b['app'].")";
 
-		require_once('include/bb2diaspora.php');
-		$tag_arr = array();
-		$tags = '';
-		$x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
+	if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) {
+		$title = $b['title'];
+		$body = $b['body'];
+		// Insert a newline before and after a quote
+		$body = str_ireplace("[quote", "\n\n[quote", $body);
+		$body = str_ireplace("[/quote]", "[/quote]\n\n", $body);
 
-		if($x) {
-			foreach($matches as $mtch) {
-				$tag_arr[] = $mtch[2];
-			}
-		}
-		if(count($tag_arr))
-			$tags = implode(',',$tag_arr);		
+		// Removal of tags and mentions
+		// #-tags
+		$body = preg_replace('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $body);
+ 		// @-mentions
+		$body = preg_replace('/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $body);
 
+		// remove multiple newlines
+		do {
+			$oldbody = $body;
+                        $body = str_replace("\n\n\n", "\n\n", $body);
+                } while ($oldbody != $body);
 
-		$params = array(
-			'text' => bb2diaspora($b['body'])
+		// convert to markdown
+		$body = BBCode::toMarkdown($body, false);
+
+		// Adding the title
+		if(strlen($title))
+			$body = "## ".html_entity_decode($title)."\n\n".$body;
+
+
+		$params = [
+			'text' => $body,
+			'source' => $ltree_source
 		//	'token' => $ltree_api_token
-		);
-	
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $ltree_blog);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
-		curl_setopt($ch, CURLOPT_HEADER, false);
-		curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
-		curl_setopt($ch, CURLOPT_POST, true);
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
-
-		$data = curl_exec($ch);
-		$result = curl_multi_getcontent($ch);
-		curl_close($ch);
-
-		logger('libertree_send: ' . $result);
+		];
+
+		$result = DI::httpRequest()->post($ltree_blog, $params)->getBody();
+		Logger::log('libertree: ' . $result);
 	}
 }
-