* Author: Cat Gray <https://free-haven.org/profile/catness>
*/
+use Friendica\App;
use Friendica\Content\Text\BBCode;
-use Friendica\Core\Addon;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
+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;
-
-function ljpost_install() {
- Addon::registerHook('post_local', 'addon/ljpost/ljpost.php', 'ljpost_post_local');
- Addon::registerHook('notifier_normal', 'addon/ljpost/ljpost.php', 'ljpost_send');
- Addon::registerHook('jot_networks', 'addon/ljpost/ljpost.php', 'ljpost_jot_nets');
- Addon::registerHook('connector_settings', 'addon/ljpost/ljpost.php', 'ljpost_settings');
- Addon::registerHook('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post');
-
-}
-function ljpost_uninstall() {
- Addon::unregisterHook('post_local', 'addon/ljpost/ljpost.php', 'ljpost_post_local');
- Addon::unregisterHook('notifier_normal', 'addon/ljpost/ljpost.php', 'ljpost_send');
- Addon::unregisterHook('jot_networks', 'addon/ljpost/ljpost.php', 'ljpost_jot_nets');
- Addon::unregisterHook('connector_settings', 'addon/ljpost/ljpost.php', 'ljpost_settings');
- Addon::unregisterHook('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post');
+use Friendica\Util\XML;
+function ljpost_install()
+{
+ Hook::register('post_local', 'addon/ljpost/ljpost.php', 'ljpost_post_local');
+ Hook::register('notifier_normal', 'addon/ljpost/ljpost.php', 'ljpost_send');
+ Hook::register('jot_networks', 'addon/ljpost/ljpost.php', 'ljpost_jot_nets');
+ Hook::register('connector_settings', 'addon/ljpost/ljpost.php', 'ljpost_settings');
+ Hook::register('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post');
}
+function ljpost_jot_nets(array &$jotnets_fields)
+{
+ if (!DI::userSession()->getLocalUserId()) {
+ return;
+ }
-function ljpost_jot_nets(&$a,&$b) {
- if(! local_user())
- return;
-
- $lj_post = PConfig::get(local_user(),'ljpost','post');
- if(intval($lj_post) == 1) {
- $lj_defpost = PConfig::get(local_user(),'ljpost','post_by_default');
- $selected = ((intval($lj_defpost) == 1) ? ' checked="checked" ' : '');
- $b .= '<div class="profile-jot-net"><input type="checkbox" name="ljpost_enable" ' . $selected . ' value="1" /> '
- . L10n::t('Post to LiveJournal') . '</div>';
- }
+ if (DI::pConfig()->get(DI::userSession()->getLocalUserId(),'ljpost','post')) {
+ $jotnets_fields[] = [
+ 'type' => 'checkbox',
+ 'field' => [
+ 'ljpost_enable',
+ DI::l10n()->t('Post to LiveJournal'),
+ DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post_by_default'),
+ ],
+ ];
+ }
}
+function ljpost_settings(array &$data)
+{
+ if (!DI::userSession()->getLocalUserId()) {
+ return;
+ }
-function ljpost_settings(&$a,&$s) {
-
- if(! local_user())
- return;
-
- /* 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->get_baseurl() . '/addon/ljpost/ljpost.css' . '" media="all" />' . "\r\n";
-
- /* Get the current state of our config variables */
-
- $enabled = PConfig::get(local_user(),'ljpost','post');
-
- $checked = (($enabled) ? ' checked="checked" ' : '');
-
- $def_enabled = PConfig::get(local_user(),'ljpost','post_by_default');
-
- $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
-
- $lj_username = PConfig::get(local_user(), 'ljpost', 'lj_username');
- $lj_password = PConfig::get(local_user(), 'ljpost', 'lj_password');
-
-
- /* Add some HTML to the existing form */
-
- $s .= '<div class="settings-block">';
- $s .= '<h3>' . L10n::t('LiveJournal Post Settings') . '</h3>';
- $s .= '<div id="ljpost-enable-wrapper">';
- $s .= '<label id="ljpost-enable-label" for="ljpost-checkbox">' . L10n::t('Enable LiveJournal Post Addon') . '</label>';
- $s .= '<input id="ljpost-checkbox" type="checkbox" name="ljpost" value="1" ' . $checked . '/>';
- $s .= '</div><div class="clear"></div>';
-
- $s .= '<div id="ljpost-username-wrapper">';
- $s .= '<label id="ljpost-username-label" for="ljpost-username">' . L10n::t('LiveJournal username') . '</label>';
- $s .= '<input id="ljpost-username" type="text" name="lj_username" value="' . $lj_username . '" />';
- $s .= '</div><div class="clear"></div>';
-
- $s .= '<div id="ljpost-password-wrapper">';
- $s .= '<label id="ljpost-password-label" for="ljpost-password">' . L10n::t('LiveJournal password') . '</label>';
- $s .= '<input id="ljpost-password" type="password" name="lj_password" value="' . $lj_password . '" />';
- $s .= '</div><div class="clear"></div>';
-
- $s .= '<div id="ljpost-bydefault-wrapper">';
- $s .= '<label id="ljpost-bydefault-label" for="ljpost-bydefault">' . L10n::t('Post to LiveJournal by default') . '</label>';
- $s .= '<input id="ljpost-bydefault" type="checkbox" name="lj_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="ljpost-submit" name="ljpost-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
-
+ $enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post', false);
+ $ij_username = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'ij_username');
+ $def_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post_by_default');
+
+ $t= Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/ljpost/');
+ $html = Renderer::replaceMacros($t, [
+ '$enabled' => ['ljpost', DI::l10n()->t('Enable LiveJournal Post Addon'), $enabled],
+ '$username' => ['ij_username', DI::l10n()->t('LiveJournal username'), $ij_username],
+ '$password' => ['ij_password', DI::l10n()->t('LiveJournal password')],
+ '$bydefault' => ['ij_bydefault', DI::l10n()->t('Post to LiveJournal by default'), $def_enabled],
+ ]);
+
+ $data = [
+ 'connector' => 'ljpost',
+ 'title' => DI::l10n()->t('LiveJournal Export'),
+ 'image' => 'addon/ljpost/livejournal.png',
+ 'enabled' => $enabled,
+ 'html' => $html,
+ ];
}
-
-function ljpost_settings_post(&$a,&$b) {
-
- if(x($_POST,'ljpost-submit')) {
-
- PConfig::set(local_user(),'ljpost','post',intval($_POST['ljpost']));
- PConfig::set(local_user(),'ljpost','post_by_default',intval($_POST['lj_bydefault']));
- PConfig::set(local_user(),'ljpost','lj_username',trim($_POST['lj_username']));
- PConfig::set(local_user(),'ljpost','lj_password',trim($_POST['lj_password']));
-
+function ljpost_settings_post(array &$b)
+{
+ if (!empty($_POST['ljpost-submit'])) {
+ DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'ljpost', 'post', intval($_POST['ljpost']));
+ DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'ljpost', 'post_by_default', intval($_POST['lj_bydefault']));
+ DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'ljpost', 'lj_username', trim($_POST['lj_username']));
+ DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'ljpost', 'lj_password', trim($_POST['lj_password']));
}
-
}
-function ljpost_post_local(&$a,&$b) {
-
+function ljpost_post_local(array &$b)
+{
// This can probably be changed to allow editing by pointing to a different API endpoint
-
- if($b['edit'])
+ if ($b['edit']) {
return;
+ }
- if((! local_user()) || (local_user() != $b['uid']))
+ if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
return;
+ }
- if($b['private'] || $b['parent'])
+ if ($b['private'] || $b['parent']) {
return;
+ }
- $lj_post = intval(PConfig::get(local_user(),'ljpost','post'));
-
- $lj_enable = (($lj_post && x($_REQUEST,'ljpost_enable')) ? intval($_REQUEST['ljpost_enable']) : 0);
+ $lj_post = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'ljpost','post'));
+ $lj_enable = (($lj_post && !empty($_REQUEST['ljpost_enable'])) ? intval($_REQUEST['ljpost_enable']) : 0);
- if($_REQUEST['api_source'] && intval(PConfig::get(local_user(),'ljpost','post_by_default')))
+ if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post_by_default'))) {
$lj_enable = 1;
+ }
- if(! $lj_enable)
- return;
+ if (!$lj_enable) {
+ return;
+ }
- if(strlen($b['postopts']))
- $b['postopts'] .= ',';
- $b['postopts'] .= 'ljpost';
+ if (strlen($b['postopts'])) {
+ $b['postopts'] .= ',';
+ }
+ $b['postopts'] .= 'ljpost';
}
+function ljpost_send(array &$b)
+{
+ if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
+ return;
+ }
+ if (!strstr($b['postopts'],'ljpost')) {
+ return;
+ }
+ if ($b['parent'] != $b['id']) {
+ return;
+ }
-function ljpost_send(&$a,&$b) {
-
- if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
- return;
-
- if(! strstr($b['postopts'],'ljpost'))
- return;
-
- if($b['parent'] != $b['id'])
- return;
+ $b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
// LiveJournal 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($x && strlen($x[0]['timezone']))
- $tz = $x[0]['timezone'];
+ $user = User::getById($b['uid']);
+ $tz = $user['timezone'] ?: 'UTC';
- $lj_username = xmlify(PConfig::get($b['uid'],'ljpost','lj_username'));
- $lj_password = xmlify(PConfig::get($b['uid'],'ljpost','lj_password'));
- $lj_journal = xmlify(PConfig::get($b['uid'],'ljpost','lj_journal'));
+ $lj_username = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_username'));
+ $lj_password = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_password'));
+ $lj_journal = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_journal'));
// if(! $lj_journal)
// $lj_journal = $lj_username;
- $lj_blog = xmlify(PConfig::get($b['uid'],'ljpost','lj_blog'));
- if(! strlen($lj_blog))
- $lj_blog = xmlify('http://www.livejournal.com/interface/xmlrpc');
+ $lj_blog = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_blog'));
+ if (!strlen($lj_blog)) {
+ $lj_blog = XML::escape('http://www.livejournal.com/interface/xmlrpc');
+ }
- if($lj_username && $lj_password && $lj_blog) {
- $title = xmlify($b['title']);
- $post = BBCode::convert($b['body']);
- $post = xmlify($post);
- $tags = ljpost_get_tags($b['tag']);
+ if ($lj_username && $lj_password && $lj_blog) {
+ $title = XML::escape($b['title']);
+ $post = BBCode::convertForUriId($b['uri-id'], $b['body'], BBCode::CONNECTORS);
+ $post = XML::escape($post);
+ $tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
$date = DateTimeFormat::convert($b['created'], $tz);
$year = intval(substr($date,0,4));
$xml = <<< EOT
<?xml version="1.0" encoding="utf-8"?>
<methodCall>
- <methodName>LJ.XMLRPC.postevent</methodName>
- <params>
- <param><value>
- <struct>
- <member><name>username</name><value><string>$lj_username</string></value></member>
- <member><name>password</name><value><string>$lj_password</string></value></member>
- <member><name>event</name><value><string>$post</string></value></member>
- <member><name>subject</name><value><string>$title</string></value></member>
- <member><name>lineendings</name><value><string>unix</string></value></member>
- <member><name>year</name><value><int>$year</int></value></member>
- <member><name>mon</name><value><int>$mon</int></value></member>
- <member><name>day</name><value><int>$day</int></value></member>
- <member><name>hour</name><value><int>$hour</int></value></member>
- <member><name>min</name><value><int>$min</int></value></member>
- <member><name>usejournal</name><value><string>$lj_username</string></value></member>
- <member>
- <name>props</name>
+<methodName>LJ.XMLRPC.postevent</methodName>
+ <params>
+ <param>
<value>
<struct>
+ <member><name>username</name><value><string>$lj_username</string></value></member>
+ <member><name>password</name><value><string>$lj_password</string></value></member>
+ <member><name>event</name><value><string>$post</string></value></member>
+ <member><name>subject</name><value><string>$title</string></value></member>
+ <member><name>lineendings</name><value><string>unix</string></value></member>
+ <member><name>year</name><value><int>$year</int></value></member>
+ <member><name>mon</name><value><int>$mon</int></value></member>
+ <member><name>day</name><value><int>$day</int></value></member>
+ <member><name>hour</name><value><int>$hour</int></value></member>
+ <member><name>min</name><value><int>$min</int></value></member>
+ <member><name>usejournal</name><value><string>$lj_username</string></value></member>
<member>
- <name>useragent</name>
- <value><string>Friendica</string></value>
- </member>
- <member>
- <name>taglist</name>
- <value><string>$tags</string></value>
+ <name>props</name>
+ <value>
+ <struct>
+ <member>
+ <name>useragent</name>
+ <value><string>Friendica</string></value>
+ </member>
+ <member>
+ <name>taglist</name>
+ <value><string>$tags</string></value>
+ </member>
+ </struct>
+ </value>
</member>
</struct>
</value>
- </member>
- </struct>
- </value></param>
- </params>
+ </param>
+ </params>
</methodCall>
-
EOT;
- logger('ljpost: data: ' . $xml, LOGGER_DATA);
+ Logger::debug('ljpost: data: ' . $xml);
if ($lj_blog !== 'test') {
- $x = Network::post($lj_blog, $xml, ["Content-Type: text/xml"]);
+ $x = DI::httpClient()->post($lj_blog, $xml, ['Content-Type' => 'text/xml'])->getBody();
}
- logger('posted to livejournal: ' . ($x) ? $x : '', LOGGER_DEBUG);
- }
-}
-function ljpost_get_tags($post)
-{
- preg_match_all("/\]([^\[#]+)\[/",$post,$matches);
- $tags = implode(', ',$matches[1]);
- return $tags;
+ Logger::info('posted to livejournal: ' . ($x) ? $x : '');
+ }
}