Merge branch '3.6-rc'

This commit is contained in:
Tobias Diekershoff 2018-03-23 08:00:37 +01:00
commit 39dd3dffe0
733 changed files with 10943 additions and 8237 deletions

View file

@ -26,7 +26,7 @@ msgid "Wordpress Export"
msgstr ""
#: wppost.php:87
msgid "Enable WordPress Post Plugin"
msgid "Enable WordPress Post Addon"
msgstr ""
#: wppost.php:92

View file

@ -2,7 +2,7 @@
$a->strings["Post to Wordpress"] = "Publica-ho al Wordpress";
$a->strings["WordPress Post Settings"] = "Configuració d'enviaments a WordPress";
$a->strings["Enable WordPress Post Plugin"] = "Habilitar Configuració d'Enviaments a WordPress";
$a->strings["Enable WordPress Post Addon"] = "Habilitar Configuració d'Enviaments a WordPress";
$a->strings["WordPress username"] = "Nom d'usuari de WordPress";
$a->strings["WordPress password"] = "Contrasenya de WordPress";
$a->strings["WordPress API URL"] = "WordPress API URL";

View file

@ -28,7 +28,7 @@ msgid "Wordpress Export"
msgstr "Wordpress Export"
#: wppost.php:86
msgid "Enable WordPress Post Plugin"
msgid "Enable WordPress Post Addon"
msgstr "Povolit rozšíření na WordPress"
#: wppost.php:91

View file

