X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=libertree%2Flibertree.php;h=1062ab5a126c61d22c3df96d0b240e107baa5137;hb=1c7b3124429d83082223253b0f3b6d95d1f5dfcb;hp=a864b9ebd78a8f763bc6522910bd8b67ea1a5758;hpb=08206fdcc0750ec9dd12a68addb341cd05f8bcfb;p=friendica-addons.git diff --git a/libertree/libertree.php b/libertree/libertree.php index a864b9eb..1062ab5a 100644 --- a/libertree/libertree.php +++ b/libertree/libertree.php @@ -9,11 +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\Util\Network; +use Friendica\DI; function libertree_install() { @@ -25,27 +23,22 @@ function libertree_install() Hook::register('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post'); } -function libertree_uninstall() +function libertree_jot_nets(App &$a, 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(&$a,&$b) { - if(! local_user()) + 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 .= '
' - . L10n::t('Post to libertree') . '
'; } + + 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') + ] + ]; + } } @@ -56,55 +49,55 @@ function libertree_settings(&$a,&$s) { /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + DI::page()['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ - $enabled = PConfig::get(local_user(),'libertree','post'); + $enabled = DI::pConfig()->get(local_user(),'libertree','post'); $checked = (($enabled) ? ' checked="checked" ' : ''); $css = (($enabled) ? '' : '-disabled'); - $def_enabled = PConfig::get(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 = PConfig::get(local_user(), 'libertree', 'libertree_api_token'); - $ltree_url = PConfig::get(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 .= ''; - $s .= '

'. L10n::t('libertree Export').'

'; + $s .= '

'. DI::l10n()->t('libertree Export').'

'; $s .= '
'; $s .= ''; + $s .= '
'; } @@ -113,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'])); } @@ -153,11 +146,11 @@ function libertree_post_local(&$a,&$b) { return; } - $ltree_post = intval(PConfig::get(local_user(),'libertree','post')); + $ltree_post = intval(DI::pConfig()->get(local_user(),'libertree','post')); $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'))) { + if ($b['api_source'] && intval(DI::pConfig()->get(local_user(),'libertree','post_by_default'))) { $ltree_enable = 1; } @@ -198,27 +191,15 @@ function libertree_send(&$a,&$b) { return; } - $ltree_api_token = PConfig::get($b['uid'],'libertree','libertree_api_token'); - $ltree_url = PConfig::get($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 = $a->getHostName(); + $ltree_source = DI::baseUrl()->getHostname(); 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 @@ -251,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); } }