X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=libertree%2Flibertree.php;h=4d159bf08a68cec93fa78b57d171fd70e6e37438;hb=6a0cdf3f23346a54fc89a5342a249a08abab6517;hp=95def07a0b01dfd5dd0119bc74cf0e5f671f7ebf;hpb=f8d9efe8c7e57976acae3b1416220a7947ff94fc;p=friendica-addons.git

diff --git a/libertree/libertree.php b/libertree/libertree.php
index 95def07a..4d159bf0 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Name: Libertree Post Connector
  * Description: Post to libertree accounts
@@ -7,22 +6,26 @@
  * Author: Tony Baldwin <https://free-haven.org/u/tony>
  */
 
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\Addon;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Util\Network;
 
 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');
+    Addon::registerHook('post_local',           'addon/libertree/libertree.php', 'libertree_post_local');
+    Addon::registerHook('notifier_normal',      'addon/libertree/libertree.php', 'libertree_send');
+    Addon::registerHook('jot_networks',         'addon/libertree/libertree.php', 'libertree_jot_nets');
+    Addon::registerHook('connector_settings',      'addon/libertree/libertree.php', 'libertree_settings');
+    Addon::registerHook('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');
+    Addon::unregisterHook('post_local',       'addon/libertree/libertree.php', 'libertree_post_local');
+    Addon::unregisterHook('notifier_normal',  'addon/libertree/libertree.php', 'libertree_send');
+    Addon::unregisterHook('jot_networks',     'addon/libertree/libertree.php', 'libertree_jot_nets');
+    Addon::unregisterHook('connector_settings',      'addon/libertree/libertree.php', 'libertree_settings');
+    Addon::unregisterHook('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post');
 }
 
 
@@ -35,7 +38,7 @@ function libertree_jot_nets(&$a,&$b) {
         $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>';
+            . L10n::t('Post to libertree') . '</div>';
     }
 }
 
@@ -66,36 +69,36 @@ 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>';
 
 }
 
@@ -155,18 +158,21 @@ function libertree_send(&$a,&$b) {
 
 	logger('libertree_send: invoked');
 
-	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
 		return;
+	}
 
-	if (! strstr($b['postopts'],'libertree'))
+	if (! strstr($b['postopts'],'libertree')) {
 		return;
+	}
 
-	if ($b['parent'] != $b['id'])
+	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::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+	$self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 	if ($b['contact-id'] != $self['id']) {
 		return;
 	}
@@ -180,9 +186,7 @@ function libertree_send(&$a,&$b) {
 		$ltree_source .= " (".$b['app'].")";
 
 	if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) {
-
-		require_once('include/bb2diaspora.php');
-		$tag_arr = array();
+		$tag_arr = [];
 		$tags = '';
 		$x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
 
@@ -213,22 +217,20 @@ 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))
 			$body = "## ".html_entity_decode($title)."\n\n".$body;
 
 
-		$params = array(
+		$params = [
 			'text' => $body,
 			'source' => $ltree_source
 		//	'token' => $ltree_api_token
-		);
+		];
 
-		$result = post_url($ltree_blog,$params);
+		$result = Network::post($ltree_blog, $params);
 		logger('libertree: ' . $result);
-
 	}
 }
-