@ -7,7 +7,7 @@ function string_plural_select_cs($n){
;
$a->strings["Post to Wordpress"] = "Příspěvky do WordPress";
$a->strings["Wordpress Export"] = "Wordpress Export";
$a->strings["Enable WordPress Post Plugin"] = "Povolit rozšíření na WordPress";
$a->strings["Enable WordPress Post Addon"] = "Povolit rozšíření na WordPress";
$a->strings["WordPress username"] = "WordPress uživatelské jméno";
$a->strings["WordPress password"] = "WordPress heslo";
$a->strings["WordPress API URL"] = "URL adresa API WordPress";

View file

@ -30,8 +30,8 @@ msgid "Wordpress Export"
msgstr "Wordpress Export"
#: wppost.php:87
msgid "Enable WordPress Post Plugin"
msgstr "WordPress Plugin aktivieren"
msgid "Enable WordPress Post Addon"
msgstr "WordPress Addon aktivieren"
#: wppost.php:92
msgid "WordPress username"

View file

@ -7,7 +7,7 @@ function string_plural_select_de($n){
;
$a->strings["Post to Wordpress"] = "Bei WordPress veröffentlichen";
$a->strings["Wordpress Export"] = "Wordpress Export";
$a->strings["Enable WordPress Post Plugin"] = "WordPress Plugin aktivieren";
$a->strings["Enable WordPress Post Addon"] = "WordPress Addon aktivieren";
$a->strings["WordPress username"] = "WordPress-Benutzername";
$a->strings["WordPress password"] = "WordPress-Passwort";
$a->strings["WordPress API URL"] = "WordPress-API-URL";

View file

@ -2,7 +2,7 @@
$a->strings["Post to Wordpress"] = "Afiŝi al Wordpress";
$a->strings["WordPress Post Settings"] = "Agordoj por WordPress afiŝojn";
$a->strings["Enable WordPress Post Plugin"] = "Ŝalti la Wordpress-afiŝo kromprogramon";
$a->strings["Enable WordPress Post Addon"] = "Ŝalti la Wordpress-afiŝo kromprogramon";
$a->strings["WordPress username"] = "WordPress salutnomo";
$a->strings["WordPress password"] = "WordPress pasvorto";
$a->strings["WordPress API URL"] = "Wordpress API URL adreso";

View file

@ -28,8 +28,8 @@ msgid "Wordpress Export"
msgstr "Exportar a Wordpress"
#: wppost.php:87
msgid "Enable WordPress Post Plugin"
msgstr "Habilitar Plugin de publicación de WordPress"
msgid "Enable WordPress Post Addon"
msgstr "Habilitar Addon de publicación de WordPress"
#: wppost.php:92
msgid "WordPress username"

View file

@ -7,7 +7,7 @@ function string_plural_select_es($n){
;
$a->strings["Post to Wordpress"] = "Publicar en Wordpress";
$a->strings["Wordpress Export"] = "Exportar a Wordpress";
$a->strings["Enable WordPress Post Plugin"] = "Habilitar Plugin de publicación de WordPress";
$a->strings["Enable WordPress Post Addon"] = "Habilitar Addon de publicación de WordPress";
$a->strings["WordPress username"] = "Nombre de usuario de WordPress";
$a->strings["WordPress password"] = "Contraseña de WordPress";
$a->strings["WordPress API URL"] = "URL de API de WordPress";

View file

@ -2,7 +2,7 @@
$a->strings["Post to Wordpress"] = "Poster sur WordPress";
$a->strings["WordPress Post Settings"] = "Réglages WordPress";
$a->strings["Enable WordPress Post Plugin"] = "Activer l'extension WordPress";
$a->strings["Enable WordPress Post Addon"] = "Activer l'extension WordPress";
$a->strings["WordPress username"] = "Utilisateur WordPress";
$a->strings["WordPress password"] = "Mot de passe WordPress";
$a->strings["WordPress API URL"] = "URL de l'API WordPress";

View file

@ -2,7 +2,7 @@
$a->strings["Post to Wordpress"] = "Senda færslu á Wordpress";
$a->strings["WordPress Post Settings"] = "Wordpress Post stillingar";
$a->strings["Enable WordPress Post Plugin"] = "Kveikja á WordPress Post viðbót";
$a->strings["Enable WordPress Post Addon"] = "Kveikja á WordPress Post viðbót";
$a->strings["WordPress username"] = "Wordpress aðgangsorð";
$a->strings["WordPress password"] = "Wordpress aðgagnsorð";
$a->strings["WordPress API URL"] = "Slóð á Wordpress API";

View file

@ -4,13 +4,13 @@
#
#
# Translators:
# fabrixxm <fabrix.xm@gmail.com>, 2014-2015
# fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2017-2018
msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-01-24 21:06+0100\n"
"PO-Revision-Date: 2017-02-10 08:18+0000\n"
"PO-Revision-Date: 2018-03-19 13:26+0000\n"
"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
"MIME-Version: 1.0\n"
@ -25,11 +25,11 @@ msgstr "Invia a Wordpress"
#: wppost.php:80 wppost.php:84
msgid "Wordpress Export"
msgstr ""
msgstr "Esporta a Wordpress"
#: wppost.php:87
msgid "Enable WordPress Post Plugin"
msgstr "Abilita il plugin di invio a Wordpress"
msgid "Enable WordPress Post Addon"
msgstr "Abilita il componente aggiuntivo di invio a Wordpress"
#: wppost.php:92
msgid "WordPress username"
@ -55,19 +55,19 @@ msgstr "Inserisci un link al messaggio originale su Friendica"
msgid ""
"Text for the backlink, e.g. Read the original post and comment stream on "
"Friendica."
msgstr ""
msgstr "Testo per il backlink, p.e. Leggi il post originale e i commenti su Friendica."
#: wppost.php:121
msgid "Don't post messages that are too short"
msgstr ""
msgstr "Non inviare messaggi troppo corti"
#: wppost.php:127
msgid "Save Settings"
msgstr ""
msgstr "Salva Impostazioni"
#: wppost.php:206
msgid "Read the orig­i­nal post and com­ment stream on Friendica"
msgstr ""
msgstr "Leggi il messaggio originale e i commenti su Friendica"
#: wppost.php:269
msgid "Post from Friendica"

View file

@ -6,15 +6,15 @@ function string_plural_select_it($n){
}}
;
$a->strings["Post to Wordpress"] = "Invia a Wordpress";
$a->strings["Wordpress Export"] = "";
$a->strings["Enable WordPress Post Plugin"] = "Abilita il plugin di invio a Wordpress";
$a->strings["Wordpress Export"] = "Esporta a Wordpress";
$a->strings["Enable WordPress Post Addon"] = "Abilita il componente aggiuntivo di invio a Wordpress";
$a->strings["WordPress username"] = "Nome utente Wordpress";
$a->strings["WordPress password"] = "Password Wordpress";
$a->strings["WordPress API URL"] = "Indirizzo API Wordpress";
$a->strings["Post to WordPress by default"] = "Invia sempre a Wordpress";
$a->strings["Provide a backlink to the Friendica post"] = "Inserisci un link al messaggio originale su Friendica";
$a->strings["Text for the backlink, e.g. Read the original post and comment stream on Friendica."] = "";
$a->strings["Don't post messages that are too short"] = "";
$a->strings["Save Settings"] = "";
$a->strings["Read the orig­i­nal post and com­ment stream on Friendica"] = "";
$a->strings["Text for the backlink, e.g. Read the original post and comment stream on Friendica."] = "Testo per il backlink, p.e. Leggi il post originale e i commenti su Friendica.";
$a->strings["Don't post messages that are too short"] = "Non inviare messaggi troppo corti";
$a->strings["Save Settings"] = "Salva Impostazioni";
$a->strings["Read the orig­i­nal post and com­ment stream on Friendica"] = "Leggi il messaggio originale e i commenti su Friendica";
$a->strings["Post from Friendica"] = "Messaggio da Friendica";

View file

@ -2,7 +2,7 @@
$a->strings["Post to Wordpress"] = "";
$a->strings["WordPress Post Settings"] = "";
$a->strings["Enable WordPress Post Plugin"] = "";
$a->strings["Enable WordPress Post Addon"] = "";
$a->strings["WordPress username"] = "";
$a->strings["WordPress password"] = "";
$a->strings["WordPress API URL"] = "";

View file

@ -2,7 +2,7 @@
$a->strings["Post to Wordpress"] = "Opublikuj na Wordpress";
$a->strings["WordPress Post Settings"] = "Ustawienia wpisów WorldPress";
$a->strings["Enable WordPress Post Plugin"] = "Włącz plugin wpisów WorldPress";
$a->strings["Enable WordPress Post Addon"] = "Włącz addon wpisów WorldPress";
$a->strings["WordPress username"] = "nazwa użytkownika WordPress";
$a->strings["WordPress password"] = "hasło WordPress";
$a->strings["WordPress API URL"] = "WordPress API URL";

View file

@ -28,7 +28,7 @@ msgid "WordPress Post Settings"
msgstr "Configurações de publicação no WordPress"
#: wppost.php:78
msgid "Enable WordPress Post Plugin"
msgid "Enable WordPress Post Addon"
msgstr "Habilitar plug-in para publicar no WordPress"
#: wppost.php:83

View file

@ -7,7 +7,7 @@ function string_plural_select_pt_br($n){
;
$a->strings["Post to Wordpress"] = "Publicar no Wordpress";
$a->strings["WordPress Post Settings"] = "Configurações de publicação no WordPress";
$a->strings["Enable WordPress Post Plugin"] = "Habilitar plug-in para publicar no WordPress";
$a->strings["Enable WordPress Post Addon"] = "Habilitar plug-in para publicar no WordPress";
$a->strings["WordPress username"] = "Nome de usuário no WordPress";
$a->strings["WordPress password"] = "Senha do WordPress";
$a->strings["WordPress API URL"] = "";

View file

@ -27,7 +27,7 @@ msgid "Wordpress Export"
msgstr "Export pe Wordpress"
#: wppost.php:86
msgid "Enable WordPress Post Plugin"
msgid "Enable WordPress Post Addon"
msgstr "Activare Modul Postare pe Wordpress"
#: wppost.php:91

View file

@ -7,7 +7,7 @@ function string_plural_select_ro($n){
;
$a->strings["Post to Wordpress"] = "Postați pe Wordpress";
$a->strings["Wordpress Export"] = "Export pe Wordpress";
$a->strings["Enable WordPress Post Plugin"] = "Activare Modul Postare pe Wordpress";
$a->strings["Enable WordPress Post Addon"] = "Activare Modul Postare pe Wordpress";
$a->strings["WordPress username"] = "Utilizator WordPress ";
$a->strings["WordPress password"] = "Parolă WordPress ";
$a->strings["WordPress API URL"] = "URL Cheie API WordPress";

View file

@ -2,7 +2,7 @@
$a->strings["Post to Wordpress"] = "Сообщение для Wordpress";
$a->strings["WordPress Post Settings"] = "Настройки сообщений для Wordpress";
$a->strings["Enable WordPress Post Plugin"] = "Включить WordPress плагин сообщений";
$a->strings["Enable WordPress Post Addon"] = "Включить WordPress плагин сообщений";
$a->strings["WordPress username"] = "WordPress Имя пользователя";
$a->strings["WordPress password"] = "WordPress паролъ";
$a->strings["WordPress API URL"] = "WordPress API URL";

View file

@ -2,7 +2,7 @@
$a->strings["Post to Wordpress"] = "发送到Wordpress";
$a->strings["WordPress Post Settings"] = "Wordpress发送设置";
$a->strings["Enable WordPress Post Plugin"] = "使Wordpress发送插件可用";
$a->strings["Enable WordPress Post Addon"] = "使Wordpress发送插件可用";
$a->strings["WordPress username"] = "Wordpress用户名";
$a->strings["WordPress password"] = "Wordpress密码";
$a->strings["WordPress API URL"] = "WordPress API URL";

View file

@ -1,31 +1,35 @@
<?php
/**
* Name: WordPress Post Connector
* Description: Post to WordPress (or anything else which uses blogger XMLRPC API)
* Version: 1.1
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
*/
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Util\Network;
function wppost_install() {
register_hook('post_local', 'addon/wppost/wppost.php', 'wppost_post_local');
register_hook('notifier_normal', 'addon/wppost/wppost.php', 'wppost_send');
register_hook('jot_networks', 'addon/wppost/wppost.php', 'wppost_jot_nets');
register_hook('connector_settings', 'addon/wppost/wppost.php', 'wppost_settings');
register_hook('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post');
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');
}
function wppost_uninstall() {
unregister_hook('post_local', 'addon/wppost/wppost.php', 'wppost_post_local');
unregister_hook('notifier_normal', 'addon/wppost/wppost.php', 'wppost_send');
unregister_hook('jot_networks', 'addon/wppost/wppost.php', 'wppost_jot_nets');
unregister_hook('connector_settings', 'addon/wppost/wppost.php', 'wppost_settings');
unregister_hook('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post');
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
unregister_hook('post_local_end', 'addon/wppost/wppost.php', 'wppost_send');
unregister_hook('plugin_settings', 'addon/wppost/wppost.php', 'wppost_settings');
unregister_hook('plugin_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post');
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');
}
@ -39,7 +43,7 @@ function wppost_jot_nets(&$a,&$b) {
$wp_defpost = get_pconfig(local_user(),'wppost','post_by_default');
$selected = ((intval($wp_defpost) == 1) ? ' checked="checked" ' : '');
$b .= '<div class="profile-jot-net"><input type="checkbox" name="wppost_enable" ' . $selected . ' value="1" /> '
. t('Post to Wordpress') . '</div>';
. L10n::t('Post to Wordpress') . '</div>';
}
}
@ -77,54 +81,54 @@ function wppost_settings(&$a,&$s) {
/* Add some HTML to the existing form */
$s .= '<span id="settings_wppost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
$s .= '<img class="connector'.$css.'" src="images/wordpress.png" /><h3 class="connector">'. t('Wordpress Export').'</h3>';
$s .= '<img class="connector'.$css.'" src="images/wordpress.png" /><h3 class="connector">'. L10n::t('Wordpress Export').'</h3>';
$s .= '</span>';
$s .= '<div id="settings_wppost_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
$s .= '<img class="connector'.$css.'" src="images/wordpress.png" /><h3 class="connector">'. t('Wordpress Export').'</h3>';
$s .= '<img class="connector'.$css.'" src="images/wordpress.png" /><h3 class="connector">'. L10n::t('Wordpress Export').'</h3>';
$s .= '</span>';
$s .= '<div id="wppost-enable-wrapper">';
$s .= '<label id="wppost-enable-label" for="wppost-checkbox">' . t('Enable WordPress Post Plugin') . '</label>';
$s .= '<label id="wppost-enable-label" for="wppost-checkbox">' . L10n::t('Enable WordPress Post Addon') . '</label>';
$s .= '<input id="wppost-checkbox" type="checkbox" name="wppost" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="wppost-username-wrapper">';
$s .= '<label id="wppost-username-label" for="wppost-username">' . t('WordPress username') . '</label>';
$s .= '<label id="wppost-username-label" for="wppost-username">' . L10n::t('WordPress username') . '</label>';
$s .= '<input id="wppost-username" type="text" name="wp_username" value="' . $wp_username . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="wppost-password-wrapper">';
$s .= '<label id="wppost-password-label" for="wppost-password">' . t('WordPress password') . '</label>';
$s .= '<label id="wppost-password-label" for="wppost-password">' . L10n::t('WordPress password') . '</label>';
$s .= '<input id="wppost-password" type="password" name="wp_password" value="' . $wp_password . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="wppost-blog-wrapper">';
$s .= '<label id="wppost-blog-label" for="wppost-blog">' . t('WordPress API URL') . '</label>';
$s .= '<label id="wppost-blog-label" for="wppost-blog">' . L10n::t('WordPress API URL') . '</label>';
$s .= '<input id="wppost-blog" type="text" name="wp_blog" value="' . $wp_blog . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="wppost-bydefault-wrapper">';
$s .= '<label id="wppost-bydefault-label" for="wppost-bydefault">' . t('Post to WordPress by default') . '</label>';
$s .= '<label id="wppost-bydefault-label" for="wppost-bydefault">' . L10n::t('Post to WordPress by default') . '</label>';
$s .= '<input id="wppost-bydefault" type="checkbox" name="wp_bydefault" value="1" ' . $def_checked . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="wppost-backlink-wrapper">';
$s .= '<label id="wppost-backlink-label" for="wppost-backlink">' . t('Provide a backlink to the Friendica post') . '</label>';
$s .= '<label id="wppost-backlink-label" for="wppost-backlink">' . L10n::t('Provide a backlink to the Friendica post') . '</label>';
$s .= '<input id="wppost-backlink" type="checkbox" name="wp_backlink" value="1" ' . $back_checked . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="wppost-backlinktext-wrapper">';
$s .= '<label id="wppost-backlinktext-label" for="wp_backlink_text">' . t('Text for the backlink, e.g. Read the original post and comment stream on Friendica.') . '</label>';
$s .= '<label id="wppost-backlinktext-label" for="wp_backlink_text">' . L10n::t('Text for the backlink, e.g. Read the original post and comment stream on Friendica.') . '</label>';
$s .= '<input id="wppost-backlinktext" type="text" name="wp_backlink_text" value="'. $wp_backlink_text.'" ' . $wp_backlink_text . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="wppost-shortcheck-wrapper">';
$s .= '<label id="wppost-shortcheck-label" for="wppost-shortcheck">' . t("Don't post messages that are too short") . '</label>';
$s .= '<label id="wppost-shortcheck-label" for="wppost-shortcheck">' . L10n::t("Don't post messages that are too short") . '</label>';
$s .= '<input id="wppost-shortcheck" type="checkbox" name="wp_shortcheck" value="1" '.$shortcheck_checked.'/>';
$s .= '</div><div class="clear"></div>';
/* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="wppost-submit" name="wppost-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="wppost-submit" name="wppost-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
}
@ -141,7 +145,7 @@ function wppost_settings_post(&$a,&$b) {
set_pconfig(local_user(),'wppost','backlink',trim($_POST['wp_backlink']));
set_pconfig(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 = BBCode::convert($wp_backlink_text, false, 8);
$wp_backlink_text = html2plain($wp_backlink_text, 0, true);
set_pconfig(local_user(),'wppost','wp_backlink_text', $wp_backlink_text);
@ -204,21 +208,18 @@ function wppost_send(&$a,&$b) {
$wp_blog = get_pconfig($b['uid'],'wppost','wp_blog');
$wp_backlink_text = get_pconfig($b['uid'],'wppost','wp_backlink_text');
if ($wp_backlink_text == '') {
$wp_backlink_text = t('Read the orig­i­nal post and com­ment stream on Friendica');
$wp_backlink_text = L10n::t('Read the orig­i­nal post and com­ment stream on Friendica');
}
if($wp_username && $wp_password && $wp_blog) {
require_once('include/bbcode.php');
require_once('include/html2plain.php');
require_once('include/plaintext.php');
if ($wp_username && $wp_password && $wp_blog) {
require_once 'include/html2plain.php';
$wptitle = trim($b['title']);
if (intval(get_pconfig($b['uid'],'wppost','shortcheck'))) {
if (intval(PConfig::get($b['uid'], 'wppost', 'shortcheck'))) {
// Checking, if its a post that is worth a blog post
$postentry = false;
$siteinfo = get_attached_data($b["body"]);
$siteinfo = BBCode::getAttachedData($b["body"]);
// Is it a link to an aricle, a video or a photo?
if (isset($siteinfo["type"])) {
@ -245,7 +246,7 @@ function wppost_send(&$a,&$b) {
// If the title is empty then try to guess
if ($wptitle == '') {
// Fetch information about the post
$siteinfo = get_attached_data($b["body"]);
$siteinfo = BBCode::getAttachedData($b["body"]);
if (isset($siteinfo["title"])) {
$wptitle = $siteinfo["title"];
}
@ -255,7 +256,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 = html2plain(BBCode::convert($title, false), 0, true)."\n";
$pos = strpos($title, "\n");
$trailer = "";
if (($pos == 0) || ($pos > 100)) {
@ -267,8 +268,8 @@ function wppost_send(&$a,&$b) {
}
}
$title = '<title>' . (($wptitle) ? $wptitle : t('Post from Friendica')) . '</title>';
$post = bbcode($b['body'], false, false, 4);
$title = '<title>' . (($wptitle) ? $wptitle : L10n::t('Post from Friendica')) . '</title>';
$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);
@ -303,10 +304,9 @@ EOT;
logger('wppost: data: ' . $xml, LOGGER_DATA);
if($wp_blog !== 'test') {
$x = post_url($wp_blog,$xml);
if ($wp_blog !== 'test') {
$x = Network::post($wp_blog, $xml);
}
logger('posted to wordpress: ' . (($x) ? $x : ''), LOGGER_DEBUG);
}
}