Merge pull request #141 from annando/master

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

diff --git a/wppost/wppost.php b/wppost/wppost.php
index 216c6417c171fed939616d7c4e3281c100584b6e..a6574cc2f8259bb8e81131fcbe337a1efec8a009 100755 (executable)
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -97,6 +97,7 @@ function wppost_settings(&$a,&$s) {
     $s .= '<div id="wppost-bydefault-wrapper">';
     $s .= '<label id="wppost-bydefault-label" for="wppost-bydefault">' . t('Post to WordPress by default') . '</label>';
     $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>';
@@ -178,29 +179,40 @@ function wppost_send(&$a,&$b) {
                require_once('include/bbcode.php');
                require_once('include/html2plain.php');
 
+               $wptitle = trim($b['title']);
+
                // If the title is empty then try to guess
-               if ($b['title'] == '') {
+               if ($wptitle == '') {
                        // Take the description from the bookmark
                        if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches))
-                               $b['title'] = $matches[2];
+                               $wptitle = $matches[2];
 
                        // If no bookmark is found then take the first line
-                       if ($b['title'] == '') {
-                               $title = html2plain(bbcode($b['body']), 0, true);
+                       if ($wptitle == '') {
+                               $title = html2plain(bbcode($b['body'], false, false), 0, true)."\n";
                                $pos = strpos($title, "\n");
-                               if (($pos == 0) or ($pos > 60))
-                                       $pos = 60;
+                               $trailer = "";
+                               if (($pos == 0) or ($pos > 100)) {
+                                       $pos = 100;
+                                       $trailer = "...";
+                               }
 
-                               $b['title'] = substr($title, 0, $pos);
+                               $wptitle = substr($title, 0, $pos).$trailer;
                        }
                }
 
-               $title = '<title>' . (($b['title']) ? $b['title'] : t('Post from Friendica')) . '</title>';
-               $post = $title . bbcode($b['body']);
+               $title = '<title>' . (($wptitle) ? $wptitle : t('Post from Friendica')) . '</title>';
+               $post = bbcode($b['body'], false, false);
+
+               // If a link goes to youtube then remove the stuff around it. Wordpress detects youtube links and embeds it
+               $post = preg_replace('/<a.*?href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$post);
+               $post = preg_replace('/<a.*?href="(https?:\/\/youtu.be\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$post);
+
+               $post = $title.$post;
 
                $wp_backlink = intval(get_pconfig($b['uid'],'wppost','backlink'));
                if($wp_backlink && $b['plink'])
-                       $post .= EOL . EOL . '<a href="' . $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);