X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=libertree%2Flibertree.php;h=034833e8fc5e95733dc643aae9a74a5a89c064cc;hb=6150bf97134cd56f8f29cabe0a7e8206b303304a;hp=0b9f839b72b408d11d6e3f3a354ab225e2986175;hpb=27b60e003f92dd9f3aebbeddb34ebb905488ca82;p=friendica-addons.git

diff --git a/libertree/libertree.php b/libertree/libertree.php
index 0b9f839b..034833e8 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Name: Libertree Post Connector
  * Description: Post to libertree accounts
@@ -7,36 +6,51 @@
  * Author: Tony Baldwin <https://free-haven.org/u/tony>
  */
 
+use Friendica\App;
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
-
-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\Database\DBA;
+use Friendica\Util\Network;
+
+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_uninstall()
+{
+	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(&$a,&$b) {
-    if(! local_user())
+function libertree_jot_nets(App &$a, array &$jotnets_fields)
+{
+    if(! local_user()) {
         return;
-
-    $ltree_post = PConfig::get(local_user(),'libertree','post');
-    if(intval($ltree_post) == 1) {
-        $ltree_defpost = PConfig::get(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 (PConfig::get(local_user(), 'libertree', 'post')) {
+		$jotnets_fields[] = [
+			'type' => 'checkbox',
+			'field' => [
+				'libertree_enable',
+				L10n::t('Post to libertree'),
+				PConfig::get(local_user(), 'libertree', 'post_by_default')
+			]
+		];
+	}
 }
 
 
@@ -47,7 +61,7 @@ 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";
+    $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/libertree/libertree.css' . '" media="all" />' . "\r\n";
 
     /* Get the current state of our config variables */
 
@@ -66,43 +80,43 @@ function libertree_settings(&$a,&$s) {
     /* 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">'. t('libertree Export').'</h3>';
+    $s .= '<img class="connector'.$css.'" src="images/libertree.png" /><h3 class="connector">'. 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">'. t('libertree Export').'</h3>';
+    $s .= '<img class="connector'.$css.'" src="images/libertree.png" /><h3 class="connector">'. 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">' . 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">' . 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">' . 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">' . 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('Save Settings') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="libertree-submit" name="libertree-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 
 }
 
 
 function libertree_settings_post(&$a,&$b) {
 
-	if(x($_POST,'libertree-submit')) {
+	if(!empty($_POST['libertree-submit'])) {
 
 		PConfig::set(local_user(),'libertree','post',intval($_POST['libertree']));
 		PConfig::set(local_user(),'libertree','post_by_default',intval($_POST['libertree_bydefault']));
@@ -113,6 +127,21 @@ function libertree_settings_post(&$a,&$b) {
 
 }
 
+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
@@ -131,7 +160,7 @@ function libertree_post_local(&$a,&$b) {
 
 	$ltree_post   = intval(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 ($b['api_source'] && intval(PConfig::get(local_user(),'libertree','post_by_default'))) {
 		$ltree_enable = 1;
@@ -153,7 +182,7 @@ function libertree_post_local(&$a,&$b) {
 
 function libertree_send(&$a,&$b) {
 
-	logger('libertree_send: invoked');
+	Logger::log('libertree_send: invoked');
 
 	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
 		return;
@@ -169,7 +198,7 @@ function libertree_send(&$a,&$b) {
 
 	// 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]);
+	$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 	if ($b['contact-id'] != $self['id']) {
 		return;
 	}
@@ -177,14 +206,12 @@ function libertree_send(&$a,&$b) {
 	$ltree_api_token = PConfig::get($b['uid'],'libertree','libertree_api_token');
 	$ltree_url = PConfig::get($b['uid'],'libertree','libertree_url');
 	$ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token";
-	$ltree_source = $a->get_hostname();
+	$ltree_source = $a->getHostName();
 
 	if ($b['app'] != "")
 		$ltree_source .= " (".$b['app'].")";
 
 	if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) {
-
-		require_once('include/bb2diaspora.php');
 		$tag_arr = [];
 		$tags = '';
 		$x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
@@ -216,7 +243,7 @@ function libertree_send(&$a,&$b) {
                 } while ($oldbody != $body);
 
 		// convert to markdown
-		$body = bb2diaspora($body, false, false);
+		$body = BBCode::toMarkdown($body, false);
 
 		// Adding the title
 		if(strlen($title))
@@ -229,9 +256,7 @@ function libertree_send(&$a,&$b) {
 		//	'token' => $ltree_api_token
 		];
 
-		$result = post_url($ltree_blog,$params);
-		logger('libertree: ' . $result);
-
+		$result = Network::post($ltree_blog, $params)->getBody();
+		Logger::log('libertree: ' . $result);
 	}
 }
-