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
old mode 100644 (file)
new mode 100755 (executable)
index 235aa82..28e4e36
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -2,6 +2,7 @@
 
 /**
  * Name: WordPress Post Connector
+ * Description: Post to WordPress (or anything else which uses blogger XMLRPC API)
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
@@ -37,7 +38,7 @@ function wppost_jot_nets(&$a,&$b) {
     if(intval($wp_post) == 1) {
         $wp_defpost = get_pconfig(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" /> '
+        $b .= '<div class="profile-jot-net"><input type="checkbox" name="wppost_enable" ' . $selected . ' value="1" /> '
             . t('Post to Wordpress') . '</div>';
     }
 }
@@ -160,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');
 
-               $post = (($b['title']) ? '<title>' . $b['title'] . '</title>' : '');
-               $post .= bbcode($b['body']);
-                       $post = xmlify($post);
+               // 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];
 
-               $xml = <<< EOT
+                       // 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);
+                       }
+               }
 
-<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>
+               $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=\"utf-8\"?>
 <methodCall>
   <methodName>blogger.newPost</methodName>
   <params>
@@ -193,7 +211,7 @@ EOT;
 
                if($wp_blog !== 'test')
                        $x = post_url($wp_blog,$xml);
-               logger('posted to wordpress');
+               logger('posted to wordpress: ' . (($x) ? $x : ''), LOGGER_DEBUG);
 
        }
 }