[blockem] Regenerate master messages.po file

[friendica-addons.git] / wppost / wppost.php

diff --git a/wppost/wppost.php b/wppost/wppost.php
index e3127e8e6e2c1d51e41350e6ee730e024f5f3328..a2c1129362a2b629a91567ffa2dc957cd2d4bab5 100644 (file)
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -5,7 +5,9 @@
  * Version: 1.1
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
+
 use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -145,8 +147,8 @@ function wppost_settings_post(&$a,&$b) {
                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($wp_backlink_text, false, false, 8);
-               $wp_backlink_text = html2plain($wp_backlink_text, 0, true);
+               $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);
 
        }
@@ -221,9 +223,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 +265,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 +278,7 @@ function wppost_send(&$a,&$b) {
                }
 
                $title = '<title>' . (($wptitle) ? $wptitle : L10n::t('Post from Friendica')) . '</title>';
-               $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.*?href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$post);