Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

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

diff --git a/wppost/wppost.php b/wppost/wppost.php
index 5c1482e7864c46f07e69db795ae1d703eddd4b88..28e4e36946af907978a89f16acf6045e1470f60d 100755 (executable)
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -161,21 +161,38 @@ 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');
+
+               // If the title is empty then try to guess
+               if ($b['title'] == '') {
+                       // Take the description from the bookmark
+                       if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches))
+                               $b['title'] = $matches[2];
+
+                       // If no bookmark is found then take the first line
+                       if ($b['title'] == '') {
+                               $title = html2plain(bbcode($b['body']), 0, true);
+                               $pos = strpos($title, "\n");
+                               if (($pos == 0) or ($pos > 60))
+                                       $pos = 60;
+
+                               $b['title'] = substr($title, 0, $pos);
+                       }
+               }
 
                $title = '<title>' . (($b['title']) ? $b['title'] : t('Post from Friendica')) . '</title>';
                $post = $title . bbcode($b['body']);
                $post = xmlify($post);
 
                $xml = <<< EOT
-
-<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>
+<?xml version=\"1.0\" encoding=\"utf-8\"?>
 <methodCall>
   <methodName>blogger.newPost</methodName>
   <params>
@@ -194,7 +211,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);
 
        }
 }