use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook;
use Friendica\Core\Logger;
-use Friendica\Database\DBA;
+use Friendica\Core\Renderer;
use Friendica\DI;
+use Friendica\Model\Post;
+use Friendica\Model\Tag;
+use Friendica\Model\User;
use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
use Friendica\Util\XML;
function dwpost_install()
Hook::register('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
}
-function dwpost_uninstall()
+function dwpost_jot_nets(array &$jotnets_fields)
{
- Hook::unregister('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local');
- Hook::unregister('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send');
- Hook::unregister('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
- Hook::unregister('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings');
- Hook::unregister('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
-}
-
-function dwpost_jot_nets(App $a, array &$jotnets_fields)
-{
- if (!local_user()) {
+ if (!DI::userSession()->getLocalUserId()) {
return;
}
- if (DI::pConfig()->get(local_user(), 'dwpost', 'post')) {
+ if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'dwpost', 'post')) {
$jotnets_fields[] = [
'type' => 'checkbox',
'field' => [
'dwpost_enable',
DI::l10n()->t('Post to Dreamwidth'),
- DI::pConfig()->get(local_user(), 'dwpost', 'post_by_default')
+ DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'dwpost', 'post_by_default')
]
];
}
}
-function dwpost_settings(App $a, &$s)
+function dwpost_settings(array &$data)
{
- if (!local_user()) {
+ if (!DI::userSession()->getLocalUserId()) {
return;
}
- /* Add our stylesheet to the page so we can make our settings look nice */
- DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/addon/dwpost/dwpost.css' . '" media="all" />' . "\r\n";
-
- /* Get the current state of our config variables */
- $enabled = DI::pConfig()->get(local_user(), 'dwpost', 'post');
-
- $checked = (($enabled) ? ' checked="checked" ' : '');
-
- $def_enabled = DI::pConfig()->get(local_user(), 'dwpost', 'post_by_default');
-
- $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
-
- $dw_username = DI::pConfig()->get(local_user(), 'dwpost', 'dw_username');
- $dw_password = DI::pConfig()->get(local_user(), 'dwpost', 'dw_password');
-
- /* Add some HTML to the existing form */
- $s .= '<span id="settings_dwpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_dwpost_expanded\'); openClose(\'settings_dwpost_inflated\');">';
- $s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. DI::l10n()->t("Dreamwidth Export").'</h3>';
- $s .= '</span>';
- $s .= '<div id="settings_dwpost_expanded" class="settings-block" style="display: none;">';
- $s .= '<span class="fakelink" onclick="openClose(\'settings_dwpost_expanded\'); openClose(\'settings_dwpost_inflated\');">';
- $s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. DI::l10n()->t("Dreamwidth Export").'</h3>';
- $s .= '</span>';
-
- $s .= '<div id="dwpost-enable-wrapper">';
- $s .= '<label id="dwpost-enable-label" for="dwpost-checkbox">' . DI::l10n()->t('Enable dreamwidth Post Addon') . '</label>';
- $s .= '<input id="dwpost-checkbox" type="checkbox" name="dwpost" value="1" ' . $checked . '/>';
- $s .= '</div><div class="clear"></div>';
-
- $s .= '<div id="dwpost-username-wrapper">';
- $s .= '<label id="dwpost-username-label" for="dwpost-username">' . DI::l10n()->t('dreamwidth username') . '</label>';
- $s .= '<input id="dwpost-username" type="text" name="dw_username" value="' . $dw_username . '" />';
- $s .= '</div><div class="clear"></div>';
-
- $s .= '<div id="dwpost-password-wrapper">';
- $s .= '<label id="dwpost-password-label" for="dwpost-password">' . DI::l10n()->t('dreamwidth password') . '</label>';
- $s .= '<input id="dwpost-password" type="password" name="dw_password" value="' . $dw_password . '" />';
- $s .= '</div><div class="clear"></div>';
-
- $s .= '<div id="dwpost-bydefault-wrapper">';
- $s .= '<label id="dwpost-bydefault-label" for="dwpost-bydefault">' . DI::l10n()->t('Post to dreamwidth by default') . '</label>';
- $s .= '<input id="dwpost-bydefault" type="checkbox" name="dw_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="dwpost-submit" name="dwpost-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
+ $enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'dwpost', 'post', false);
+ $dw_username = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'dwpost', 'dw_username');
+ $def_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'dwpost', 'post_by_default');
+
+ $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/dwpost/');
+ $html = Renderer::replaceMacros($t, [
+ '$enabled' => ['dwpost', DI::l10n()->t('Enable Dreamwidth Post Addon'), $enabled],
+ '$username' => ['dw_username', DI::l10n()->t('Dreamwidth username'), $dw_username],
+ '$password' => ['dw_password', DI::l10n()->t('Dreamwidth password')],
+ '$bydefault' => ['dw_bydefault', DI::l10n()->t('Post to Dreamwidth by default'), $def_enabled],
+ ]);
+
+ $data = [
+ 'connector' => 'dwpost',
+ 'title' => DI::l10n()->t('Dreamwidth Export'),
+ 'image' => 'images/dreamwidth.png',
+ 'enabled' => $enabled,
+ 'html' => $html,
+ ];
}
-function dwpost_settings_post(App $a, array &$b)
+function dwpost_settings_post(array &$b)
{
if (!empty($_POST['dwpost-submit'])) {
- DI::pConfig()->set(local_user(), 'dwpost', 'post', intval($_POST['dwpost']));
- DI::pConfig()->set(local_user(), 'dwpost', 'post_by_default', intval($_POST['dw_bydefault']));
- DI::pConfig()->set(local_user(), 'dwpost', 'dw_username', trim($_POST['dw_username']));
- DI::pConfig()->set(local_user(), 'dwpost', 'dw_password', trim($_POST['dw_password']));
+ DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'dwpost', 'post', intval($_POST['dwpost']));
+ DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'dwpost', 'post_by_default', intval($_POST['dw_bydefault']));
+ DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'dwpost', 'dw_username', trim($_POST['dw_username']));
+ DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'dwpost', 'dw_password', trim($_POST['dw_password']));
}
}
-function dwpost_post_local(App $a, array &$b)
+function dwpost_post_local(array &$b)
{
// This can probably be changed to allow editing by pointing to a different API endpoint
if ($b['edit']) {
return;
}
- if ((!local_user()) || (local_user() != $b['uid'])) {
+ if ((!DI::userSession()->getLocalUserId()) || (DI::userSession()->getLocalUserId() != $b['uid'])) {
return;
}
return;
}
- $dw_post = intval(DI::pConfig()->get(local_user(),'dwpost','post'));
+ $dw_post = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'dwpost','post'));
$dw_enable = (($dw_post && !empty($_REQUEST['dwpost_enable'])) ? intval($_REQUEST['dwpost_enable']) : 0);
- if ($b['api_source'] && intval(DI::pConfig()->get(local_user(),'dwpost','post_by_default'))) {
+ if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'dwpost','post_by_default'))) {
$dw_enable = 1;
}
$b['postopts'] .= 'dwpost';
}
-function dwpost_send(App $a, array &$b)
+function dwpost_send(array &$b)
{
if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
return;
}
- if (!strstr($b['postopts'],'dwpost')) {
+ if (strpos($b['postopts'] ?? '', 'dwpost') === false) {
return;
}
return;
}
+ $b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
+
/*
* dreamwidth post in the LJ user's timezone.
* Hopefully the person's Friendica account
* will be set to the same thing.
*/
- $tz = 'UTC';
-
- $x = q("SELECT `timezone` FROM `user` WHERE `uid` = %d LIMIT 1",
- intval($b['uid'])
- );
- if (DBA::isResult($x) && !empty($x[0]['timezone'])) {
- $tz = $x[0]['timezone'];
- }
+ $user = User::getById($b['uid']);
+ $tz = $user['timezone'] ?: 'UTC';
$dw_username = DI::pConfig()->get($b['uid'],'dwpost','dw_username');
$dw_password = DI::pConfig()->get($b['uid'],'dwpost','dw_password');
if ($dw_username && $dw_password && $dw_blog) {
$title = $b['title'];
- $post = BBCode::convert($b['body']);
+ $post = BBCode::convertForUriId($b['uri-id'], $b['body'], BBCode::CONNECTORS);
$post = XML::escape($post);
- $tags = dwpost_get_tags($b['tag']);
+ $tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
$date = DateTimeFormat::convert($b['created'], $tz);
$year = intval(substr($date,0,4));
EOT;
- Logger::log('dwpost: data: ' . $xml, Logger::DATA);
+ Logger::debug('dwpost: data: ' . $xml);
if ($dw_blog !== 'test') {
- $x = Network::post($dw_blog, $xml, ["Content-Type: text/xml"])->getBody();
+ $x = DI::httpClient()->post($dw_blog, $xml, ['Content-Type' => 'text/xml'])->getBody();
}
- Logger::log('posted to dreamwidth: ' . ($x) ? $x : '', Logger::DEBUG);
+ Logger::info('posted to dreamwidth: ' . ($x) ? $x : '');
}
}
-
-function dwpost_get_tags($post)
-{
- preg_match_all("/\]([^\[#]+)\[/", $post, $matches);
-
- $tags = implode(', ', $matches[1]);
-
- return $tags;
-}
projects / friendica-addons.git / blobdiff