X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=wppost%2Fwppost.php;h=c3840d5233510a0bc3de146323fdc8774e2a61a0;hb=101d3603245b17bd2e6d4880e94bb27887257238;hp=45b48993ff545a61433f97bb8911b0a8bd4cab8d;hpb=57505bdf82fa7967adadcf3a9c43ec177f64a111;p=friendica-addons.git
diff --git a/wppost/wppost.php b/wppost/wppost.php
index 45b48993..c3840d52 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -8,46 +8,57 @@
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
-use Friendica\Core\Addon;
+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')
+ ]
+ ];
+ }
}
@@ -58,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 */
@@ -138,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 = 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) {
@@ -174,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;
@@ -194,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;
}
@@ -215,8 +239,8 @@ 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_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 == '') {
@@ -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);
}
}