use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
use Friendica\DI;
+use Friendica\Model\Tag;
use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
use Friendica\Util\XML;
function ijpost_install()
Hook::register('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
}
-function ijpost_uninstall()
-{
- 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(\Friendica\App &$a, array &$jotnets_fields)
{
if (!local_user()) {
return;
}
- if (PConfig::get(local_user(), 'ijpost', 'post')) {
+ if (DI::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')
+ DI::l10n()->t('Post to Insanejournal'),
+ DI::pConfig()->get(local_user(), 'ijpost', 'post_by_default')
]
];
}
/* Get the current state of our config variables */
- $enabled = PConfig::get(local_user(), 'ijpost', 'post');
+ $enabled = DI::pConfig()->get(local_user(), 'ijpost', 'post');
$checked = (($enabled) ? ' checked="checked" ' : '');
- $def_enabled = PConfig::get(local_user(), 'ijpost', 'post_by_default');
+ $def_enabled = DI::pConfig()->get(local_user(), 'ijpost', 'post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
- $ij_username = PConfig::get(local_user(), 'ijpost', 'ij_username');
- $ij_password = PConfig::get(local_user(), 'ijpost', 'ij_password');
+ $ij_username = DI::pConfig()->get(local_user(), 'ijpost', 'ij_username');
+ $ij_password = DI::pConfig()->get(local_user(), 'ijpost', 'ij_password');
/* Add some HTML to the existing form */
$s .= '<span id="settings_ijpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_ijpost_expanded\'); openClose(\'settings_ijpost_inflated\');">';
- $s .= '<img class="connector" src="images/insanejournal.gif" /><h3 class="connector">'. L10n::t("InsaneJournal Export").'</h3>';
+ $s .= '<img class="connector" src="images/insanejournal.gif" /><h3 class="connector">'. DI::l10n()->t("InsaneJournal Export").'</h3>';
$s .= '</span>';
$s .= '<div id="settings_ijpost_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_ijpost_expanded\'); openClose(\'settings_ijpost_inflated\');">';
- $s .= '<img class="connector" src="images/insanejournal.gif" /><h3 class="connector">'. L10n::t("InsaneJournal Export").'</h3>';
+ $s .= '<img class="connector" src="images/insanejournal.gif" /><h3 class="connector">'. DI::l10n()->t("InsaneJournal Export").'</h3>';
$s .= '</span>';
$s .= '<div id="ijpost-enable-wrapper">';
- $s .= '<label id="ijpost-enable-label" for="ijpost-checkbox">' . L10n::t('Enable InsaneJournal Post Addon') . '</label>';
+ $s .= '<label id="ijpost-enable-label" for="ijpost-checkbox">' . DI::l10n()->t('Enable InsaneJournal Post Addon') . '</label>';
$s .= '<input id="ijpost-checkbox" type="checkbox" name="ijpost" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="ijpost-username-wrapper">';
- $s .= '<label id="ijpost-username-label" for="ijpost-username">' . L10n::t('InsaneJournal username') . '</label>';
+ $s .= '<label id="ijpost-username-label" for="ijpost-username">' . DI::l10n()->t('InsaneJournal username') . '</label>';
$s .= '<input id="ijpost-username" type="text" name="ij_username" value="' . $ij_username . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="ijpost-password-wrapper">';
- $s .= '<label id="ijpost-password-label" for="ijpost-password">' . L10n::t('InsaneJournal password') . '</label>';
+ $s .= '<label id="ijpost-password-label" for="ijpost-password">' . DI::l10n()->t('InsaneJournal password') . '</label>';
$s .= '<input id="ijpost-password" type="password" name="ij_password" value="' . $ij_password . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="ijpost-bydefault-wrapper">';
- $s .= '<label id="ijpost-bydefault-label" for="ijpost-bydefault">' . L10n::t('Post to InsaneJournal by default') . '</label>';
+ $s .= '<label id="ijpost-bydefault-label" for="ijpost-bydefault">' . DI::l10n()->t('Post to InsaneJournal by default') . '</label>';
$s .= '<input id="ijpost-bydefault" type="checkbox" name="ij_bydefault" value="1" ' . $def_checked . '/>';
$s .= '</div><div class="clear"></div>';
/* provide a submit button */
- $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ijpost-submit" name="ijpost-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+ $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ijpost-submit" name="ijpost-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
}
function ijpost_settings_post(&$a, &$b)
{
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']));
- PConfig::set(local_user(), 'ijpost', 'ij_password', trim($_POST['ij_password']));
+ DI::pConfig()->set(local_user(), 'ijpost', 'post', intval($_POST['ijpost']));
+ DI::pConfig()->set(local_user(), 'ijpost', 'post_by_default', intval($_POST['ij_bydefault']));
+ DI::pConfig()->set(local_user(), 'ijpost', 'ij_username', trim($_POST['ij_username']));
+ DI::pConfig()->set(local_user(), 'ijpost', 'ij_password', trim($_POST['ij_password']));
}
}
return;
}
- $ij_post = intval(PConfig::get(local_user(), 'ijpost', 'post'));
+ $ij_post = intval(DI::pConfig()->get(local_user(), 'ijpost', 'post'));
$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'))) {
+ if ($b['api_source'] && intval(DI::pConfig()->get(local_user(), 'ijpost', 'post_by_default'))) {
$ij_enable = 1;
}
$tz = $x[0]['timezone'];
}
- $ij_username = PConfig::get($b['uid'], 'ijpost', 'ij_username');
- $ij_password = PConfig::get($b['uid'], 'ijpost', 'ij_password');
+ $ij_username = DI::pConfig()->get($b['uid'], 'ijpost', 'ij_username');
+ $ij_password = DI::pConfig()->get($b['uid'], 'ijpost', 'ij_password');
$ij_blog = 'http://www.insanejournal.com/interface/xmlrpc';
if ($ij_username && $ij_password && $ij_blog) {
$title = $b['title'];
$post = BBCode::convert($b['body']);
$post = XML::escape($post);
- $tags = ijpost_get_tags($b['tag']);
+ $tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
$date = DateTimeFormat::convert($b['created'], $tz);
$year = intval(substr($date,0,4));
Logger::log('ijpost: data: ' . $xml, Logger::DATA);
if ($ij_blog !== 'test') {
- $x = Network::post($ij_blog, $xml, ["Content-Type: text/xml"])->getBody();
+ $x = DI::httpRequest()->post($ij_blog, $xml, ["Content-Type: text/xml"])->getBody();
}
Logger::log('posted to insanejournal: ' . $x ? $x : '', Logger::DEBUG);
}
}
-
-function ijpost_get_tags($post)
-{
- preg_match_all("/\]([^\[#]+)\[/", $post, $matches);
- $tags = implode(', ', $matches[1]);
- return $tags;
-}