X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=wppost%2Fwppost.php;h=f9caf232857da1b62cb43ff958230a3de7a8022a;hb=bfcf9feca18a51524fa79e7415f56a430643e9f0;hp=d3e219498300e757df16c1675ca444c45ea38f2b;hpb=ce2af45897ea3263c1973802b9bf592ccb7f73e9;p=friendica-addons.git
diff --git a/wppost/wppost.php b/wppost/wppost.php
index d3e21949..f9caf232 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -8,152 +8,160 @@
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
-use Friendica\Core\Addon;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
use Friendica\Database\DBA;
-use Friendica\Util\Network;
-
-function wppost_install() {
- Addon::registerHook('post_local', 'addon/wppost/wppost.php', 'wppost_post_local');
- Addon::registerHook('notifier_normal', 'addon/wppost/wppost.php', 'wppost_send');
- Addon::registerHook('jot_networks', 'addon/wppost/wppost.php', 'wppost_jot_nets');
- Addon::registerHook('connector_settings', 'addon/wppost/wppost.php', 'wppost_settings');
- Addon::registerHook('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post');
-
+use Friendica\DI;
+use Friendica\Util\Strings;
+use Friendica\Util\XML;
+
+function wppost_install()
+{
+ Hook::register('hook_fork', 'addon/wppost/wppost.php', 'wppost_hook_fork');
+ Hook::register('post_local', 'addon/wppost/wppost.php', 'wppost_post_local');
+ Hook::register('notifier_normal', 'addon/wppost/wppost.php', 'wppost_send');
+ Hook::register('jot_networks', 'addon/wppost/wppost.php', 'wppost_jot_nets');
+ Hook::register('connector_settings', 'addon/wppost/wppost.php', 'wppost_settings');
+ Hook::register('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post');
}
-function wppost_uninstall() {
- Addon::unregisterHook('post_local', 'addon/wppost/wppost.php', 'wppost_post_local');
- Addon::unregisterHook('notifier_normal', 'addon/wppost/wppost.php', 'wppost_send');
- Addon::unregisterHook('jot_networks', 'addon/wppost/wppost.php', 'wppost_jot_nets');
- Addon::unregisterHook('connector_settings', 'addon/wppost/wppost.php', 'wppost_settings');
- Addon::unregisterHook('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post');
-
- // obsolete - remove
- Addon::unregisterHook('post_local_end', 'addon/wppost/wppost.php', 'wppost_send');
- Addon::unregisterHook('addon_settings', 'addon/wppost/wppost.php', 'wppost_settings');
- Addon::unregisterHook('addon_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post');
-
-}
-
-function wppost_jot_nets(&$a,&$b) {
- if(! local_user())
- return;
+function wppost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
+{
+ if (!local_user()) {
+ return;
+ }
- $wp_post = PConfig::get(local_user(),'wppost','post');
- if(intval($wp_post) == 1) {
- $wp_defpost = PConfig::get(local_user(),'wppost','post_by_default');
- $selected = ((intval($wp_defpost) == 1) ? ' checked="checked" ' : '');
- $b .= '
'
- . L10n::t('Post to Wordpress') . '
';
- }
+ if (DI::pConfig()->get(local_user(),'wppost','post')) {
+ $jotnets_fields[] = [
+ 'type' => 'checkbox',
+ 'field' => [
+ 'wppost_enable',
+ DI::l10n()->t('Post to Wordpress'),
+ DI::pConfig()->get(local_user(),'wppost','post_by_default')
+ ]
+ ];
+ }
}
-function wppost_settings(&$a,&$s) {
+function wppost_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";
+ DI::page()['htmlhead'] .= '' . "\r\n";
/* Get the current state of our config variables */
- $enabled = PConfig::get(local_user(),'wppost','post');
+ $enabled = DI::pConfig()->get(local_user(),'wppost','post');
$checked = (($enabled) ? ' checked="checked" ' : '');
$css = (($enabled) ? '' : '-disabled');
- $def_enabled = PConfig::get(local_user(),'wppost','post_by_default');
- $back_enabled = PConfig::get(local_user(),'wppost','backlink');
- $shortcheck_enabled = PConfig::get(local_user(),'wppost','shortcheck');
+ $def_enabled = DI::pConfig()->get(local_user(),'wppost','post_by_default');
+ $back_enabled = DI::pConfig()->get(local_user(),'wppost','backlink');
+ $shortcheck_enabled = DI::pConfig()->get(local_user(),'wppost','shortcheck');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
$back_checked = (($back_enabled) ? ' checked="checked" ' : '');
$shortcheck_checked = (($shortcheck_enabled) ? ' checked="checked" ' : '');
- $wp_username = PConfig::get(local_user(), 'wppost', 'wp_username');
- $wp_password = PConfig::get(local_user(), 'wppost', 'wp_password');
- $wp_blog = PConfig::get(local_user(), 'wppost', 'wp_blog');
- $wp_backlink_text = PConfig::get(local_user(), 'wppost', 'wp_backlink_text');
+ $wp_username = DI::pConfig()->get(local_user(), 'wppost', 'wp_username');
+ $wp_password = DI::pConfig()->get(local_user(), 'wppost', 'wp_password');
+ $wp_blog = DI::pConfig()->get(local_user(), 'wppost', 'wp_blog');
+ $wp_backlink_text = DI::pConfig()->get(local_user(), 'wppost', 'wp_backlink_text');
/* Add some HTML to the existing form */
$s .= '';
- $s .= ''. L10n::t('Wordpress Export').'
';
+ $s .= ''. DI::l10n()->t('Wordpress Export').'
';
$s .= '';
$s .= '';
+ $s .= '';
}
-function wppost_settings_post(&$a,&$b) {
-
- if(x($_POST,'wppost-submit')) {
-
- PConfig::set(local_user(),'wppost','post',intval($_POST['wppost']));
- PConfig::set(local_user(),'wppost','post_by_default',intval($_POST['wp_bydefault']));
- PConfig::set(local_user(),'wppost','wp_username',trim($_POST['wp_username']));
- PConfig::set(local_user(),'wppost','wp_password',trim($_POST['wp_password']));
- PConfig::set(local_user(),'wppost','wp_blog',trim($_POST['wp_blog']));
- PConfig::set(local_user(),'wppost','backlink',trim($_POST['wp_backlink']));
- PConfig::set(local_user(),'wppost','shortcheck',trim($_POST['wp_shortcheck']));
- $wp_backlink_text = notags(trim($_POST['wp_backlink_text']));
- $wp_backlink_text = BBCode::convert($wp_backlink_text, false, 8);
+function wppost_settings_post(&$a, &$b)
+{
+ if(!empty($_POST['wppost-submit'])) {
+ DI::pConfig()->set(local_user(), 'wppost', 'post' , intval($_POST['wppost']));
+ DI::pConfig()->set(local_user(), 'wppost', 'post_by_default', intval($_POST['wp_bydefault']));
+ DI::pConfig()->set(local_user(), 'wppost', 'wp_username' , trim($_POST['wp_username']));
+ DI::pConfig()->set(local_user(), 'wppost', 'wp_password' , trim($_POST['wp_password']));
+ DI::pConfig()->set(local_user(), 'wppost', 'wp_blog' , trim($_POST['wp_blog']));
+ DI::pConfig()->set(local_user(), 'wppost', 'backlink' , intval($_POST['wp_backlink']));
+ DI::pConfig()->set(local_user(), 'wppost', 'shortcheck' , intval($_POST['wp_shortcheck']));
+ $wp_backlink_text = BBCode::convert(trim($_POST['wp_backlink_text']), false, BBCode::BACKLINK);
$wp_backlink_text = HTML::toPlaintext($wp_backlink_text, 0, true);
- PConfig::set(local_user(),'wppost','wp_backlink_text', $wp_backlink_text);
+ DI::pConfig()->set(local_user(), 'wppost', 'wp_backlink_text', $wp_backlink_text);
+ }
+}
+function wppost_hook_fork(&$a, &$b)
+{
+ if ($b['name'] != 'notifier_normal') {
+ return;
}
+ $post = $b['data'];
+
+ if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
+ !strstr($post['postopts'], 'wppost') || ($post['parent'] != $post['id'])) {
+ $b['execute'] = false;
+ return;
+ }
}
function wppost_post_local(&$a, &$b) {
@@ -172,11 +180,11 @@ function wppost_post_local(&$a, &$b) {
return;
}
- $wp_post = intval(PConfig::get(local_user(),'wppost','post'));
+ $wp_post = intval(DI::pConfig()->get(local_user(), 'wppost', 'post'));
- $wp_enable = (($wp_post && x($_REQUEST,'wppost_enable')) ? intval($_REQUEST['wppost_enable']) : 0);
+ $wp_enable = (($wp_post && !empty($_REQUEST['wppost_enable'])) ? intval($_REQUEST['wppost_enable']) : 0);
- if ($b['api_source'] && intval(PConfig::get(local_user(),'wppost','post_by_default'))) {
+ if ($b['api_source'] && intval(DI::pConfig()->get(local_user(), 'wppost', 'post_by_default'))) {
$wp_enable = 1;
}
@@ -194,8 +202,8 @@ function wppost_post_local(&$a, &$b) {
-function wppost_send(&$a,&$b) {
-
+function wppost_send(&$a, &$b)
+{
if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
return;
}
@@ -215,18 +223,18 @@ function wppost_send(&$a,&$b) {
return;
}
- $wp_username = xmlify(PConfig::get($b['uid'],'wppost','wp_username'));
- $wp_password = xmlify(PConfig::get($b['uid'],'wppost','wp_password'));
- $wp_blog = PConfig::get($b['uid'],'wppost','wp_blog');
- $wp_backlink_text = PConfig::get($b['uid'],'wppost','wp_backlink_text');
+ $wp_username = XML::escape(DI::pConfig()->get($b['uid'], 'wppost', 'wp_username'));
+ $wp_password = XML::escape(DI::pConfig()->get($b['uid'], 'wppost', 'wp_password'));
+ $wp_blog = DI::pConfig()->get($b['uid'],'wppost','wp_blog');
+ $wp_backlink_text = DI::pConfig()->get($b['uid'],'wppost','wp_backlink_text');
if ($wp_backlink_text == '') {
- $wp_backlink_text = L10n::t('Read the origÂiÂnal post and comÂment stream on Friendica');
+ $wp_backlink_text = DI::l10n()->t('Read the origÂiÂnal post and comÂment stream on Friendica');
}
if ($wp_username && $wp_password && $wp_blog) {
$wptitle = trim($b['title']);
- if (intval(PConfig::get($b['uid'], 'wppost', 'shortcheck'))) {
+ if (intval(DI::pConfig()->get($b['uid'], 'wppost', 'shortcheck'))) {
// Checking, if its a post that is worth a blog post
$postentry = false;
$siteinfo = BBCode::getAttachedData($b["body"]);
@@ -264,7 +272,7 @@ function wppost_send(&$a,&$b) {
// If no bookmark is found then take the first line
if ($wptitle == '') {
// Remove the share element before fetching the first line
- $title = trim(preg_replace("/\[share.*?\](.*?)\[\/share\]/ism","\n$1\n",$b['body']));
+ $title = trim(preg_replace("/\[share.*?\](.*?)\[\/share\]/ism", "\n$1\n", $b['body']));
$title = HTML::toPlaintext(BBCode::convert($title, false), 0, true)."\n";
$pos = strpos($title, "\n");
@@ -278,22 +286,22 @@ function wppost_send(&$a,&$b) {
}
}
- $title = '' . (($wptitle) ? $wptitle : L10n::t('Post from Friendica')) . '';
- $post = BBCode::convert($b['body'], false, 4);
+ $title = '' . (($wptitle) ? $wptitle : DI::l10n()->t('Post from Friendica')) . '';
+ $post = BBCode::convert($b['body'], false, BBCode::CONNECTORS);
// If a link goes to youtube then remove the stuff around it. Wordpress detects youtube links and embeds it
- $post = preg_replace('/(.*?)<\/a>/ism',"\n$1\n",$post);
- $post = preg_replace('/(.*?)<\/a>/ism',"\n$1\n",$post);
+ $post = preg_replace('/(.*?)<\/a>/ism', "\n$1\n", $post);
+ $post = preg_replace('/(.*?)<\/a>/ism', "\n$1\n", $post);
$post = $title.$post;
- $wp_backlink = intval(PConfig::get($b['uid'],'wppost','backlink'));
+ $wp_backlink = intval(DI::pConfig()->get($b['uid'],'wppost','backlink'));
if($wp_backlink && $b['plink']) {
$post .= EOL . EOL . ''
. $wp_backlink_text . '' . EOL . EOL;
}
- $post = xmlify($post);
+ $post = XML::escape($post);
$xml = <<< EOT
@@ -312,11 +320,11 @@ function wppost_send(&$a,&$b) {
EOT;
- logger('wppost: data: ' . $xml, LOGGER_DATA);
+ Logger::log('wppost: data: ' . $xml, Logger::DATA);
if ($wp_blog !== 'test') {
- $x = Network::post($wp_blog, $xml);
+ $x = DI::httpRequest()->post($wp_blog, $xml)->getBody();
}
- logger('posted to wordpress: ' . (($x) ? $x : ''), LOGGER_DEBUG);
+ Logger::log('posted to wordpress: ' . (($x) ? $x : ''), Logger::DEBUG);
}
}