X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=ijpost%2Fijpost.php;h=15f2b41e63e55bf9ff70c3bbfcb7423cf3e9c883;hb=da5c3db6cc3c9684a2361f1c173ae11e31277b8e;hp=29fcd0d73733e97b6f2dc838f8140b1e1e2647aa;hpb=ea3a9052d83f8ea99cee8438022be0b022a24cc1;p=friendica-addons.git
diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index 29fcd0d7..15f2b41e 100644
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.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 ijpost_install()
@@ -27,15 +25,6 @@ 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()) {
@@ -47,7 +36,7 @@ function ijpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
'type' => 'checkbox',
'field' => [
'ijpost_enable',
- L10n::t('Post to Insanejournal'),
+ DI::l10n()->t('Post to Insanejournal'),
DI::pConfig()->get(local_user(), 'ijpost', 'post_by_default')
]
];
@@ -79,44 +68,44 @@ function ijpost_settings(&$a, &$s)
/* Add some HTML to the existing form */
$s .= '';
- $s .= ''. L10n::t("InsaneJournal Export").'
';
+ $s .= ''. DI::l10n()->t("InsaneJournal Export").'
';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= ''. L10n::t("InsaneJournal Export").'
';
+ $s .= ''. DI::l10n()->t("InsaneJournal 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 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']));
}
}
@@ -191,7 +180,7 @@ function ijpost_send(&$a, &$b)
$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));
@@ -230,15 +219,8 @@ EOT;
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;
-}