X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=wppost%2Fwppost.php;h=c3840d5233510a0bc3de146323fdc8774e2a61a0;hb=101d3603245b17bd2e6d4880e94bb27887257238;hp=e3127e8e6e2c1d51e41350e6ee730e024f5f3328;hpb=25f9eec89c517dead01935299dd1903ba12ab795;p=friendica-addons.git diff --git a/wppost/wppost.php b/wppost/wppost.php index e3127e8e..c3840d52 100644 --- a/wppost/wppost.php +++ b/wppost/wppost.php @@ -5,46 +5,60 @@ * Version: 1.1 * Author: Mike Macgirvin */ + use Friendica\Content\Text\BBCode; -use Friendica\Core\Addon; +use Friendica\Content\Text\HTML; +use Friendica\Core\Hook; use Friendica\Core\L10n; +use Friendica\Core\Logger; use Friendica\Core\PConfig; +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\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_uninstall() +{ + Hook::unregister('hook_fork', 'addon/wppost/wppost.php', 'wppost_hook_fork'); + Hook::unregister('post_local', 'addon/wppost/wppost.php', 'wppost_post_local'); + Hook::unregister('notifier_normal', 'addon/wppost/wppost.php', 'wppost_send'); + Hook::unregister('jot_networks', 'addon/wppost/wppost.php', 'wppost_jot_nets'); + Hook::unregister('connector_settings', 'addon/wppost/wppost.php', 'wppost_settings'); + Hook::unregister('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post'); + // obsolete - remove + Hook::unregister('post_local_end', 'addon/wppost/wppost.php', 'wppost_send'); + Hook::unregister('addon_settings', 'addon/wppost/wppost.php', 'wppost_settings'); + Hook::unregister('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 (PConfig::get(local_user(),'wppost','post')) { + $jotnets_fields[] = [ + 'type' => 'checkbox', + 'field' => [ + 'wppost_enable', + L10n::t('Post to Wordpress'), + PConfig::get(local_user(),'wppost','post_by_default') + ] + ]; + } } @@ -55,7 +69,7 @@ function wppost_settings(&$a,&$s) { /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ @@ -135,22 +149,35 @@ function wppost_settings(&$a,&$s) { function wppost_settings_post(&$a,&$b) { - if(x($_POST,'wppost-submit')) { - + if(!empty($_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','post_by_default',intval(defaults($_POST, 'wp_bydefault', false))); 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','backlink',trim(defaults($_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($wp_backlink_text, false, false, 8); - $wp_backlink_text = html2plain($wp_backlink_text, 0, true); + $wp_backlink_text = Strings::escapeTags(trim($_POST['wp_backlink_text'])); + $wp_backlink_text = BBCode::convert($wp_backlink_text, false, 8); + $wp_backlink_text = HTML::toPlaintext($wp_backlink_text, 0, true); 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) { @@ -171,7 +198,7 @@ function wppost_post_local(&$a, &$b) { $wp_post = intval(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'))) { $wp_enable = 1; @@ -191,8 +218,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; } @@ -207,13 +234,13 @@ function wppost_send(&$a,&$b) { // Dont't post if the post doesn't belong to us. // This is a check for forum postings - $self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]); + $self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]); if ($b['contact-id'] != $self['id']) { return; } - $wp_username = xmlify(PConfig::get($b['uid'],'wppost','wp_username')); - $wp_password = xmlify(PConfig::get($b['uid'],'wppost','wp_password')); + $wp_username = XML::escape(PConfig::get($b['uid'], 'wppost', 'wp_username')); + $wp_password = XML::escape(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'); if ($wp_backlink_text == '') { @@ -221,9 +248,6 @@ function wppost_send(&$a,&$b) { } if ($wp_username && $wp_password && $wp_blog) { - require_once 'include/bbcode.php'; - require_once 'include/html2plain.php'; - $wptitle = trim($b['title']); if (intval(PConfig::get($b['uid'], 'wppost', 'shortcheck'))) { @@ -266,7 +290,7 @@ function wppost_send(&$a,&$b) { // Remove the share element before fetching the first line $title = trim(preg_replace("/\[share.*?\](.*?)\[\/share\]/ism","\n$1\n",$b['body'])); - $title = html2plain(bbcode($title, false, false), 0, true)."\n"; + $title = HTML::toPlaintext(BBCode::convert($title, false), 0, true)."\n"; $pos = strpos($title, "\n"); $trailer = ""; if (($pos == 0) || ($pos > 100)) { @@ -279,7 +303,7 @@ function wppost_send(&$a,&$b) { } $title = '' . (($wptitle) ? $wptitle : L10n::t('Post from Friendica')) . ''; - $post = bbcode($b['body'], false, false, 4); + $post = BBCode::convert($b['body'], false, 4); // 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); @@ -293,7 +317,7 @@ function wppost_send(&$a,&$b) { . $wp_backlink_text . '' . EOL . EOL; } - $post = xmlify($post); + $post = XML::escape($post); $xml = <<< EOT @@ -312,11 +336,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 = Network::post($wp_blog, $xml)->getBody(); } - logger('posted to wordpress: ' . (($x) ? $x : ''), LOGGER_DEBUG); + Logger::log('posted to wordpress: ' . (($x) ? $x : ''), Logger::DEBUG); } }