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 .= '';
- $s .= '![](images/libertree.png)
'. L10n::t('libertree Export').'
';
+ $s .= '![](images/libertree.png)
'. DI::l10n()->t('libertree Export').'
';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '![](images/libertree.png)
'. L10n::t('libertree Export').'
';
+ $s .= '![](images/libertree.png)
'. DI::l10n()->t('libertree Export').'
';
$s .= '';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
/* provide a submit button */
- $s .= '
';
+ $s .= '';
}
@@ -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);
}
}