add __FILE__

[friendica-addons.git] / libertree / libertree.php

diff --git a/libertree/libertree.php b/libertree/libertree.php
index 34fcd7989b296a50e0f3d06435e200b7fe80a96f..034833e8fc5e95733dc643aae9a74a5a89c064cc 100644 (file)
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -8,7 +8,7 @@
 
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
@@ -17,35 +17,40 @@ use Friendica\Util\Network;
 
 function libertree_install()
 {
-       Addon::registerHook('hook_fork',            'addon/libertree/libertree.php', 'libertree_hook_fork');
-       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');
+       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()
 {
-       Addon::unregisterHook('hook_fork',        'addon/libertree/libertree.php', 'libertree_hook_fork');
-       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');
+       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" /> '
-            . L10n::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')
+                       ]
+               ];
+       }
 }
 
 
@@ -111,7 +116,7 @@ function libertree_settings(&$a,&$s) {
 
 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']));
@@ -155,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;