X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=wppost%2Fwppost.php;h=c3840d5233510a0bc3de146323fdc8774e2a61a0;hb=101d3603245b17bd2e6d4880e94bb27887257238;hp=f148310187c52aebab76d2493b460ba48a8dc5b7;hpb=42eefed6e68d241bd8bdf9eceea96abc445a9cac;p=friendica-addons.git
diff --git a/wppost/wppost.php b/wppost/wppost.php
old mode 100755
new mode 100644
index f1483101..c3840d52
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -1,5 +1,4 @@
*/
+use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\HTML;
+use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\Logger;
use Friendica\Core\PConfig;
-
-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');
-
+use Friendica\Database\DBA;
+use Friendica\Util\Network;
+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() {
- 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');
- // 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');
+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 .= '
'
- . 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')
+ ]
+ ];
+ }
}
@@ -53,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 */
@@ -79,76 +95,89 @@ function wppost_settings(&$a,&$s) {
/* Add some HTML to the existing form */
$s .= '';
- $s .= ''. t('Wordpress Export').'
';
+ $s .= ''. L10n::t('Wordpress Export').'
';
$s .= '';
$s .= '';
$s .= '
';
- $s .= ''. t('Wordpress Export').'
';
+ $s .= ''. L10n::t('Wordpress Export').'
';
$s .= '';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
/* provide a submit button */
- $s .= '
';
+ $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) {
@@ -169,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;
@@ -189,42 +218,46 @@ function wppost_post_local(&$a, &$b) {
-function wppost_send(&$a,&$b) {
-
- if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+function wppost_send(&$a, &$b)
+{
+ if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
return;
+ }
- if(! strstr($b['postopts'],'wppost'))
+ if(! strstr($b['postopts'],'wppost')) {
return;
+ }
- if($b['parent'] != $b['id'])
+ if($b['parent'] != $b['id']) {
return;
+ }
+ // 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]);
+ 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 == '') {
- $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) {
$wptitle = trim($b['title']);
- if (intval(PConfig::get($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"])) {
- if (in_array($siteinfo["type"], array("link", "audio", "video", "photo"))) {
+ if (in_array($siteinfo["type"], ["link", "audio", "video", "photo"])) {
$postentry = true;
}
}
@@ -247,7 +280,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"];
}
@@ -257,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)) {
@@ -269,8 +302,8 @@ function wppost_send(&$a,&$b) {
}
}
- $title = '' . (($wptitle) ? $wptitle : t('Post from Friendica')) . '';
- $post = bbcode($b['body'], false, false, 4);
+ $title = '' . (($wptitle) ? $wptitle : L10n::t('Post from Friendica')) . '';
+ $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);
@@ -284,7 +317,7 @@ function wppost_send(&$a,&$b) {
. $wp_backlink_text . '' . EOL . EOL;
}
- $post = xmlify($post);
+ $post = XML::escape($post);
$xml = <<< EOT
@@ -303,12 +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 = post_url($wp_blog,$xml);
+ if ($wp_blog !== 'test') {
+ $x = Network::post($wp_blog, $xml)->getBody();
}
- logger('posted to wordpress: ' . (($x) ? $x : ''), LOGGER_DEBUG);
-
+ Logger::log('posted to wordpress: ' . (($x) ? $x : ''), Logger::DEBUG);
}
}