X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=libertree%2Flibertree.php;h=1062ab5a126c61d22c3df96d0b240e107baa5137;hb=1c7b3124429d83082223253b0f3b6d95d1f5dfcb;hp=88163fd888009d81b1b61b0496f1aab57446b6c7;hpb=ea3a9052d83f8ea99cee8438022be0b022a24cc1;p=friendica-addons.git

diff --git a/libertree/libertree.php b/libertree/libertree.php
index 88163fd8..1062ab5a 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -9,12 +9,9 @@
 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\Database\DBA;
 use Friendica\DI;
-use Friendica\Util\Network;
 
 function libertree_install()
 {
@@ -26,16 +23,6 @@ function libertree_install()
 	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(App &$a, array &$jotnets_fields)
 {
     if(! local_user()) {
@@ -47,7 +34,7 @@ function libertree_jot_nets(App &$a, array &$jotnets_fields)
 			'type' => 'checkbox',
 			'field' => [
 				'libertree_enable',
-				L10n::t('Post to libertree'),
+				DI::l10n()->t('Post to libertree'),
 				DI::pConfig()->get(local_user(), 'libertree', 'post_by_default')
 			]
 		];
@@ -81,36 +68,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">'. L10n::t('libertree Export').'</h3>';
+    $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">'. L10n::t('libertree Export').'</h3>';
+    $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">' . L10n::t('Enable Libertree Post Addon') . '</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">' . L10n::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">' . L10n::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">' . L10n::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="' . L10n::t('Save Settings') . '" /></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>';
 
 }
 
@@ -119,10 +106,10 @@ function libertree_settings_post(&$a,&$b) {
 
 	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']));
-		PConfig::set(local_user(),'libertree','libertree_api_token',trim($_POST['libertree_api_token']));
-		PConfig::set(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']));
 
 	}
 
@@ -213,18 +200,6 @@ function libertree_send(&$a,&$b) {
 		$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
@@ -257,7 +232,7 @@ function libertree_send(&$a,&$b) {
 		//	'token' => $ltree_api_token
 		];
 
-		$result = Network::post($ltree_blog, $params)->getBody();
+		$result = DI::httpRequest()->post($ltree_blog, $params)->getBody();
 		Logger::log('libertree: ' . $result);
 	}
 }