X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=wppost%2Fwppost.php;h=e8b6fc6d5236235690b0a0ca0b9f6f16a5a13eb8;hb=3b104218cf1bb223d2c4dfb4b69713ca08e43003;hp=5c1482e7864c46f07e69db795ae1d703eddd4b88;hpb=560b28b6660422388c9e8b2cbb6d00ad5f5d3eef;p=friendica-addons.git

diff --git a/wppost/wppost.php b/wppost/wppost.php
index 5c1482e7..e8b6fc6d 100755
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -60,8 +60,10 @@ function wppost_settings(&$a,&$s) {
     $checked = (($enabled) ? ' checked="checked" ' : '');
 
     $def_enabled = get_pconfig(local_user(),'wppost','post_by_default');
+    $back_enabled = get_pconfig(local_user(),'wppost','backlink');
 
     $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
+    $back_checked = (($back_enabled) ? ' checked="checked" ' : '');
 
 	$wp_username = get_pconfig(local_user(), 'wppost', 'wp_username');
 	$wp_password = get_pconfig(local_user(), 'wppost', 'wp_password');
@@ -97,6 +99,12 @@ function wppost_settings(&$a,&$s) {
     $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 .= '<input id="wppost-backlink" type="checkbox" name="wp_backlink" value="1" ' . $back_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('Submit') . '" /></div></div>';
@@ -113,6 +121,7 @@ function wppost_settings_post(&$a,&$b) {
 		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']));
 
 	}
 
@@ -161,21 +170,47 @@ function wppost_send(&$a,&$b) {
         return;
 
 
-	$wp_username = get_pconfig($b['uid'],'wppost','wp_username');
-	$wp_password = get_pconfig($b['uid'],'wppost','wp_password');
+	$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');
 
 	if($wp_username && $wp_password && $wp_blog) {
 
 		require_once('include/bbcode.php');
+		require_once('include/html2plain.php');
+
+		$wptitle = trim($b['title']);
+
+		// If the title is empty then try to guess
+		if ($wptitle == '') {
+			// Take the description from the bookmark
+			if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches))
+				$wptitle = $matches[2];
+
+			// If no bookmark is found then take the first line
+			if ($wptitle == '') {
+				$title = html2plain(bbcode($b['body']), 0, true);
+				$pos = strpos($title, "\n");
+				if (($pos == 0) or ($pos > 60))
+					$pos = 60;
 
-		$title = '<title>' . (($b['title']) ? $b['title'] : t('Post from Friendica')) . '</title>';
+				$wptitle = substr($title, 0, $pos);
+			}
+		}
+
+		$title = '<title>' . (($wptitle) ? $wptitle : t('Post from Friendica')) . '</title>';
 		$post = $title . bbcode($b['body']);
+
+		$wp_backlink = intval(get_pconfig($b['uid'],'wppost','backlink'));
+		if($wp_backlink && $b['plink'])
+			$post .= EOL . EOL . '<a href="' . $b['plink'] . '">' 
+				. t('Read the original post and comment stream on Friendica') . '</a>' . EOL . EOL;
+
 		$post = xmlify($post);
 
-		$xml = <<< EOT
 
-<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>
+		$xml = <<< EOT
+<?xml version=\"1.0\" encoding=\"utf-8\"?>
 <methodCall>
   <methodName>blogger.newPost</methodName>
   <params>
@@ -194,7 +229,7 @@ EOT;
 
 		if($wp_blog !== 'test')
 			$x = post_url($wp_blog,$xml);
-		logger('posted to wordpress: ' . ($x) ? $x : '');
+		logger('posted to wordpress: ' . (($x) ? $x : ''), LOGGER_DEBUG);
 
 	}
 }