X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=buffer%2Fbuffer.php;h=be8e749569870220bdfdee5e473342a61b2a43fd;hb=70f541c58b3ad1cf429e1f7997a798931c902dd7;hp=0fef48486927c2475440deecfb6fabc43ae2c483;hpb=94636961599e795941c9575e672297114e7befe7;p=friendica-addons.git diff --git a/buffer/buffer.php b/buffer/buffer.php index 0fef4848..be8e7495 100644 --- a/buffer/buffer.php +++ b/buffer/buffer.php @@ -1,186 +1,199 @@ + * Status: Unsupported */ require 'addon/buffer/bufferapp.php'; use Friendica\App; use Friendica\Content\Text\Plaintext; -use Friendica\Core\Addon; -use Friendica\Core\Config; -use Friendica\Core\L10n; -use Friendica\Core\PConfig; -use Friendica\Database\dba; -use Friendica\Model\ItemContent; - -function buffer_install() { - Addon::registerHook('post_local', 'addon/buffer/buffer.php', 'buffer_post_local'); - Addon::registerHook('notifier_normal', 'addon/buffer/buffer.php', 'buffer_send'); - Addon::registerHook('jot_networks', 'addon/buffer/buffer.php', 'buffer_jot_nets'); - Addon::registerHook('connector_settings', 'addon/buffer/buffer.php', 'buffer_settings'); - Addon::registerHook('connector_settings_post', 'addon/buffer/buffer.php', 'buffer_settings_post'); +use Friendica\Core\Hook; +use Friendica\Core\Logger; +use Friendica\Core\Protocol; +use Friendica\Core\Renderer; +use Friendica\Database\DBA; +use Friendica\DI; +use Friendica\Util\Proxy as ProxyUtils; +use Friendica\Util\Strings; + +function buffer_install() +{ + Hook::register('hook_fork', 'addon/buffer/buffer.php', 'buffer_hook_fork'); + Hook::register('post_local', 'addon/buffer/buffer.php', 'buffer_post_local'); + Hook::register('notifier_normal', 'addon/buffer/buffer.php', 'buffer_send'); + Hook::register('jot_networks', 'addon/buffer/buffer.php', 'buffer_jot_nets'); + Hook::register('connector_settings', 'addon/buffer/buffer.php', 'buffer_settings'); + Hook::register('connector_settings_post', 'addon/buffer/buffer.php', 'buffer_settings_post'); } -function buffer_uninstall() { - Addon::unregisterHook('post_local', 'addon/buffer/buffer.php', 'buffer_post_local'); - Addon::unregisterHook('notifier_normal', 'addon/buffer/buffer.php', 'buffer_send'); - Addon::unregisterHook('jot_networks', 'addon/buffer/buffer.php', 'buffer_jot_nets'); - Addon::unregisterHook('connector_settings', 'addon/buffer/buffer.php', 'buffer_settings'); - Addon::unregisterHook('connector_settings_post', 'addon/buffer/buffer.php', 'buffer_settings_post'); +function buffer_module() +{ } -function buffer_module() {} - -function buffer_content(&$a) { - - if(! local_user()) { - notice(L10n::t('Permission denied.') . EOL); +function buffer_content(App $a) +{ + if (! local_user()) { + notice(DI::l10n()->t('Permission denied.') . EOL); return ''; } - require_once("mod/settings.php"); + require_once "mod/settings.php"; settings_init($a); - if (isset($a->argv[1])) + if (isset($a->argv[1])) { switch ($a->argv[1]) { case "connect": $o = buffer_connect($a); break; + default: $o = print_r($a->argv, true); break; } - else + } else { $o = buffer_connect($a); + } return $o; } -function buffer_addon_admin(&$a, &$o) +function buffer_addon_admin(App $a, &$o) { - $t = get_markup_template("admin.tpl", "addon/buffer/"); + $t = Renderer::getMarkupTemplate("admin.tpl", "addon/buffer/"); - $o = replace_macros($t, [ - '$submit' => L10n::t('Save Settings'), + $o = Renderer::replaceMacros($t, [ + '$submit' => DI::l10n()->t('Save Settings'), // name, label, value, help, [extra values] - '$client_id' => ['client_id', L10n::t('Client ID'), Config::get('buffer', 'client_id'), ''], - '$client_secret' => ['client_secret', L10n::t('Client Secret'), Config::get('buffer', 'client_secret'), ''], + '$client_id' => ['client_id', DI::l10n()->t('Client ID'), DI::config()->get('buffer', 'client_id'), ''], + '$client_secret' => ['client_secret', DI::l10n()->t('Client Secret'), DI::config()->get('buffer', 'client_secret'), ''], ]); } -function buffer_addon_admin_post(&$a) + +function buffer_addon_admin_post(App $a) { - $client_id = ((x($_POST, 'client_id')) ? notags(trim($_POST['client_id'])) : ''); - $client_secret = ((x($_POST, 'client_secret')) ? notags(trim($_POST['client_secret'])): ''); - Config::set('buffer', 'client_id', $client_id); - Config::set('buffer', 'client_secret', $client_secret); - info(L10n::t('Settings updated.'). EOL); -} + $client_id = (!empty($_POST['client_id']) ? Strings::escapeTags(trim($_POST['client_id'])) : ''); + $client_secret = (!empty($_POST['client_secret']) ? Strings::escapeTags(trim($_POST['client_secret'])) : ''); -function buffer_connect(&$a) { + DI::config()->set('buffer', 'client_id' , $client_id); + DI::config()->set('buffer', 'client_secret', $client_secret); +} +function buffer_connect(App $a) +{ if (isset($_REQUEST["error"])) { - $o = L10n::t('Error when registering buffer connection:')." ".$_REQUEST["error"]; + $o = DI::l10n()->t('Error when registering buffer connection:')." ".$_REQUEST["error"]; return $o; } + // Start a session. This is necessary to hold on to a few keys the callback script will also need session_start(); // Define the needed keys - $client_id = Config::get('buffer','client_id'); - $client_secret = Config::get('buffer','client_secret'); + $client_id = DI::config()->get('buffer','client_id'); + $client_secret = DI::config()->get('buffer','client_secret'); // The callback URL is the script that gets called after the user authenticates with buffer - $callback_url = $a->get_baseurl()."/buffer/connect"; + $callback_url = DI::baseUrl()->get()."/buffer/connect"; $buffer = new BufferApp($client_id, $client_secret, $callback_url); if (!$buffer->ok) { - $o .= 'Connect to Buffer!'; + $o = 'Connect to Buffer!'; } else { - logger("buffer_connect: authenticated"); - $o .= L10n::t("You are now authenticated to buffer. "); - $o .= '
'.L10n::t("return to the connector page").''; - PConfig::set(local_user(), 'buffer','access_token', $buffer->access_token); + Logger::log("buffer_connect: authenticated"); + $o = DI::l10n()->t("You are now authenticated to buffer. "); + $o .= '
' . DI::l10n()->t("return to the connector page") . ''; + DI::pConfig()->set(local_user(), 'buffer','access_token', $buffer->access_token); } - return($o); + return $o; } -function buffer_jot_nets(&$a,&$b) { - if(! local_user()) +function buffer_jot_nets(App $a, array &$jotnets_fields) +{ + if (!local_user()) { return; + } - $buffer_post = PConfig::get(local_user(),'buffer','post'); - if(intval($buffer_post) == 1) { - $buffer_defpost = PConfig::get(local_user(),'buffer','post_by_default'); - $selected = ((intval($buffer_defpost) == 1) ? ' checked="checked" ' : ''); - $b .= '
' - . L10n::t('Post to Buffer') . '
'; + if (DI::pConfig()->get(local_user(), 'buffer', 'post')) { + $jotnets_fields[] = [ + 'type' => 'checkbox', + 'field' => [ + 'buffer_enable', + DI::l10n()->t('Post to Buffer'), + DI::pConfig()->get(local_user(), 'buffer', 'post_by_default') + ] + ]; } } -function buffer_settings(&$a,&$s) { - - if(! local_user()) +function buffer_settings(App $a, &$s) +{ + if (! local_user()) { return; + } /* 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(),'buffer','post'); + $enabled = DI::pConfig()->get(local_user(),'buffer','post'); $checked = (($enabled) ? ' checked="checked" ' : ''); $css = (($enabled) ? '' : '-disabled'); - $def_enabled = PConfig::get(local_user(),'buffer','post_by_default'); + $def_enabled = DI::pConfig()->get(local_user(),'buffer','post_by_default'); $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); /* Add some HTML to the existing form */ $s .= ''; - $s .= '

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

'; + $s .= '

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

'; $s .= '
'; $s .= '