X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=dwpost%2Fdwpost.php;h=56e04f783c2be41e7925a903e093d0cddf58f1b6;hb=2d4ecd5ccf25c844502e2cadbf60f3cad5b33ba7;hp=cceb3ca0949873ce634073c1c30fedd869a2c932;hpb=94ed7bf163e0b814afcc159ddaf00bf652e7387d;p=friendica-addons.git
diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index cceb3ca0..56e04f78 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -10,47 +10,39 @@
use Friendica\App;
use Friendica\Content\Text\BBCode;
-use Friendica\Core\Addon;
-use Friendica\Core\L10n;
+use Friendica\Core\Hook;
use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\Post;
+use Friendica\Model\Tag;
use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
use Friendica\Util\XML;
function dwpost_install()
{
- Addon::registerHook('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local');
- Addon::registerHook('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send');
- Addon::registerHook('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
- Addon::registerHook('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings');
- Addon::registerHook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
+ Hook::register('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local');
+ Hook::register('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send');
+ Hook::register('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
+ Hook::register('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings');
+ Hook::register('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
}
-function dwpost_uninstall()
-{
- Addon::unregisterHook('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local');
- Addon::unregisterHook('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send');
- Addon::unregisterHook('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
- Addon::unregisterHook('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings');
- Addon::unregisterHook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
-}
-
-function dwpost_jot_nets(App $a, &$b)
+function dwpost_jot_nets(App $a, array &$jotnets_fields)
{
if (!local_user()) {
return;
}
- $dw_post = PConfig::get(local_user(), 'dwpost', 'post');
-
- if (intval($dw_post) == 1) {
- $dw_defpost = PConfig::get(local_user(), 'dwpost', 'post_by_default');
- $selected = ((intval($dw_defpost) == 1) ? ' checked="checked" ' : '');
-
- $b .= '
'
- . L10n::t('Post to Dreamwidth') . '
';
+ if (DI::pConfig()->get(local_user(), 'dwpost', 'post')) {
+ $jotnets_fields[] = [
+ 'type' => 'checkbox',
+ 'field' => [
+ 'dwpost_enable',
+ DI::l10n()->t('Post to Dreamwidth'),
+ DI::pConfig()->get(local_user(), 'dwpost', 'post_by_default')
+ ]
+ ];
}
}
@@ -62,61 +54,61 @@ function dwpost_settings(App $a, &$s)
}
/* 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(), 'dwpost', 'post');
+ $enabled = DI::pConfig()->get(local_user(), 'dwpost', 'post');
$checked = (($enabled) ? ' checked="checked" ' : '');
- $def_enabled = PConfig::get(local_user(), 'dwpost', 'post_by_default');
+ $def_enabled = DI::pConfig()->get(local_user(), 'dwpost', 'post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
- $dw_username = PConfig::get(local_user(), 'dwpost', 'dw_username');
- $dw_password = PConfig::get(local_user(), 'dwpost', 'dw_password');
+ $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 .= '';
- $s .= ''. L10n::t("Dreamwidth Export").'
';
+ $s .= ''. DI::l10n()->t("Dreamwidth Export").'
';
$s .= '';
$s .= '';
$s .= '
';
- $s .= ''. L10n::t("Dreamwidth Export").'
';
+ $s .= ''. DI::l10n()->t("Dreamwidth Export").'
';
$s .= '';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
/* provide a submit button */
- $s .= '
';
+ $s .= '';
}
function dwpost_settings_post(App $a, array &$b)
{
if (!empty($_POST['dwpost-submit'])) {
- PConfig::set(local_user(), 'dwpost', 'post', intval($_POST['dwpost']));
- PConfig::set(local_user(), 'dwpost', 'post_by_default', intval($_POST['dw_bydefault']));
- PConfig::set(local_user(), 'dwpost', 'dw_username', trim($_POST['dw_username']));
- PConfig::set(local_user(), 'dwpost', 'dw_password', trim($_POST['dw_password']));
+ 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']));
}
}
@@ -135,11 +127,11 @@ function dwpost_post_local(App $a, array &$b)
return;
}
- $dw_post = intval(PConfig::get(local_user(),'dwpost','post'));
+ $dw_post = intval(DI::pConfig()->get(local_user(),'dwpost','post'));
$dw_enable = (($dw_post && !empty($_REQUEST['dwpost_enable'])) ? intval($_REQUEST['dwpost_enable']) : 0);
- if ($b['api_source'] && intval(PConfig::get(local_user(),'dwpost','post_by_default'))) {
+ if ($b['api_source'] && intval(DI::pConfig()->get(local_user(),'dwpost','post_by_default'))) {
$dw_enable = 1;
}
@@ -168,6 +160,8 @@ function dwpost_send(App $a, array &$b)
return;
}
+ $b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], $b['body']);
+
/*
* dreamwidth post in the LJ user's timezone.
* Hopefully the person's Friendica account
@@ -183,15 +177,15 @@ function dwpost_send(App $a, array &$b)
$tz = $x[0]['timezone'];
}
- $dw_username = PConfig::get($b['uid'],'dwpost','dw_username');
- $dw_password = PConfig::get($b['uid'],'dwpost','dw_password');
+ $dw_username = DI::pConfig()->get($b['uid'],'dwpost','dw_username');
+ $dw_password = DI::pConfig()->get($b['uid'],'dwpost','dw_password');
$dw_blog = 'http://www.dreamwidth.org/interface/xmlrpc';
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));
@@ -230,18 +224,9 @@ EOT;
Logger::log('dwpost: data: ' . $xml, Logger::DATA);
if ($dw_blog !== 'test') {
- $x = Network::post($dw_blog, $xml, ["Content-Type: text/xml"])->getBody();
+ $x = DI::httpRequest()->post($dw_blog, $xml, ["Content-Type: text/xml"])->getBody();
}
Logger::log('posted to dreamwidth: ' . ($x) ? $x : '', Logger::DEBUG);
}
}
-
-function dwpost_get_tags($post)
-{
- preg_match_all("/\]([^\[#]+)\[/", $post, $matches);
-
- $tags = implode(', ', $matches[1]);
-
- return $tags;
-}