';
@@ -136,6 +122,7 @@ function wppost_settings(&$a,&$s) {
$s .= '
';
$s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
@@ -146,22 +133,20 @@ function wppost_settings(&$a,&$s) {
}
-function wppost_settings_post(&$a,&$b) {
-
+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'] ?? false));
- 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',trim($_POST['wp_backlink'] ?? ''));
- DI::pConfig()->set(local_user(),'wppost','shortcheck',trim($_POST['wp_shortcheck']));
- $wp_backlink_text = Strings::escapeTags(trim($_POST['wp_backlink_text']));
- $wp_backlink_text = BBCode::convert($wp_backlink_text, false, 8);
+ 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);
- DI::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)
@@ -195,11 +180,11 @@ function wppost_post_local(&$a, &$b) {
return;
}
- $wp_post = intval(DI::pConfig()->get(local_user(),'wppost','post'));
+ $wp_post = intval(DI::pConfig()->get(local_user(), 'wppost', 'post'));
$wp_enable = (($wp_post && !empty($_REQUEST['wppost_enable'])) ? intval($_REQUEST['wppost_enable']) : 0);
- if ($b['api_source'] && intval(DI::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;
}
@@ -287,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");
@@ -302,11 +287,11 @@ function wppost_send(&$a, &$b)
}
$title = '
' . (($wptitle) ? $wptitle : DI::l10n()->t('Post from Friendica')) . '';
- $post = BBCode::convert($b['body'], false, 4);
+ $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;
@@ -338,7 +323,7 @@ EOT;
Logger::log('wppost: data: ' . $xml, Logger::DATA);
if ($wp_blog !== 'test') {
- $x = Network::post($wp_blog, $xml)->getBody();
+ $x = DI::httpRequest()->post($wp_blog, $xml)->getBody();
}
Logger::log('posted to wordpress: ' . (($x) ? $x : ''), Logger::DEBUG);
}