X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=wppost%2Fwppost.php;h=ea26ae45340a7070de9e0d4fdb0bf772fecd96fb;hb=be1342fe5dee55f30f4c83d2da5cdc4f5bc46b16;hp=931b6d8188ca20e8dfe1b8fb2ba46328501c03ea;hpb=4ff1508321ae1c47784d4e67390dac5ad9ebdc83;p=friendica-addons.git

diff --git a/wppost/wppost.php b/wppost/wppost.php
old mode 100755
new mode 100644
index 931b6d81..ea26ae45
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -7,6 +7,8 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
+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');
@@ -34,9 +36,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" /> '
             . t('Post to Wordpress') . '</div>';
@@ -55,23 +57,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 */
@@ -133,54 +135,55 @@ 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($wp_backlink_text, false, 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);
 
 	}
 
 }
 
-function wppost_post_local(&$a,&$b) {
+function wppost_post_local(&$a, &$b) {
 
 	// This can probably be changed to allow editing by pointing to a different API endpoint
 
-	if($b['edit']) {
+	if ($b['edit']) {
 		return;
 	}
 
-	if((! local_user()) || (local_user() != $b['uid'])) {
+	if (!local_user() || (local_user() != $b['uid'])) {
 		return;
 	}
 
-	if($b['private'] || $b['parent']) {
+	if ($b['private'] || $b['parent']) {
 		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($_REQUEST['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;
 	}
 
-    if(! $wp_enable) {
-       return;
-    }
+	if (!$wp_enable) {
+		return;
+	}
 
-    if(strlen($b['postopts'])) {
-       $b['postopts'] .= ',';
-    }
-    $b['postopts'] .= 'wppost';
+	if (strlen($b['postopts'])) {
+		$b['postopts'] .= ',';
+	}
+
+	$b['postopts'] .= 'wppost';
 }
 
 
@@ -197,11 +200,17 @@ function wppost_send(&$a,&$b) {
 	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::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+	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 = t('Read the orig­i­nal post and com­ment stream on Friendica');
 	}
@@ -214,7 +223,7 @@ function wppost_send(&$a,&$b) {
 
 		$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"]);
@@ -257,7 +266,7 @@ function wppost_send(&$a,&$b) {
 				$title = html2plain(bbcode($title, false, false), 0, true)."\n";
 				$pos = strpos($title, "\n");
 				$trailer = "";
-				if (($pos == 0) or ($pos > 100)) {
+				if (($pos == 0) || ($pos > 100)) {
 					$pos = 100;
 					$trailer = "...";
 				}
@@ -275,7 +284,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;