X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=ljpost%2Fljpost.php;h=0d06100866723099109ca1e7b6253ded0c16b80e;hb=76ecff195f99c428d437de826c05034e5b53fd1f;hp=dc17e83fc8e7d667b71c1bad2a440ba8c2d03238;hpb=c92861618bd46646e2e861e33eaeb227721a6be1;p=friendica-addons.git
diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
old mode 100755
new mode 100644
index dc17e83f..0d061008
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -1,5 +1,4 @@
*/
-function ljpost_install() {
- register_hook('post_local', 'addon/ljpost/ljpost.php', 'ljpost_post_local');
- register_hook('notifier_normal', 'addon/ljpost/ljpost.php', 'ljpost_send');
- register_hook('jot_networks', 'addon/ljpost/ljpost.php', 'ljpost_jot_nets');
- register_hook('connector_settings', 'addon/ljpost/ljpost.php', 'ljpost_settings');
- register_hook('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post');
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
+use Friendica\DI;
+use Friendica\Model\Tag;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\XML;
-}
-function ljpost_uninstall() {
- unregister_hook('post_local', 'addon/ljpost/ljpost.php', 'ljpost_post_local');
- unregister_hook('notifier_normal', 'addon/ljpost/ljpost.php', 'ljpost_send');
- unregister_hook('jot_networks', 'addon/ljpost/ljpost.php', 'ljpost_jot_nets');
- unregister_hook('connector_settings', 'addon/ljpost/ljpost.php', 'ljpost_settings');
- unregister_hook('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post');
+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(&$a,&$b) {
- if(! local_user())
+function ljpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
+{
+ if(! local_user()) {
return;
+ }
- $lj_post = get_pconfig(local_user(),'ljpost','post');
- if(intval($lj_post) == 1) {
- $lj_defpost = get_pconfig(local_user(),'ljpost','post_by_default');
- $selected = ((intval($lj_defpost) == 1) ? ' checked="checked" ' : '');
- $b .= '
'
- . t('Post to LiveJournal') . '
';
+ if (DI::pConfig()->get(local_user(),'ljpost','post')) {
+ $jotnets_fields[] = [
+ 'type' => 'checkbox',
+ 'field' => [
+ 'ljpost_enable',
+ DI::l10n()->t('Post to LiveJournal'),
+ DI::pConfig()->get(local_user(),'ljpost','post_by_default')
+ ]
+ ];
}
}
@@ -48,61 +51,61 @@ function ljpost_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 = get_pconfig(local_user(),'ljpost','post');
+ $enabled = DI::pConfig()->get(local_user(),'ljpost','post');
$checked = (($enabled) ? ' checked="checked" ' : '');
- $def_enabled = get_pconfig(local_user(),'ljpost','post_by_default');
+ $def_enabled = DI::pConfig()->get(local_user(),'ljpost','post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
- $lj_username = get_pconfig(local_user(), 'ljpost', 'lj_username');
- $lj_password = get_pconfig(local_user(), 'ljpost', 'lj_password');
+ $lj_username = DI::pConfig()->get(local_user(), 'ljpost', 'lj_username');
+ $lj_password = DI::pConfig()->get(local_user(), 'ljpost', 'lj_password');
/* Add some HTML to the existing form */
$s .= '';
- $s .= '
' . 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 .= '';
}
function ljpost_settings_post(&$a,&$b) {
- if(x($_POST,'ljpost-submit')) {
+ if(!empty($_POST['ljpost-submit'])) {
- set_pconfig(local_user(),'ljpost','post',intval($_POST['ljpost']));
- set_pconfig(local_user(),'ljpost','post_by_default',intval($_POST['lj_bydefault']));
- set_pconfig(local_user(),'ljpost','lj_username',trim($_POST['lj_username']));
- set_pconfig(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']));
}
@@ -121,11 +124,11 @@ function ljpost_post_local(&$a,&$b) {
if($b['private'] || $b['parent'])
return;
- $lj_post = intval(get_pconfig(local_user(),'ljpost','post'));
+ $lj_post = intval(DI::pConfig()->get(local_user(),'ljpost','post'));
- $lj_enable = (($lj_post && x($_REQUEST,'ljpost_enable')) ? intval($_REQUEST['ljpost_enable']) : 0);
+ $lj_enable = (($lj_post && !empty($_REQUEST['ljpost_enable'])) ? intval($_REQUEST['ljpost_enable']) : 0);
- if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'ljpost','post_by_default')))
+ if($b['api_source'] && intval(DI::pConfig()->get(local_user(),'ljpost','post_by_default')))
$lj_enable = 1;
if(! $lj_enable)
@@ -150,7 +153,7 @@ function ljpost_send(&$a,&$b) {
if($b['parent'] != $b['id'])
return;
- // LiveJournal post in the LJ user's timezone.
+ // LiveJournal post in the LJ user's timezone.
// Hopefully the person's Friendica account
// will be set to the same thing.
@@ -160,29 +163,25 @@ function ljpost_send(&$a,&$b) {
intval($b['uid'])
);
if($x && strlen($x[0]['timezone']))
- $tz = $x[0]['timezone'];
+ $tz = $x[0]['timezone'];
- $lj_username = xmlify(get_pconfig($b['uid'],'ljpost','lj_username'));
- $lj_password = xmlify(get_pconfig($b['uid'],'ljpost','lj_password'));
- $lj_journal = xmlify(get_pconfig($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(get_pconfig($b['uid'],'ljpost','lj_blog'));
+ $lj_blog = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_blog'));
if(! strlen($lj_blog))
- $lj_blog = xmlify('http://www.livejournal.com/interface/xmlrpc');
+ $lj_blog = XML::escape('http://www.livejournal.com/interface/xmlrpc');
if($lj_username && $lj_password && $lj_blog) {
+ $title = XML::escape($b['title']);
+ $post = BBCode::convert($b['body']);
+ $post = XML::escape($post);
+ $tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
- require_once('include/bbcode.php');
- require_once('include/datetime.php');
-
- $title = xmlify($b['title']);
- $post = bbcode($b['body']);
- $post = xmlify($post);
- $tags = ljpost_get_tags($b['tag']);
-
- $date = datetime_convert('UTC',$tz,$b['created'],'Y-m-d H:i:s');
+ $date = DateTimeFormat::convert($b['created'], $tz);
$year = intval(substr($date,0,4));
$mon = intval(substr($date,5,2));
$day = intval(substr($date,8,2));
@@ -229,18 +228,11 @@ function ljpost_send(&$a,&$b) {
EOT;
- logger('ljpost: data: ' . $xml, LOGGER_DATA);
-
- if($lj_blog !== 'test')
- $x = post_url($lj_blog,$xml,array("Content-Type: text/xml"));
- logger('posted to livejournal: ' . ($x) ? $x : '', LOGGER_DEBUG);
+ Logger::log('ljpost: data: ' . $xml, Logger::DATA);
+ if ($lj_blog !== 'test') {
+ $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;
-}