Merge branch '3.6-release'

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

diff --git a/wppost/wppost.php b/wppost/wppost.php
index 96209b1513358afd6468f53fca5fe66fe4c7482e..8d14b17016ec1deee552e7ee5acfe0ab6131ff42 100644 (file)
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -38,9 +38,9 @@ function wppost_jot_nets(&$a,&$b) {
     if(! local_user())
         return;
 
-    $wp_post = get_pconfig(local_user(),'wppost','post');
+    $wp_post = PConfig::get(local_user(),'wppost','post');
     if(intval($wp_post) == 1) {
-        $wp_defpost = get_pconfig(local_user(),'wppost','post_by_default');
+        $wp_defpost = PConfig::get(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" /> '
             . L10n::t('Post to Wordpress') . '</div>';
@@ -59,23 +59,23 @@ function wppost_settings(&$a,&$s) {
 
        /* Get the current state of our config variables */
 
-       $enabled = get_pconfig(local_user(),'wppost','post');
+       $enabled = PConfig::get(local_user(),'wppost','post');
        $checked = (($enabled) ? ' checked="checked" ' : '');
 
        $css = (($enabled) ? '' : '-disabled');
 
-       $def_enabled = get_pconfig(local_user(),'wppost','post_by_default');
-       $back_enabled = get_pconfig(local_user(),'wppost','backlink');
-       $shortcheck_enabled = get_pconfig(local_user(),'wppost','shortcheck');
+       $def_enabled = PConfig::get(local_user(),'wppost','post_by_default');
+       $back_enabled = PConfig::get(local_user(),'wppost','backlink');
+       $shortcheck_enabled = PConfig::get(local_user(),'wppost','shortcheck');
 
        $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
        $back_checked = (($back_enabled) ? ' checked="checked" ' : '');
        $shortcheck_checked = (($shortcheck_enabled) ? ' checked="checked" ' : '');
 
-       $wp_username = get_pconfig(local_user(), 'wppost', 'wp_username');
-       $wp_password = get_pconfig(local_user(), 'wppost', 'wp_password');
-       $wp_blog = get_pconfig(local_user(), 'wppost', 'wp_blog');
-       $wp_backlink_text = get_pconfig(local_user(), 'wppost', 'wp_backlink_text');
+       $wp_username = PConfig::get(local_user(), 'wppost', 'wp_username');
+       $wp_password = PConfig::get(local_user(), 'wppost', 'wp_password');
+       $wp_blog = PConfig::get(local_user(), 'wppost', 'wp_blog');
+       $wp_backlink_text = PConfig::get(local_user(), 'wppost', 'wp_backlink_text');
 
 
     /* Add some HTML to the existing form */
@@ -137,17 +137,17 @@ function wppost_settings_post(&$a,&$b) {
 
        if(x($_POST,'wppost-submit')) {
 
-               set_pconfig(local_user(),'wppost','post',intval($_POST['wppost']));
-               set_pconfig(local_user(),'wppost','post_by_default',intval($_POST['wp_bydefault']));
-               set_pconfig(local_user(),'wppost','wp_username',trim($_POST['wp_username']));
-               set_pconfig(local_user(),'wppost','wp_password',trim($_POST['wp_password']));
-               set_pconfig(local_user(),'wppost','wp_blog',trim($_POST['wp_blog']));
-               set_pconfig(local_user(),'wppost','backlink',trim($_POST['wp_backlink']));
-               set_pconfig(local_user(),'wppost','shortcheck',trim($_POST['wp_shortcheck']));
+               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','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','shortcheck',trim($_POST['wp_shortcheck']));
                $wp_backlink_text = notags(trim($_POST['wp_backlink_text']));
                $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);
+               PConfig::set(local_user(),'wppost','wp_backlink_text', $wp_backlink_text);
 
        }
 
@@ -169,11 +169,11 @@ function wppost_post_local(&$a, &$b) {
                return;
        }
 
-       $wp_post   = intval(get_pconfig(local_user(),'wppost','post'));
+       $wp_post   = intval(PConfig::get(local_user(),'wppost','post'));
 
        $wp_enable = (($wp_post && x($_REQUEST,'wppost_enable')) ? intval($_REQUEST['wppost_enable']) : 0);
 
-       if ($b['api_source'] && intval(get_pconfig(local_user(),'wppost','post_by_default'))) {
+       if ($b['api_source'] && intval(PConfig::get(local_user(),'wppost','post_by_default'))) {
                $wp_enable = 1;
        }
 
@@ -193,20 +193,29 @@ function wppost_post_local(&$a, &$b) {
 
 function wppost_send(&$a,&$b) {
 
-       if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+       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(get_pconfig($b['uid'],'wppost','wp_username'));
-       $wp_password = xmlify(get_pconfig($b['uid'],'wppost','wp_password'));
-       $wp_blog = get_pconfig($b['uid'],'wppost','wp_blog');
-       $wp_backlink_text = get_pconfig($b['uid'],'wppost','wp_backlink_text');
+       $wp_username = xmlify(PConfig::get($b['uid'],'wppost','wp_username'));
+       $wp_password = xmlify(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 = L10n::t('Read the orig­i­nal post and com­ment stream on Friendica');
        }
@@ -223,7 +232,7 @@ function wppost_send(&$a,&$b) {
 
                        // 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;
                                }
                        }
@@ -277,7 +286,7 @@ function wppost_send(&$a,&$b) {
 
                $post = $title.$post;
 
-               $wp_backlink = intval(get_pconfig($b['uid'],'wppost','backlink'));
+               $wp_backlink = intval(PConfig::get($b['uid'],'wppost','backlink'));
                if($wp_backlink && $b['plink']) {
                        $post .= EOL . EOL . '<a href="' . $b['plink'] . '">'
                                . $wp_backlink_text . '</a>' . EOL . EOL;