*/
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\DI;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
+use Friendica\Util\XML;
function ijpost_install()
{
- Addon::registerHook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local');
- Addon::registerHook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send');
- Addon::registerHook('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
- Addon::registerHook('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings');
- Addon::registerHook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
+ Hook::register('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local');
+ Hook::register('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send');
+ Hook::register('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
+ Hook::register('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings');
+ Hook::register('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
}
function ijpost_uninstall()
{
- Addon::unregisterHook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local');
- Addon::unregisterHook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send');
- Addon::unregisterHook('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
- Addon::unregisterHook('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings');
- Addon::unregisterHook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
+ Hook::unregister('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local');
+ Hook::unregister('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send');
+ Hook::unregister('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
+ Hook::unregister('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings');
+ Hook::unregister('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
}
-function ijpost_jot_nets(&$a, &$b)
+function ijpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
{
if (!local_user()) {
return;
}
- $ij_post = PConfig::get(local_user(), 'ijpost', 'post');
- if (intval($ij_post) == 1) {
- $ij_defpost = PConfig::get(local_user(), 'ijpost', 'post_by_default');
- $selected = ((intval($ij_defpost) == 1) ? ' checked="checked" ' : '');
- $b .= '<div class="profile-jot-net"><input type="checkbox" name="ijpost_enable" ' . $selected . ' value="1" /> '
- . L10n::t('Post to Insanejournal') . '</div>';
+ if (PConfig::get(local_user(), 'ijpost', 'post')) {
+ $jotnets_fields[] = [
+ 'type' => 'checkbox',
+ 'field' => [
+ 'ijpost_enable',
+ L10n::t('Post to Insanejournal'),
+ PConfig::get(local_user(), 'ijpost', 'post_by_default')
+ ]
+ ];
}
}
/* Add our stylesheet to the page so we can make our settings look nice */
- $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/ijpost/ijpost.css' . '" media="all" />' . "\r\n";
+ $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/addon/ijpost/ijpost.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variables */
function ijpost_settings_post(&$a, &$b)
{
- if (x($_POST, 'ijpost-submit')) {
+ if (!empty($_POST['ijpost-submit'])) {
PConfig::set(local_user(), 'ijpost', 'post', intval($_POST['ijpost']));
PConfig::set(local_user(), 'ijpost', 'post_by_default', intval($_POST['ij_bydefault']));
PConfig::set(local_user(), 'ijpost', 'ij_username', trim($_POST['ij_username']));
$ij_post = intval(PConfig::get(local_user(), 'ijpost', 'post'));
- $ij_enable = (($ij_post && x($_REQUEST, 'ijpost_enable')) ? intval($_REQUEST['ijpost_enable']) : 0);
+ $ij_enable = (($ij_post && !empty($_REQUEST['ijpost_enable'])) ? intval($_REQUEST['ijpost_enable']) : 0);
if ($b['api_source'] && intval(PConfig::get(local_user(), 'ijpost', 'post_by_default'))) {
$ij_enable = 1;
if ($ij_username && $ij_password && $ij_blog) {
$title = $b['title'];
$post = BBCode::convert($b['body']);
- $post = xmlify($post);
+ $post = XML::escape($post);
$tags = ijpost_get_tags($b['tag']);
$date = DateTimeFormat::convert($b['created'], $tz);
EOT;
- Logger::log('ijpost: data: ' . $xml, LOGGER_DATA);
+ Logger::log('ijpost: data: ' . $xml, Logger::DATA);
if ($ij_blog !== 'test') {
$x = Network::post($ij_blog, $xml, ["Content-Type: text/xml"])->getBody();
}
- Logger::log('posted to insanejournal: ' . $x ? $x : '', LOGGER_DEBUG);
+ Logger::log('posted to insanejournal: ' . $x ? $x : '', Logger::DEBUG);
}
}