X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=ljpost%2Fljpost.php;h=0d06100866723099109ca1e7b6253ded0c16b80e;hb=76ecff195f99c428d437de826c05034e5b53fd1f;hp=f6ac37edc41ce743679cf10fd0ca70a9b6643b37;hpb=ea3a9052d83f8ea99cee8438022be0b022a24cc1;p=friendica-addons.git
diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index f6ac37ed..0d061008 100644
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -10,12 +10,10 @@
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 ljpost_install() {
@@ -26,15 +24,6 @@ function ljpost_install() {
Hook::register('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post');
}
-function ljpost_uninstall() {
- Hook::unregister('post_local', 'addon/ljpost/ljpost.php', 'ljpost_post_local');
- Hook::unregister('notifier_normal', 'addon/ljpost/ljpost.php', 'ljpost_send');
- Hook::unregister('jot_networks', 'addon/ljpost/ljpost.php', 'ljpost_jot_nets');
- Hook::unregister('connector_settings', 'addon/ljpost/ljpost.php', 'ljpost_settings');
- Hook::unregister('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post');
-
-}
-
function ljpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
{
@@ -47,7 +36,7 @@ function ljpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
'type' => 'checkbox',
'field' => [
'ljpost_enable',
- L10n::t('Post to LiveJournal'),
+ DI::l10n()->t('Post to LiveJournal'),
DI::pConfig()->get(local_user(),'ljpost','post_by_default')
]
];
@@ -81,30 +70,30 @@ function ljpost_settings(&$a,&$s) {
/* Add some HTML to the existing form */
$s .= '
';
- $s .= '
' . L10n::t('LiveJournal Post Settings') . '
';
+ $s .= '
' . DI::l10n()->t('LiveJournal Post Settings') . '
';
$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 .= '';
}
@@ -113,10 +102,10 @@ function ljpost_settings_post(&$a,&$b) {
if(!empty($_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']));
+ DI::pConfig()->set(local_user(),'ljpost','post',intval($_POST['ljpost']));
+ DI::pConfig()->set(local_user(),'ljpost','post_by_default',intval($_POST['lj_bydefault']));
+ DI::pConfig()->set(local_user(),'ljpost','lj_username',trim($_POST['lj_username']));
+ DI::pConfig()->set(local_user(),'ljpost','lj_password',trim($_POST['lj_password']));
}
@@ -190,7 +179,7 @@ function ljpost_send(&$a,&$b) {
$title = XML::escape($b['title']);
$post = BBCode::convert($b['body']);
$post = XML::escape($post);
- $tags = ljpost_get_tags($b['tag']);
+ $tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
$date = DateTimeFormat::convert($b['created'], $tz);
$year = intval(substr($date,0,4));
@@ -242,15 +231,8 @@ EOT;
Logger::log('ljpost: data: ' . $xml, Logger::DATA);
if ($lj_blog !== 'test') {
- $x = Network::post($lj_blog, $xml, ["Content-Type: text/xml"])->getBody();
+ $x = DI::httpRequest()->post($lj_blog, $xml, ["Content-Type: text/xml"])->getBody();
}
Logger::log('posted to livejournal: ' . ($x) ? $x : '', Logger::DEBUG);
}
}
-
-function ljpost_get_tags($post)
-{
- preg_match_all("/\]([^\[#]+)\[/",$post,$matches);
- $tags = implode(', ',$matches[1]);
- return $tags;
-}