X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=diaspora%2Fdiaspora.php;h=0d847b1447a6a53e3516d67ad191d1a297e515ba;hb=261efba5102ab1d3abdf070c4e4a0846e691f787;hp=b36b2774ebd22e343bf98805102c34208843d5b3;hpb=94ed7bf163e0b814afcc159ddaf00bf652e7387d;p=friendica-addons.git diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index b36b2774..0d847b14 100644 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -11,123 +11,49 @@ require_once 'addon/diaspora/Diaspora_Connection.php'; 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; use Friendica\Core\Protocol; use Friendica\Database\DBA; -use Friendica\Model\Queue; +use Friendica\Core\Worker; function diaspora_install() { - Addon::registerHook('hook_fork', 'addon/diaspora/diaspora.php', 'diaspora_hook_fork'); - Addon::registerHook('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local'); - Addon::registerHook('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send'); - Addon::registerHook('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets'); - Addon::registerHook('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings'); - Addon::registerHook('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post'); - Addon::registerHook('queue_predeliver', 'addon/diaspora/diaspora.php', 'diaspora_queue_hook'); + Hook::register('hook_fork', 'addon/diaspora/diaspora.php', 'diaspora_hook_fork'); + Hook::register('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local'); + Hook::register('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send'); + Hook::register('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets'); + Hook::register('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings'); + Hook::register('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post'); } function diaspora_uninstall() { - Addon::unregisterHook('hook_fork', 'addon/diaspora/diaspora.php', 'diaspora_hook_fork'); - Addon::unregisterHook('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local'); - Addon::unregisterHook('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send'); - Addon::unregisterHook('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets'); - Addon::unregisterHook('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings'); - Addon::unregisterHook('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post'); - Addon::unregisterHook('queue_predeliver', 'addon/diaspora/diaspora.php', 'diaspora_queue_hook'); + Hook::unregister('hook_fork', 'addon/diaspora/diaspora.php', 'diaspora_hook_fork'); + Hook::unregister('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local'); + Hook::unregister('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send'); + Hook::unregister('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets'); + Hook::unregister('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings'); + Hook::unregister('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post'); } -function diaspora_jot_nets(App $a, &$b) +function diaspora_jot_nets(App $a, array &$jotnets_fields) { if (!local_user()) { return; } - $diaspora_post = PConfig::get(local_user(), 'diaspora', 'post'); - - if (intval($diaspora_post) == 1) { - $diaspora_defpost = PConfig::get(local_user(), 'diaspora', 'post_by_default'); - - $selected = ((intval($diaspora_defpost) == 1) ? ' checked="checked" ' : ''); - - $b .= '