X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=ljpost%2Fljpost.php;h=f6f2b79aaa87d93a290dc5220882bb84f7705660;hb=410613d7a076de0fa699b66a4db17ae9267d13e7;hp=c785700011eeada9fb13c9910378dfad33f1285b;hpb=c9a8974165c34bb70874d80a2639b46baf533ffc;p=friendica-addons.git diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php index c7857000..f6f2b79a 100644 --- a/ljpost/ljpost.php +++ b/ljpost/ljpost.php @@ -8,182 +8,153 @@ * Author: Cat Gray */ +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\Core\Renderer; +use Friendica\DI; +use Friendica\Model\Post; +use Friendica\Model\Tag; +use Friendica\Model\User; use Friendica\Util\DateTimeFormat; -use Friendica\Util\Network; - -function ljpost_install() { - Addon::registerHook('post_local', 'addon/ljpost/ljpost.php', 'ljpost_post_local'); - Addon::registerHook('notifier_normal', 'addon/ljpost/ljpost.php', 'ljpost_send'); - Addon::registerHook('jot_networks', 'addon/ljpost/ljpost.php', 'ljpost_jot_nets'); - Addon::registerHook('connector_settings', 'addon/ljpost/ljpost.php', 'ljpost_settings'); - Addon::registerHook('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post'); - -} -function ljpost_uninstall() { - Addon::unregisterHook('post_local', 'addon/ljpost/ljpost.php', 'ljpost_post_local'); - Addon::unregisterHook('notifier_normal', 'addon/ljpost/ljpost.php', 'ljpost_send'); - Addon::unregisterHook('jot_networks', 'addon/ljpost/ljpost.php', 'ljpost_jot_nets'); - Addon::unregisterHook('connector_settings', 'addon/ljpost/ljpost.php', 'ljpost_settings'); - Addon::unregisterHook('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post'); +use Friendica\Util\XML; +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(array &$jotnets_fields) +{ + if (!DI::userSession()->getLocalUserId()) { + return; + } -function ljpost_jot_nets(&$a,&$b) { - if(! local_user()) - return; - - $lj_post = PConfig::get(local_user(),'ljpost','post'); - if(intval($lj_post) == 1) { - $lj_defpost = PConfig::get(local_user(),'ljpost','post_by_default'); - $selected = ((intval($lj_defpost) == 1) ? ' checked="checked" ' : ''); - $b .= '
' - . L10n::t('Post to LiveJournal') . '
'; - } + if (DI::pConfig()->get(DI::userSession()->getLocalUserId(),'ljpost','post')) { + $jotnets_fields[] = [ + 'type' => 'checkbox', + 'field' => [ + 'ljpost_enable', + DI::l10n()->t('Post to LiveJournal'), + DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post_by_default'), + ], + ]; + } } +function ljpost_settings(array &$data) +{ + if (!DI::userSession()->getLocalUserId()) { + return; + } -function ljpost_settings(&$a,&$s) { - - if(! local_user()) - return; - - /* Add our stylesheet to the page so we can make our settings look nice */ - - $a->page['htmlhead'] .= '' . "\r\n"; - - /* Get the current state of our config variables */ - - $enabled = PConfig::get(local_user(),'ljpost','post'); - - $checked = (($enabled) ? ' checked="checked" ' : ''); - - $def_enabled = PConfig::get(local_user(),'ljpost','post_by_default'); - - $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); - - $lj_username = PConfig::get(local_user(), 'ljpost', 'lj_username'); - $lj_password = PConfig::get(local_user(), 'ljpost', 'lj_password'); - - - /* Add some HTML to the existing form */ - - $s .= '
'; - $s .= '

' . L10n::t('LiveJournal Post Settings') . '

'; - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; - - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; - - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; - - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; - - /* provide a submit button */ - - $s .= '
'; - + $enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post', false); + $ij_username = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'ij_username'); + $def_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post_by_default'); + + $t= Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/ljpost/'); + $html = Renderer::replaceMacros($t, [ + '$enabled' => ['ljpost', DI::l10n()->t('Enable LiveJournal Post Addon'), $enabled], + '$username' => ['ij_username', DI::l10n()->t('LiveJournal username'), $ij_username], + '$password' => ['ij_password', DI::l10n()->t('LiveJournal password')], + '$bydefault' => ['ij_bydefault', DI::l10n()->t('Post to LiveJournal by default'), $def_enabled], + ]); + + $data = [ + 'connector' => 'ljpost', + 'title' => DI::l10n()->t('LiveJournal Export'), + 'image' => 'addon/ljpost/livejournal.png', + 'enabled' => $enabled, + 'html' => $html, + ]; } - -function ljpost_settings_post(&$a,&$b) { - - if(x($_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'])); - +function ljpost_settings_post(array &$b) +{ + if (!empty($_POST['ljpost-submit'])) { + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'ljpost', 'post', intval($_POST['ljpost'])); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'ljpost', 'post_by_default', intval($_POST['lj_bydefault'])); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'ljpost', 'lj_username', trim($_POST['lj_username'])); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'ljpost', 'lj_password', trim($_POST['lj_password'])); } - } -function ljpost_post_local(&$a,&$b) { - +function ljpost_post_local(array &$b) +{ // This can probably be changed to allow editing by pointing to a different API endpoint - - if($b['edit']) + if ($b['edit']) { return; + } - if((! local_user()) || (local_user() != $b['uid'])) + if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) { return; + } - if($b['private'] || $b['parent']) + if ($b['private'] || $b['parent']) { return; + } - $lj_post = intval(PConfig::get(local_user(),'ljpost','post')); - - $lj_enable = (($lj_post && x($_REQUEST,'ljpost_enable')) ? intval($_REQUEST['ljpost_enable']) : 0); + $lj_post = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'ljpost','post')); + $lj_enable = (($lj_post && !empty($_REQUEST['ljpost_enable'])) ? intval($_REQUEST['ljpost_enable']) : 0); - if($b['api_source'] && intval(PConfig::get(local_user(),'ljpost','post_by_default'))) + if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post_by_default'))) { $lj_enable = 1; + } - if(! $lj_enable) - return; + if (!$lj_enable) { + return; + } - if(strlen($b['postopts'])) - $b['postopts'] .= ','; - $b['postopts'] .= 'ljpost'; + if (strlen($b['postopts'])) { + $b['postopts'] .= ','; + } + $b['postopts'] .= 'ljpost'; } +function ljpost_send(array &$b) +{ + if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) { + return; + } + if (!strstr($b['postopts'],'ljpost')) { + return; + } + if ($b['parent'] != $b['id']) { + return; + } -function ljpost_send(&$a,&$b) { - - if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) - return; - - if(! strstr($b['postopts'],'ljpost')) - return; - - if($b['parent'] != $b['id']) - return; + $b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b)); // LiveJournal post in the LJ user's timezone. // Hopefully the person's Friendica account // will be set to the same thing. - $tz = 'UTC'; - - $x = q("select timezone from user where uid = %d limit 1", - intval($b['uid']) - ); - if($x && strlen($x[0]['timezone'])) - $tz = $x[0]['timezone']; + $user = User::getById($b['uid']); + $tz = $user['timezone'] ?: 'UTC'; - $lj_username = xmlify(PConfig::get($b['uid'],'ljpost','lj_username')); - $lj_password = xmlify(PConfig::get($b['uid'],'ljpost','lj_password')); - $lj_journal = xmlify(PConfig::get($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(PConfig::get($b['uid'],'ljpost','lj_blog')); - if(! strlen($lj_blog)) - $lj_blog = xmlify('http://www.livejournal.com/interface/xmlrpc'); + $lj_blog = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_blog')); + if (!strlen($lj_blog)) { + $lj_blog = XML::escape('http://www.livejournal.com/interface/xmlrpc'); + } - if($lj_username && $lj_password && $lj_blog) { - $title = xmlify($b['title']); - $post = BBCode::convert($b['body']); - $post = xmlify($post); - $tags = ljpost_get_tags($b['tag']); + if ($lj_username && $lj_password && $lj_blog) { + $title = XML::escape($b['title']); + $post = BBCode::convertForUriId($b['uri-id'], $b['body'], BBCode::CONNECTORS); + $post = XML::escape($post); + $tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]); $date = DateTimeFormat::convert($b['created'], $tz); $year = intval(substr($date,0,4)); @@ -195,55 +166,50 @@ function ljpost_send(&$a,&$b) { $xml = <<< EOT - LJ.XMLRPC.postevent - - - - username$lj_username - password$lj_password - event$post - subject$title - lineendingsunix - year$year - mon$mon - day$day - hour$hour - min$min - usejournal$lj_username - - props +LJ.XMLRPC.postevent + + + username$lj_username + password$lj_password + event$post + subject$title + lineendingsunix + year$year + mon$mon + day$day + hour$hour + min$min + usejournal$lj_username - useragent - Friendica - - - taglist - $tags + props + + + + useragent + Friendica + + + taglist + $tags + + + - - - - + + - EOT; - Logger::log('ljpost: data: ' . $xml, Logger::DATA); + Logger::debug('ljpost: data: ' . $xml); if ($lj_blog !== 'test') { - $x = Network::post($lj_blog, $xml, ["Content-Type: text/xml"])->getBody(); + $x = DI::httpClient()->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; + Logger::info('posted to livejournal: ' . ($x) ? $x : ''); + } }