X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=ijpost%2Fijpost.php;h=15f2b41e63e55bf9ff70c3bbfcb7423cf3e9c883;hb=147ac6b774d4210f2e2cb7db88edded97e22a128;hp=3dcfb31fe52264582cbb84cb2d32f3f1c65aec91;hpb=30c15428933462b628d2cb72b280d861bee0cd02;p=friendica-addons.git
diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index 3dcfb31f..15f2b41e 100644
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -9,42 +9,37 @@
*/
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\DI;
+use Friendica\Model\Tag;
use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
+use Friendica\Util\XML;
function ijpost_install()
{
- Addon::registerHook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local');
- Addon::registerHook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send');
- Addon::registerHook('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
- Addon::registerHook('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings');
- Addon::registerHook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
+ Hook::register('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local');
+ Hook::register('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send');
+ Hook::register('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
+ Hook::register('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings');
+ Hook::register('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
}
-function ijpost_uninstall()
-{
- Addon::unregisterHook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local');
- Addon::unregisterHook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send');
- Addon::unregisterHook('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
- Addon::unregisterHook('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings');
- Addon::unregisterHook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
-}
-
-function ijpost_jot_nets(&$a, &$b)
+function ijpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
{
if (!local_user()) {
return;
}
- $ij_post = PConfig::get(local_user(), 'ijpost', 'post');
- if (intval($ij_post) == 1) {
- $ij_defpost = PConfig::get(local_user(), 'ijpost', 'post_by_default');
- $selected = ((intval($ij_defpost) == 1) ? ' checked="checked" ' : '');
- $b .= '
'
- . L10n::t('Post to Insanejournal') . '
';
+ if (DI::pConfig()->get(local_user(), 'ijpost', 'post')) {
+ $jotnets_fields[] = [
+ 'type' => 'checkbox',
+ 'field' => [
+ 'ijpost_enable',
+ DI::l10n()->t('Post to Insanejournal'),
+ DI::pConfig()->get(local_user(), 'ijpost', 'post_by_default')
+ ]
+ ];
}
}
@@ -56,61 +51,61 @@ function ijpost_settings(&$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(), 'ijpost', 'post');
+ $enabled = DI::pConfig()->get(local_user(), 'ijpost', 'post');
$checked = (($enabled) ? ' checked="checked" ' : '');
- $def_enabled = PConfig::get(local_user(), 'ijpost', 'post_by_default');
+ $def_enabled = DI::pConfig()->get(local_user(), 'ijpost', 'post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
- $ij_username = PConfig::get(local_user(), 'ijpost', 'ij_username');
- $ij_password = PConfig::get(local_user(), 'ijpost', 'ij_password');
+ $ij_username = DI::pConfig()->get(local_user(), 'ijpost', 'ij_username');
+ $ij_password = DI::pConfig()->get(local_user(), 'ijpost', 'ij_password');
/* Add some HTML to the existing form */
$s .= '';
- $s .= '![](images/insanejournal.gif)
'. L10n::t("InsaneJournal Export").'
';
+ $s .= '![](images/insanejournal.gif)
'. DI::l10n()->t("InsaneJournal Export").'
';
$s .= '';
$s .= '';
$s .= '
';
- $s .= '![](images/insanejournal.gif)
'. L10n::t("InsaneJournal Export").'
';
+ $s .= '![](images/insanejournal.gif)
'. 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 (x($_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']));
+ if (!empty($_POST['ijpost-submit'])) {
+ 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']));
}
}
@@ -130,11 +125,11 @@ function ijpost_post_local(&$a, &$b)
return;
}
- $ij_post = intval(PConfig::get(local_user(), 'ijpost', 'post'));
+ $ij_post = intval(DI::pConfig()->get(local_user(), 'ijpost', 'post'));
- $ij_enable = (($ij_post && x($_REQUEST, 'ijpost_enable')) ? intval($_REQUEST['ijpost_enable']) : 0);
+ $ij_enable = (($ij_post && !empty($_REQUEST['ijpost_enable'])) ? intval($_REQUEST['ijpost_enable']) : 0);
- if ($b['api_source'] && intval(PConfig::get(local_user(), 'ijpost', 'post_by_default'))) {
+ if ($b['api_source'] && intval(DI::pConfig()->get(local_user(), 'ijpost', 'post_by_default'))) {
$ij_enable = 1;
}
@@ -177,15 +172,15 @@ function ijpost_send(&$a, &$b)
$tz = $x[0]['timezone'];
}
- $ij_username = PConfig::get($b['uid'], 'ijpost', 'ij_username');
- $ij_password = PConfig::get($b['uid'], 'ijpost', 'ij_password');
+ $ij_username = DI::pConfig()->get($b['uid'], 'ijpost', 'ij_username');
+ $ij_password = DI::pConfig()->get($b['uid'], 'ijpost', 'ij_password');
$ij_blog = 'http://www.insanejournal.com/interface/xmlrpc';
if ($ij_username && $ij_password && $ij_blog) {
$title = $b['title'];
$post = BBCode::convert($b['body']);
- $post = xmlify($post);
- $tags = ijpost_get_tags($b['tag']);
+ $post = XML::escape($post);
+ $tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
$date = DateTimeFormat::convert($b['created'], $tz);
$year = intval(substr($date,0,4));
@@ -221,18 +216,11 @@ function ijpost_send(&$a, &$b)
EOT;
- logger('ijpost: data: ' . $xml, LOGGER_DATA);
+ 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('posted to insanejournal: ' . $x ? $x : '', LOGGER_DEBUG);
+ 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;
-}